Updates for SketchUp 2024

CMakeLists.txt

@@ -512,7 +512,16 @@ endif()
 # Qt
 # e.g. QT_INSTALL_DIR = C:/Qt/6.5.3/msvc2019_64
 set(QT_INSTALL_DIR "" CACHE PATH "Path to Qt Install")
-set(QT_VERSION "6.5.3")
+set(QT_VERSION "6.5.3" CACHE STRING "Qt target version, defaults to 6.5.3")
+
+# For AboutBox, but also validates that the version is valid
+string(REGEX MATCH "^([0-9]+\\.[0-9]+)"
+  QT_VERSION_MAJOR_MINOR ${QT_VERSION})
+if(NOT QT_VERSION_MAJOR_MINOR)
+  message(FATAL_ERROR "Failed to match QT_VERSION=${QT_VERSION}")
+endif()
+set(QT_DOC_LINK "https://doc.qt.io/qt-${QT_VERSION_MAJOR_MINOR}/qtmodules.html")
+
 
 # TODO: how to set OPENSSL_ROOT_DIR to a generator expression?
 set(OPENSSL_ROOT_DIR ${CONAN_OPENSSL_ROOT_RELEASE})

ruby/openstudio_modeleditor.rb

@@ -51,12 +51,12 @@ module WinAPI
   qt_dll_path = File.expand_path(File.join(File.dirname(__FILE__), '../bin/'))
 
   # if install path fails, try developer paths
-  if !File.exist?(File.join(qt_dll_path, 'Qt5Core.dll'))
+  if !File.exists?(File.join(qt_dll_path, 'Qt6Core.dll'))
     release_dll_path = File.expand_path(File.join(File.dirname(__FILE__), '../../Release/'))
     debug_dll_path = File.expand_path(File.join(File.dirname(__FILE__), '../../Debug/'))
-    if File.exist?(File.join(release_dll_path, 'Qt5Core.dll'))
+    if File.exists?(File.join(release_dll_path, 'Qt6Core.dll'))
       qt_dll_path = release_dll_path
-    elsif File.exist?(File.join(debug_dll_path, 'Qt5Core.dll'))
+    elsif File.exists?(File.join(debug_dll_path, 'Qt6Core.dll'))
       qt_dll_path = debug_dll_path
     end
   end

src/openstudio_app/AboutBox.hpp.in

@@ -7,8 +7,8 @@
 <p><a href='https://openstudio.net'>OpenStudio SDK (core)</a> version: ${openstudio_VERSION}</p> \
 <p>Copyright &copy; 2020-2023, OpenStudio Coalition and other contributors. All rights reserved.</p> \
 <p>OpenStudio is a cross-platform tool to support whole building energy and daylight modeling using <a href='http://apps1.eere.energy.gov/buildings/energyplus/'>EnergyPlus</a> and <a href='http://www.radiance-online.org/'>Radiance</a>.</p> \
-<p>OpenStudio uses the following QT modules (version 6.3.0) that are dynamically linked using GNU Lesser General Public License (LGPL): \
-<font size='2'> Qt5Core, Qt5Widgets, Qt5Sql, Qt5Network, Qt5Xml, Qt5Concurrent, Qt5PrintSupport, Qt5Gui,Qt5Quick, Qt5QuickWidgets, Qt5Qml, Qt5WebChannel, Qt5Positioning, Qt5WebEngine, Qt5WebEngineWidgets, QtWebEngineCore, Qt5DBus, Qt5WinExtras</font> </p> \
-<p> For information on QT, please refer to <a href='https://doc.qt.io/qt-6.2/qtmodules.html'>QT</a></p> \
+<p>OpenStudio uses the following QT modules (version ${QT_VERSION}) that are dynamically linked using GNU Lesser General Public License (LGPL): \
+<font size='2'>Qt6Core, Qt6Core5Compat Qt6Widgets, Qt6Network, Qt6Concurrent, Qt6PrintSupport, Qt6Gui, Qt6Quick, Qt6QuickWidgets, Qt6Qml, Qt6QmlModels, Qt6WebChannel, Qt6Positioning, Qt6WebEngine, Qt6WebEngineWidgets, QtWebEngineCore, Qt6DBus, Qt6Xml, Qt6Svg, Qt6OpenGL</font> </p> \
+<p> For information on QT, please refer to <a href='${QT_DOC_LINK}'>QT</a></p> \
 <p> A copy of the GPL 3.0 and LGPL 3.0 are included in the root path of your installation directory.</p>"
 #endif  // OPENSTUDIOAPP_ABOUTBOX