-
Notifications
You must be signed in to change notification settings - Fork 26
Bump Qt from 6.5.2 to Qt 6.11.0 #868
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
Merged
Merged
Changes from all commits
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
bcce366
Update to Qt 6.11.0
jmarrec 4f445e8
‘void QCheckBox::stateChanged(int)’ deprecated -> `checkStateChanged()`
jmarrec 523cc5e
Qt 6.11.0 actually has icu libs, but they are all versionned... Harco…
jmarrec 226bce5
Copy v8_context_snapshot.bin for QtWebEngine
jmarrec 9693c9e
Grab a few more extra libs for QtWebEngine 6.11: QmlWorkerScript and …
jmarrec 57f8659
Warning: QLayout: Attempting to add QLayout "" to openstudio::Preview…
jmarrec c65a4f5
Warning: QObject::disconnect: wildcard call disconnects from destroye…
jmarrec 3d38813
Warning: QLayout: Attempting to add QLayout "" to openstudio::EditorW…
jmarrec fd72cf1
More disconnect issues
jmarrec 7d91cd8
Put back 6.11.0 as default version: reverted by mistake
jmarrec 044611b
Remove AboutBox alignment: it no longer exists and prints issues to c…
jmarrec 7371bb1
QScrollArea { background: #E6E6E6; } QSS rule used to make the viewpo…
jmarrec f07e3f2
Bump QT_VERSION in workflow
jmarrec ac1da81
Update QT_ARCH for linux for aqtinstall
jmarrec 1ea2707
TODO: TEMPORARY: aqtinstall on windows: need to pip install from master
jmarrec 414700a
clang-format 18 for SpaceTypesGridView
jmarrec cfdb5f8
Adjust QT_INSTALL_DIR path
jmarrec File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -522,9 +522,9 @@ if(UNIX) | |
| endif() | ||
|
|
||
| # Qt | ||
| # e.g. QT_INSTALL_DIR = C:/Qt/6.5.2/msvc2019_64 | ||
| # e.g. QT_INSTALL_DIR = C:/Qt/6.11.0/msvc2019_64 | ||
| set(QT_INSTALL_DIR "" CACHE PATH "Path to Qt Install") | ||
| set(QT_VERSION "6.5.2" CACHE STRING "Qt target version, defaults to 6.5.2") | ||
| set(QT_VERSION "6.11.0" CACHE STRING "Qt target version, defaults to 6.11.0") | ||
|
|
||
| # For AboutBox, but also validates that the version is valid | ||
| string(TIMESTAMP CURRENT_YEAR "%Y") | ||
|
|
@@ -558,7 +558,7 @@ find_file(qweb_resources NAMES qtwebengine_resources.pak PATHS "${QT_INSTALL_DIR | |
| find_file(qweb_resources_devtools NAMES qtwebengine_devtools_resources.pak PATHS "${QT_INSTALL_DIR}/resources/" "${QT_INSTALL_DIR}/lib/QtWebEngineCore.framework/Resources" NO_DEFAULT_PATH) | ||
| find_file(qweb_resources_100 NAMES qtwebengine_resources_100p.pak PATHS "${QT_INSTALL_DIR}/resources/" "${QT_INSTALL_DIR}/lib/QtWebEngineCore.framework/Resources" NO_DEFAULT_PATH) | ||
| find_file(qweb_resources_200 NAMES qtwebengine_resources_200p.pak PATHS "${QT_INSTALL_DIR}/resources/" "${QT_INSTALL_DIR}/lib/QtWebEngineCore.framework/Resources" NO_DEFAULT_PATH) | ||
| #find_file(qweb_resources_v8_context_snapshot NAMES v8_context_snapshot.bin PATHS "${QT_INSTALL_DIR}/resources/" "${QT_INSTALL_DIR}/lib/QtWebEngineCore.framework/Resources" NO_DEFAULT_PATH) | ||
| find_file(qweb_resources_v8_context_snapshot NAMES v8_context_snapshot.bin PATHS "${QT_INSTALL_DIR}/resources/" "${QT_INSTALL_DIR}/lib/QtWebEngineCore.framework/Resources" NO_DEFAULT_PATH) | ||
|
|
||
| # QT_WEB_LIBS are linked by OS App and openstudio_lib but not by openstudio_modeleditor.so or openstudio_modeleditor | ||
| list(APPEND QT_WEB_LIBS Qt6::WebEngineCore) | ||
|
|
@@ -581,6 +581,17 @@ if(NOT APPLE) | |
| find_package(Qt6QmlModels ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH) | ||
| list(APPEND QT_WEB_LIBS Qt6::QmlModels) | ||
|
|
||
| # Qt 6.11+ splits QmlMeta and QmlWorkerScript into their own libraries (required by QtWebEngineProcess) | ||
| find_package(Qt6QmlMeta ${QT_VERSION} QUIET PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH) | ||
| if(Qt6QmlMeta_FOUND) | ||
| list(APPEND QT_WEB_LIBS Qt6::QmlMeta) | ||
| endif() | ||
|
|
||
| find_package(Qt6QmlWorkerScript ${QT_VERSION} QUIET PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH) | ||
| if(Qt6QmlWorkerScript_FOUND) | ||
| list(APPEND QT_WEB_LIBS Qt6::QmlWorkerScript) | ||
| endif() | ||
|
|
||
| find_package(Qt6Positioning ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH) | ||
| list(APPEND QT_WEB_LIBS Qt6::Positioning) | ||
|
|
||
|
|
@@ -590,14 +601,19 @@ if(NOT APPLE) | |
|
|
||
| find_library(QT_QXCBQPA NAMES libQt6XcbQpa.so.${QT_VERSION} PATHS "${QT_INSTALL_DIR}/lib" NO_DEFAULT_PATH) | ||
|
|
||
| find_library(QT_ICU icui18n REQUIRED PATHS "${QT_INSTALL_DIR}/lib" NO_DEFAULT_PATH) | ||
| find_library(QT_ICUDATA icudata REQUIRED PATHS "${QT_INSTALL_DIR}/lib" NO_DEFAULT_PATH) | ||
| find_library(QT_ICUUC icuuc REQUIRED PATHS "${QT_INSTALL_DIR}/lib" NO_DEFAULT_PATH) | ||
| set(QT_ICU_LIBS | ||
| ${QT_ICU} | ||
| ${QT_ICUDATA} | ||
| ${QT_ICUUC} | ||
| ) | ||
| "${QT_INSTALL_DIR}/lib/libicui18n.so.73.2" | ||
| "${QT_INSTALL_DIR}/lib/libicuuc.so.73.2" | ||
| "${QT_INSTALL_DIR}/lib/libicudata.so.73.2" | ||
| ) | ||
| # Ensure each ICU library exists | ||
| foreach(lib IN LISTS QT_ICU_LIBS) | ||
| if(NOT EXISTS "${lib}") | ||
| message(FATAL_ERROR "Qt ICU library not found: ${lib}") | ||
| elseif(IS_SYMLINK "${lib}") | ||
| message(FATAL_ERROR "Qt ICU library is a symlink, expected a real file: ${lib}") | ||
| endif() | ||
| endforeach() | ||
|
Comment on lines
604
to
+616
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This isn't great to have it harcoded but I'm not sure a GLOB is a better idea. |
||
|
|
||
| list(APPEND QT_EXTRA_LIBS ${QT_QXCBQPA} ${QT_ICU_LIBS}) | ||
| endif() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Had to pull aqtinstall from master for now.