Upgrade to Qt 6

.github/workflows/app_build.yml

@@ -28,7 +28,7 @@ env:
   CPACK_SOURCE_TXZ: OFF
   CPACK_SOURCE_TZ: OFF
   CPACK_SOURCE_ZIP: OFF
-  QT_VERSION: 5.15.0
+  QT_VERSION: 6.2.3
   # CPACK_BINARY_DEB: OS-SPECIFIC
   # CPACK_BINARY_IFW: OS-SPECIFIC
 
@@ -242,13 +242,25 @@ jobs:
         if [ "$RUNNER_OS" == "Linux" ]; then
           echo "Install needed system dependencies for OPENGL (due to Qt) for Linux"
           sudo apt update
-          sudo apt install -y mesa-common-dev libglu1-mesa-dev patchelf ninja-build
+          sudo apt install -y mesa-common-dev libglu1-mesa-dev patchelf ninja-build libxkbcommon-x11-dev libgl1-mesa-dev
+
           # Weirdly enough, ninja makes ubuntu unresponsive...
           echo CMAKE_GENERATOR='Ninja' >> $GITHUB_ENV
+
+          # Qt 6.0 doesn't support Ubuntu 18.04, try to bump the gcc version
+          if [ $(lsb_release -rs) == '18.04' ]; then
+            sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
+            sudo apt update
+            sudo apt install gcc-9 g++-9
+            sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 --slave /usr/bin/g++ g++ /usr/bin/g++-9 --slave /usr/bin/gcov gcov /usr/bin/gcov-9
+          fi;
+          gcc --version
+
         elif [ "$RUNNER_OS" == "Windows" ]; then
-          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.0.1/QtInstallerFramework-win-x86.exe
-          ./QtInstallerFramework-win-x86.exe --verbose --script ./ci/install_script_qtifw.qs
-          echo "C:/Qt/QtIFW-4.0.1/bin" >> $GITHUB_PATH
+          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.3.0/QtInstallerFramework-windows-x86-4.3.0.exe
+          ./QtInstallerFramework-windows-x86-4.3.0.exe --verbose --script ./ci/install_script_qtifw.qs
+          dir "C:/Qt/"
+          echo "C:/Qt/QtIFW-4.3.0/bin" >> $GITHUB_PATH
 
           echo "Using chocolatey to install ninja"
           choco install ninja
@@ -270,18 +282,24 @@ jobs:
 
           brew install md5sha1sum
 
-          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.0.1/QtInstallerFramework-mac-x64.dmg
-          hdiutil attach -mountpoint ./qtfiw_installer QtInstallerFramework-mac-x64.dmg
+          curl -L -O https://download.qt.io/official_releases/qt-installer-framework/4.3.0/QtInstallerFramework-macOS-x64-4.3.0.dmg
+          hdiutil attach -mountpoint ./qtfiw_installer QtInstallerFramework-macOS-x64-4.3.0.dmg
           echo "ls ./qtfiw_installer"
           ls ./qtfiw_installer
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/"
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/"
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/MacOS"
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/Resources"
-          echo "ls ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/Frameworks"
-
-          sudo ./qtfiw_installer/QtInstallerFramework-mac-x64.app/Contents/MacOS/QtInstallerFramework-mac-x64 --verbose --script ./ci/install_script_qtifw.qs
-          echo "~/Qt/QtIFW-4.0.1/bin/" >> $GITHUB_PATH
+          echo "ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/"
+          ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/
+          echo "ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/"
+          ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/
+          echo "ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/MacOS"
+          ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/MacOS
+          echo "ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/Resources"
+          ls ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/Resources
+
+          sudo ./qtfiw_installer/QtInstallerFramework-macOS-x64-4.3.0.app/Contents/MacOS/QtInstallerFramework-macOS-x64-4.3.0 --verbose --script ./ci/install_script_qtifw.qs
+          ls ~
+          ls ~/Qt/ || true
+          ls ~/Qt/QtIFW-4.3.0 || true
+          echo "~/Qt/QtIFW-4.3.0/bin/" >> $GITHUB_PATH
         fi;
 
         CONAN_INSTALL_MD5=$(md5sum ConanInstall.cmake | awk '{print $1}')
@@ -295,7 +313,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: build/
-        key: ${{ matrix.os }}-build-cache-${{ secrets.CACHE_KEY }}
+        key: ${{ matrix.os }}-build-cache-qt6-${{ secrets.CACHE_KEY }}
 
     - name: Did restoring the build-cache work? No
       # If the build cache wasn't found in the cache
@@ -418,15 +436,18 @@ jobs:
         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"
+        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 }}"
         fi
+        rm -rf $QT_INSTALL_DIR
         if [ -d "$QT_INSTALL_DIR" ]; then
           echo "Qt $QT_VERSION already installed"
         else
           echo "Install aqtinstall, then install Qt $QT_VERSION for ${{ matrix.QT_OS_NAME }} ${{ matrix.QT_ARCH }}"
           pip3 install aqtinstall
-          aqt install --outputdir ./build/Qt-install/ $QT_VERSION ${{ matrix.QT_OS_NAME }} desktop ${{ matrix.QT_ARCH }} -m qtwebengine qtwebglplugin
+          aqt install-qt --outputdir ./build/Qt-install/ ${{ matrix.QT_OS_NAME }} desktop $QT_VERSION ${{ matrix.QT_ARCH }} -m qtwebchannel qtwebengine qtwebview qt5compat qtpositioning
         fi
 
         echo "$QT_INSTALL_DIR/bin" >> $GITHUB_PATH

CMakeLists.txt

@@ -359,6 +359,9 @@ if(MSVC)
   # all warnings - DLM: probably too high to ever use
   #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Wall")
 
+  # needed for compiling with Qt6
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus")
+
   # create compiler processes on all effective processors
   # /MP is useless for ninja and will cause problems. BUILD_WITH_MULTIPLE_PROCESSES shouldn't have been set if ninja but let's be safe
   if(BUILD_WITH_MULTIPLE_PROCESSES AND NOT NINJA)
@@ -443,10 +446,9 @@ set(SWIG_EXECUTABLE "${CURRENT_CONAN_SWIG_ROOT}/bin/swig")
 set(SWIG_LIB "${CURRENT_CONAN_SWIG_ROOT}/bin/swiglib")
 
 # Qt
-# e.g. QT_INSTALL_DIR = C:/Qt-5.15.0/5.15.0/msvc2019_64
+# e.g. QT_INSTALL_DIR = C:/Qt/6.2.1/msvc2019_64
 set(QT_INSTALL_DIR "" CACHE PATH "Path to Qt Install")
-mark_as_advanced(QT_INSTALL_DIR)
-set(QT_VERSION "5.15.0")
+set(QT_VERSION "6.2.3")
 #if(NOT EXISTS ${QT_INSTALL_DIR})
   ## download qt
   #if(WIN32)
@@ -505,27 +507,15 @@ set(QT_VERSION "5.15.0")
   #set(QT_INSTALL_DIR "${PROJECT_BINARY_DIR}/Qt-install/${QT_VERSION}/win64_msvc2019_64")
 #endif()
 
+# TODO: how to set OPENSSL_ROOT_DIR to a generator expression?
+set(OPENSSL_ROOT_DIR ${CONAN_OPENSSL_ROOT_RELEASE})
+message(STATUS "OPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}")
+
 message(STATUS "QT_INSTALL_DIR=${QT_INSTALL_DIR}")
 
-find_package(Qt5Core ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5Widgets ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5Sql ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5Network ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5Xml ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5Concurrent ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5PrintSupport ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5Gui ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5Quick ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5QuickWidgets ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5Qml ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5WebChannel ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5Positioning ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-
-find_package(Qt5WebEngine ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-find_package(Qt5WebEngineWidgets ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-#find_package(Qt53DCore ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-#find_package(Qt53DInput ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-#find_package(Qt53DRender ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+find_package(Qt6 ${QT_VERSION} COMPONENTS CoreTools GuiTools WidgetsTools QmlTools WebEngineCoreTools REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+
+find_package(Qt6 ${QT_VERSION} COMPONENTS Core Core5Compat Gui Widgets Sql Network Xml Concurrent PrintSupport Quick QuickWidgets Qml WebChannel Positioning WebEngineCore WebEngineWidgets REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
 
 if(APPLE)
   set(QtWebEngineProcess "${QT_INSTALL_DIR}/lib/QtWebEngineCore.framework/Helpers/QtWebEngineProcess.app" CACHE PATH "Path to the QtWebEngineProcess")
@@ -540,51 +530,41 @@ find_file(qweb_resources_200 NAMES qtwebengine_resources_200p.pak PATHS "${QT_IN
 
 # DLM: why do we have QT_WEB_LIBS separate from QT_LIBS?  can we combine these?
 # DLM: now the distincton should be between Qt libs linked by openstudio_modeleditor.so and the OS App
-list(APPEND QT_WEB_LIBS Qt5::Core)
-list(APPEND QT_WEB_LIBS Qt5::Gui)
-list(APPEND QT_WEB_LIBS Qt5::WebEngine)
-list(APPEND QT_WEB_LIBS Qt5::WebEngineCore)
-list(APPEND QT_WEB_LIBS Qt5::WebEngineWidgets)
-#list(APPEND QT_WEB_LIBS Qt5::3DCore)
-#list(APPEND QT_WEB_LIBS Qt5::3DInput)
-#list(APPEND QT_WEB_LIBS Qt5::3DRender)
+list(APPEND QT_WEB_LIBS Qt6::Core)
+list(APPEND QT_WEB_LIBS Qt6::Core5Compat)
+list(APPEND QT_WEB_LIBS Qt6::Widgets)
+list(APPEND QT_WEB_LIBS Qt6::WebEngineCore)
+list(APPEND QT_WEB_LIBS Qt6::WebEngineWidgets)
+#list(APPEND QT_WEB_LIBS Qt6::3DCore)
+#list(APPEND QT_WEB_LIBS Qt6::3DInput)
+#list(APPEND QT_WEB_LIBS Qt6::3DRender)
 set_target_properties(${QT_WEB_LIBS} PROPERTIES INTERFACE_LINK_LIBRARIES "")
 
 if(NOT APPLE)
 
-    find_package(Qt5WebChannel ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-    list(APPEND QT_WEB_LIBS Qt5::WebChannel)
+    find_package(Qt6WebChannel ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+    list(APPEND QT_WEB_LIBS Qt6::WebChannel)
 
-    find_package(Qt5Quick ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-    list(APPEND QT_WEB_LIBS Qt5::Quick)
+    find_package(Qt6Quick ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+    list(APPEND QT_WEB_LIBS Qt6::Quick)
 
-    find_package(Qt5QuickWidgets ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-    list(APPEND QT_WEB_LIBS Qt5::QuickWidgets)
+    find_package(Qt6QuickWidgets ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+    list(APPEND QT_WEB_LIBS Qt6::QuickWidgets)
 
-    find_package(Qt5Qml ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-    list(APPEND QT_WEB_LIBS Qt5::Qml)
+    find_package(Qt6Qml ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+    list(APPEND QT_WEB_LIBS Qt6::Qml)
 
-    find_package(Qt5QmlModels ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-    list(APPEND QT_WEB_LIBS Qt5::QmlModels)
+    find_package(Qt6QmlModels ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+    list(APPEND QT_WEB_LIBS Qt6::QmlModels)
 
-    find_package(Qt5Positioning ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-    list(APPEND QT_WEB_LIBS Qt5::Positioning)
+    find_package(Qt6Positioning ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+    list(APPEND QT_WEB_LIBS Qt6::Positioning)
 
     if(UNIX)
-      find_package(Qt5DBus ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-      list(APPEND QT_WEB_LIBS Qt5::DBus)
-
-      # there does not appear to be a normal qt finder for this
-      # DLM: actually there is, it is a plugin associated with Qt5::Gui
-      #message( Qt5Gui_PLUGINS = ${Qt5Gui_PLUGINS})
-      #get_target_property(Qt5QXcbIntegrationPlugin_LOCATION Qt5::QXcbIntegrationPlugin LOCATION)
-      #get_target_property(Qt5QXcbIntegrationPlugin_TYPE Qt5::QXcbIntegrationPlugin TYPE)
-      #message("Qt5::QXcbIntegrationPlugin Location = ${Qt5QXcbIntegrationPlugin_LOCATION}")
-      #message("Qt5::QXcbIntegrationPlugin Type = ${Qt5QXcbIntegrationPlugin_TYPE}")
-      list(APPEND QT_PLUGINS Qt5::QXcbIntegrationPlugin)
-      # This one doesn't end up in bin/platforms/, but in bin/xcbglintegrations/ so do not append, will be treated separately
-      # list(APPEND QT_PLUGINS Qt5::QXcbGlxIntegrationPlugin)
-      find_library(QT_QXCBQPA NAMES libQt5XcbQpa.so.${QT_VERSION} PATHS "${QT_INSTALL_DIR}/lib" NO_DEFAULT_PATH)
+      find_package(Qt6DBus ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+      list(APPEND QT_WEB_LIBS Qt6::DBus)
+
+      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)
@@ -600,48 +580,51 @@ if(NOT APPLE)
 endif()
 
 if(APPLE)
-  find_package(Qt5DBus ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-  list(APPEND QT_WEB_LIBS Qt5::DBus)
+  find_package(Qt6DBus ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+  list(APPEND QT_WEB_LIBS Qt6::DBus)
 endif()
 
-list(APPEND QT_LIBS Qt5::Core)
-list(APPEND QT_LIBS Qt5::Widgets)
-list(APPEND QT_LIBS Qt5::Network)
-list(APPEND QT_LIBS Qt5::Xml)
-list(APPEND QT_LIBS Qt5::Concurrent)
-list(APPEND QT_LIBS Qt5::PrintSupport)
-list(APPEND QT_LIBS Qt5::Gui)
+list(APPEND QT_LIBS Qt6::Core)
+list(APPEND QT_LIBS Qt6::Core5Compat)
+list(APPEND QT_LIBS Qt6::Widgets)
+list(APPEND QT_LIBS Qt6::Network)
+list(APPEND QT_LIBS Qt6::Xml)
+list(APPEND QT_LIBS Qt6::PrintSupport)
+list(APPEND QT_LIBS Qt6::Gui)
 
 if(WIN32)
-  find_package(Qt5WinExtras ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-  list(APPEND QT_LIBS Qt5::WinExtras)
+  find_package(Qt6OpenGL ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+  list(APPEND QT_LIBS Qt6::OpenGL)
 
-  find_package(Qt5OpenGL ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
-  list(APPEND QT_LIBS Qt5::OpenGL)
-  list(APPEND QT_LIBS Qt5::Gui_EGL)
-  list(APPEND QT_LIBS Qt5::Gui_GLESv2)
+  find_program(QT_WINDEPLOY_QT NAMES windeployqt.exe PATHS "${QT_INSTALL_DIR}/bin" NO_DEFAULT_PATH)
 
-  find_library(QT_MAIN_LIB NAMES qtmain PATHS "${QT_INSTALL_DIR}/lib" NO_DEFAULT_PATH)
-  find_library(QT_MAIN_LIB_D NAMES qtmaind PATHS "${QT_INSTALL_DIR}/lib" NO_DEFAULT_PATH)
+  find_library(QT_ENTRYPOINT_LIB NAMES Qt6EntryPoint PATHS "${QT_INSTALL_DIR}/lib" NO_DEFAULT_PATH)
+  find_library(QT_ENTRYPOINT_LIB_D NAMES Qt6EntryPointd PATHS "${QT_INSTALL_DIR}/lib" NO_DEFAULT_PATH)
+endif()
+
+if(UNIX AND NOT APPLE)
+  # Apparently libqxcb.so depends on libQt6OpenGL.so in Qt 6.2.1 (it depended on libGL on 5.15.0 but not OpenGL)
+  find_package(Qt6OpenGL ${QT_VERSION} REQUIRED PATHS ${QT_INSTALL_DIR} NO_DEFAULT_PATH)
+  list(APPEND QT_LIBS Qt6::OpenGL)
 endif()
 
-list(APPEND QT_INCLUDES ${Qt5Core_INCLUDE_DIRS})
-list(APPEND QT_INCLUDES ${Qt5Concurrent_INCLUDE_DIRS})
-list(APPEND QT_INCLUDES ${Qt5Widgets_INCLUDE_DIRS})
-list(APPEND QT_INCLUDES ${Qt5Xml_INCLUDE_DIRS})
-list(APPEND QT_INCLUDES ${Qt5Network_INCLUDE_DIRS})
-list(APPEND QT_INCLUDES ${Qt5Gui_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6Core_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6Concurrent_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6Widgets_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6Xml_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6Network_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6Gui_INCLUDE_DIRS})
 list(APPEND QT_INCLUDES "${QT_INSTALL_DIR}/include/QtGui/${QT_VERSION}/QtGui") # needed by qtwinmigrate
-list(APPEND QT_INCLUDES ${Qt5PrintSupport_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6PrintSupport_INCLUDE_DIRS})
 
 # DLM: added this, but seems to conflict with idea of a separate set of Qt Web dependencies?
-list(APPEND QT_INCLUDES ${Qt5Network_INCLUDE_DIRS})
-list(APPEND QT_INCLUDES ${Qt5WebEngine_INCLUDE_DIRS})
-list(APPEND QT_INCLUDES ${Qt5WebEngineCore_INCLUDE_DIRS})
-list(APPEND QT_INCLUDES ${Qt5WebEngineWidgets_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6Network_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6WebEngine_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6WebEngineCore_INCLUDE_DIRS})
+list(APPEND QT_INCLUDES ${Qt6WebEngineWidgets_INCLUDE_DIRS})
 
 if(UNIX)
-  list(APPEND QT_INCLUDES ${Qt5XcbQpa_INCLUDE_DIRS})
+  list(APPEND QT_INCLUDES ${Qt6XcbQpa_INCLUDE_DIRS})
 endif()
 
 set(CMAKE_AUTOMOC OFF)

FindOpenStudioSDK.cmake

@@ -13,8 +13,13 @@ set(OPENSTUDIO_ARCHIVE_DIR "${PROJECT_BINARY_DIR}/OpenStudio-${OPENSTUDIO_VERSIO
 
 # If downloaded, we need the SHA to match. This block is here since we need "OPENSTUDIO_PLATFORM" anyways
 if(APPLE)
-  set(OPENSTUDIO_EXPECTED_HASH 77c2bf77f07dc2e2af7658df55940c49)
-  set(OPENSTUDIO_PLATFORM "Darwin")
+  if(ARCH MATCHES "arm64")
+    set(OPENSTUDIO_EXPECTED_HASH f215e3db09f3914cf0f2040f601147e1)
+    set(OPENSTUDIO_PLATFORM "Darwin-arm64")
+  else()
+    set(OPENSTUDIO_EXPECTED_HASH 77c2bf77f07dc2e2af7658df55940c49)
+    set(OPENSTUDIO_PLATFORM "Darwin")
+  endif()
   set(OPENSTUDIO_EXT "tar.gz")
 elseif(UNIX)
 

ci/install_script_qtifw.qs

@@ -112,7 +112,7 @@ Controller.prototype.TargetDirectoryPageCallback = function()
 Controller.prototype.LicenseAgreementPageCallback = function() {
   console.log("---- LICENSE AGREEMENT PAGE");
   logCurrentPage();
-  gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
+  gui.currentPageWidget().AcceptLicenseCheckBox.setChecked(true);
   gui.clickButton(buttons.NextButton);
 };