Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CMake version for Qt 6.6.x #20

Open
wants to merge 3 commits into
base: 6.4
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .cmake.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(QT_REPO_MODULE_VERSION "6.6.1")
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "3rdparty/libtomcrypt"]
path = 3rdparty/libtomcrypt
url = https://github.com/libtom/libtomcrypt
tag = 7e863d21429f94ed6a720e24499a12a3f852bb31
21 changes: 19 additions & 2 deletions .qmake.conf
Original file line number Diff line number Diff line change
@@ -1,2 +1,19 @@
top_srcdir=$$PWD
top_builddir=$$shadowed($$PWD)
# This file detaches this sub-tree from the rest of qtbase,
# so it can be configured stand-alone.
# Of course, under normal circumstances, this _is_ part of qtbase,
# so we have to make some contortions to restore normality.

isEmpty(_QMAKE_CONF_): return() # Pre-scan during spec loading.

SQLDRV_SRC_TREE = $$dirname(_QMAKE_CONF_)
QTBASE_SRC_TREE = $$section(SQLDRV_SRC_TREE, /, 0, -4)

QTBASE_BLD_TREE = $$shadowed($$QTBASE_SRC_TREE)
!isEmpty(QTBASE_BLD_TREE):exists($$QTBASE_BLD_TREE/.qmake.cache) {
# This tricks qt_build_config.prf and qt_build_paths.prf
_QMAKE_CONF_ = $$QTBASE_SRC_TREE/.qmake.conf
} else {
CONFIG += sqldrivers_standalone
}

include($$QTBASE_SRC_TREE/.qmake.conf)
Binary file added 3rdparty/.DS_Store
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for cleanup

Binary file not shown.
1 change: 1 addition & 0 deletions 3rdparty/libtomcrypt
Submodule libtomcrypt added at 7e863d
42 changes: 0 additions & 42 deletions 3rdparty/libtomcrypt/.clang-format

This file was deleted.

135 changes: 0 additions & 135 deletions 3rdparty/libtomcrypt/.travis.yml

This file was deleted.

29 changes: 0 additions & 29 deletions 3rdparty/libtomcrypt/LICENSE

This file was deleted.

Loading