Merge pull request #868 from openstudiocoalition/bump_qt_6_11_0

Bump Qt from 6.5.2 to Qt 6.11.0

Author: jmarrec

.github/workflows/app_build.yml

@@ -16,7 +16,7 @@ env:
   BUILD_TESTING: ON
   BUILD_BENCHMARK: ON
   BUILD_PACKAGE: ON
-  QT_VERSION: 6.5.2
+  QT_VERSION: 6.11.0
   QT_DEBUG_PLUGINS: 1
 
 jobs:
@@ -42,7 +42,7 @@ jobs:
           BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
           COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
           QT_OS_NAME: linux
-          QT_ARCH: gcc_64
+          QT_ARCH: linux_gcc_64
           arch: x86_64
         - os: ubuntu-24.04
           SELF_HOSTED: false
@@ -52,7 +52,7 @@ jobs:
           BINARY_PKG_PATH: _CPack_Packages/Linux/DEB
           COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
           QT_OS_NAME: linux
-          QT_ARCH: gcc_64
+          QT_ARCH: linux_gcc_64
           arch: x86_64
         - os: windows-2022
           SELF_HOSTED: false
@@ -62,7 +62,7 @@ jobs:
           BINARY_PKG_PATH: _CPack_Packages/win64/IFW
           COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP
           QT_OS_NAME: windows
-          QT_ARCH: win64_msvc2019_64
+          QT_ARCH: win64_msvc2022_64
           arch: x86_64
         - os: macos-15-intel
           SELF_HOSTED: false
@@ -418,12 +418,12 @@ jobs:
         cmake -E make_directory ./build
 
         if [ "$RUNNER_OS" == "Windows" ]; then
-          # QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/msvc2019_64"
-          QT_INSTALL_DIR="$(cmd.exe //c cd)\build\Qt-install\${{ env.QT_VERSION }}\msvc2019_64"
+          # QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/msvc2022_64"
+          QT_INSTALL_DIR="$(cmd.exe //c cd)\build\Qt-install\${{ env.QT_VERSION }}\msvc2022_64"
         elif [ "$RUNNER_OS" == "macOS" ]; then
           QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/macos"
         else
-          QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/${{ matrix.QT_ARCH }}"
+          QT_INSTALL_DIR="$(pwd)/build/Qt-install/$QT_VERSION/gcc_64"
         fi
 
         if [ -d "$QT_INSTALL_DIR" ]; then
@@ -432,7 +432,11 @@ jobs:
           echo "Install aqtinstall, then install Qt $QT_VERSION for ${{ matrix.QT_OS_NAME }} ${{ matrix.QT_ARCH }}"
           pip show setuptools || true
           pip install setuptools --upgrade
-          pip3 install aqtinstall
+          # TODO: temporary, pending a new release after 3.3.0, need to download a fix, download.qt.io changed the directory structure for Qt 6.11.0 on windows:
+          # * Issue: https://github.com/miurahr/aqtinstall/issues/1007
+          # * Fixed via https://github.com/miurahr/aqtinstall/pull/1000
+          # pip install aqtinstall
+          pip install git+https://github.com/miurahr/aqtinstall.git@master
           aqt list-qt ${{ matrix.QT_OS_NAME }} desktop --arch $QT_VERSION
           aqt list-qt ${{ matrix.QT_OS_NAME }} desktop --modules $QT_VERSION ${{ matrix.QT_ARCH }}
           aqt install-qt --outputdir ./build/Qt-install/ ${{ matrix.QT_OS_NAME }} desktop $QT_VERSION ${{ matrix.QT_ARCH }} -m qtwebchannel qtwebengine qtwebview qtpositioning qtcharts

CMakeLists.txt

@@ -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()
 
       list(APPEND QT_EXTRA_LIBS ${QT_QXCBQPA} ${QT_ICU_LIBS})
     endif()

src/openstudio_app/CMakeLists.txt

@@ -229,7 +229,7 @@ elseif( UNIX )
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${qweb_resources_devtools} $<TARGET_FILE_DIR:${target_name}>/resources/
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${qweb_resources_100} $<TARGET_FILE_DIR:${target_name}>/resources/
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${qweb_resources_200} $<TARGET_FILE_DIR:${target_name}>/resources/
-    #COMMAND ${CMAKE_COMMAND} -E copy_if_different ${qweb_resources_v8_context_snapshot} $<TARGET_FILE_DIR:${target_name}>/resources/
+    COMMAND ${CMAKE_COMMAND} -E copy_if_different ${qweb_resources_v8_context_snapshot} $<TARGET_FILE_DIR:${target_name}>/resources/
   )
 
   # Note: JM: Qt 6.3.0, I can no longer access $<TARGET_FILE:Qt6::QXcbIntegrationPlugin>

src/openstudio_app/OpenStudioApp.cpp

@@ -983,7 +983,6 @@ void OpenStudioApp::showAbout() {
   QMessageBox about(parent);
   about.setText(OPENSTUDIOAPP_ABOUTBOX);
   about.setDetailedText(details);
-  about.setStyleSheet("qproperty-alignment: AlignLeft;");
   about.setWindowTitle("About " + applicationName());
 
   about.setIconPixmap(QPixmap(":/images/os_128.png"));

src/openstudio_lib/ConstructionsTabController.cpp

@@ -39,7 +39,6 @@ void ConstructionsTabController::setSubTab(int index) {
   }
 
   if (m_currentController) {
-    m_currentController->disconnect();
     delete m_currentController;
   }
 

src/openstudio_lib/DesignDayGridView.cpp

@@ -237,7 +237,7 @@ void DesignDayGridController::addColumns(const QString& /*category*/, std::vecto
     } else if (field == SELECTED) {
       auto checkbox = QSharedPointer<OSSelectAllCheckBox>(new OSSelectAllCheckBox());
       checkbox->setToolTip(tr("Check to select all rows"));
-      connect(checkbox.data(), &OSSelectAllCheckBox::stateChanged, this, &DesignDayGridController::onSelectAllStateChanged);
+      connect(checkbox.data(), &OSSelectAllCheckBox::checkStateChanged, this, &DesignDayGridController::onSelectAllStateChanged);
       connect(this, &DesignDayGridController::gridRowSelectionChanged, checkbox.data(), &OSSelectAllCheckBox::onGridRowSelectionChanged);
       addSelectColumn(Heading(SELECTED, false, false, checkbox), "Check to select this row");
     }

src/openstudio_lib/FacilityExteriorEquipmentGridView.cpp

@@ -231,7 +231,7 @@ void FacilityExteriorEquipmentGridController::addColumns(const QString& category
 
       auto checkbox = QSharedPointer<OSSelectAllCheckBox>(new OSSelectAllCheckBox());
       checkbox->setToolTip("Check to select all rows");
-      connect(checkbox.data(), &OSSelectAllCheckBox::stateChanged, this, &FacilityExteriorEquipmentGridController::onSelectAllStateChanged);
+      connect(checkbox.data(), &OSSelectAllCheckBox::checkStateChanged, this, &FacilityExteriorEquipmentGridController::onSelectAllStateChanged);
       connect(this, &FacilityExteriorEquipmentGridController::gridRowSelectionChanged, checkbox.data(),
               &OSSelectAllCheckBox::onGridRowSelectionChanged);
       addSelectColumn(Heading(QString(SELECTED), false, false, checkbox), "Check to select this row");

src/openstudio_lib/FacilityShadingGridView.cpp

@@ -474,7 +474,7 @@ void FacilityShadingGridController::addColumns(const QString& category, std::vec
       if (field == SELECTED) {
         auto checkbox = QSharedPointer<OSSelectAllCheckBox>(new OSSelectAllCheckBox());
         checkbox->setToolTip("Check to select all rows");
-        connect(checkbox.data(), &OSSelectAllCheckBox::stateChanged, this, &FacilityShadingGridController::onSelectAllStateChanged);
+        connect(checkbox.data(), &OSSelectAllCheckBox::checkStateChanged, this, &FacilityShadingGridController::onSelectAllStateChanged);
         connect(this, &FacilityShadingGridController::gridRowSelectionChanged, checkbox.data(), &OSSelectAllCheckBox::onGridRowSelectionChanged);
         addSelectColumn(Heading(QString(SELECTED), false, false, checkbox), "Check to select this row", DataSource(allShadingSurfaces, true));
       } else if (field == SHADINGSURFACENAME) {

src/openstudio_lib/FacilityStoriesGridView.cpp

@@ -276,7 +276,7 @@ void FacilityStoriesGridController::addColumns(const QString& category, std::vec
     } else if (field == SELECTED) {
       auto checkbox = QSharedPointer<OSSelectAllCheckBox>(new OSSelectAllCheckBox());
       checkbox->setToolTip("Check to select all rows");
-      connect(checkbox.data(), &OSSelectAllCheckBox::stateChanged, this, &FacilityStoriesGridController::onSelectAllStateChanged);
+      connect(checkbox.data(), &OSSelectAllCheckBox::checkStateChanged, this, &FacilityStoriesGridController::onSelectAllStateChanged);
       connect(this, &FacilityStoriesGridController::gridRowSelectionChanged, checkbox.data(), &OSSelectAllCheckBox::onGridRowSelectionChanged);
       addSelectColumn(Heading(QString(SELECTED), false, false, checkbox), "Check to select this row");
     } else if (field == NOMINALZCOORDINATE) {

src/openstudio_lib/FacilityTabController.cpp

@@ -46,7 +46,6 @@ void FacilityTabController::setSubTab(int index) {
   }
 
   if (m_currentView) {
-    m_currentView->disconnect();
     delete m_currentView;
   }