diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml index 57e707cb7..04df44fd8 100644 --- a/.github/workflows/app_build.yml +++ b/.github/workflows/app_build.yml @@ -433,8 +433,8 @@ jobs: pip show setuptools || true pip install setuptools --upgrade pip3 install aqtinstall - aqt list-qt mac desktop --arch 6.5.2 - aqt list-qt mac desktop --modules 6.5.2 ${{ matrix.QT_ARCH }} + 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 qt5compat qtpositioning qtcharts fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 453b0aa98..8bea07d19 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -272,7 +272,7 @@ endif() # TODO: Modify the more specific variables as needed to indicate prerelease, etc # Keep in beta in-between release cycles. Set to empty string (or comment out) for official) -set(PROJECT_VERSION_PRERELEASE "rc1") +set(PROJECT_VERSION_PRERELEASE "rc2") # OpenStudio version: Only include Major.Minor.Patch, eg "3.0.0", even if you have a prerelease tag set(OPENSTUDIOAPPLICATION_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")