Skip to content

Commit

Permalink
Merge pull request #692 from openstudiocoalition/upgrade_qt_6_6_2
Browse files Browse the repository at this point in the history
Upgrade to Qt 6.6.2 to fix #688
  • Loading branch information
macumber authored Mar 19, 2024
2 parents 6ead472 + b089a5f commit ca419e4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/app_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ env:
CPACK_SOURCE_TXZ: OFF
CPACK_SOURCE_TZ: OFF
CPACK_SOURCE_ZIP: OFF
QT_VERSION: 6.6.1
QT_VERSION: 6.6.2
# CPACK_BINARY_DEB: OS-SPECIFIC
# CPACK_BINARY_IFW: OS-SPECIFIC

Expand Down Expand Up @@ -402,7 +402,7 @@ jobs:
cmake -E make_directory ./build
if [ "$RUNNER_OS" == "macOS" ]; then
QT_INSTALL_DIR="/Users/irvinemac/Qt/6.6.1/macos/"
QT_INSTALL_DIR="/Users/irvinemac/Qt/6.6.2/macos/"
fi
echo "$QT_INSTALL_DIR/bin" >> $GITHUB_PATH
Expand Down
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -505,9 +505,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/6.6.1/msvc2019_64
# e.g. QT_INSTALL_DIR = C:/Qt/6.6.2/msvc2019_64
set(QT_INSTALL_DIR "" CACHE PATH "Path to Qt Install")
set(QT_VERSION "6.6.1")
set(QT_VERSION "6.6.2")

# TODO: how to set OPENSSL_ROOT_DIR to a generator expression?
set(OPENSSL_ROOT_DIR ${CONAN_OPENSSL_ROOT_RELEASE})
Expand Down Expand Up @@ -605,7 +605,7 @@ if(WIN32)
endif()

if(UNIX AND NOT APPLE)
# Apparently libqxcb.so depends on libQt6OpenGL.so in Qt 6.6.1 (it depended on libGL on 5.15.0 but not OpenGL)
# Apparently libqxcb.so depends on libQt6OpenGL.so in Qt 6.6.2 (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()
Expand Down

0 comments on commit ca419e4

Please sign in to comment.