diff options
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/debug.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d09d39e2..c9dbd94f 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -94,7 +94,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: '6.4.2' + version: '6.4.3' cache: 'true' modules: 'qt5compat' diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml index c48b85ce..2e2b5e7f 100644 --- a/.github/workflows/debug.yml +++ b/.github/workflows/debug.yml @@ -90,7 +90,7 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v3 with: - version: '6.4.2' + version: '6.4.3' cache: 'true' modules: 'qt5compat' if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-11' || matrix.os == 'macos-12' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 35a5735e..2fe5278a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -98,7 +98,7 @@ jobs: - name: Install Qt6 uses: jurplel/install-qt-action@v3 with: - version: '6.4.2' + version: '6.4.3' modules: 'qt5compat' cache: 'true' if: matrix.os == 'ubuntu-20.04' || matrix.os == 'macos-11' || matrix.os == 'macos-12' diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 45cbaabb..e16d40e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -45,7 +45,9 @@ if (QT5_ENV_SUPPORT) find_package(Qt6 6 COMPONENTS Core Test Widgets PrintSupport Network Core5Compat) if(NOT Qt6_DIR) find_package(Qt5 5 COMPONENTS Core Test Widgets PrintSupport Network REQUIRED) + message(STATUS "Use Qt5 for application building ${Qt5_DIR}") else() + message(STATUS "Use Qt6 for application building ${Qt6_DIR}") add_definitions(-DGPGFRONTEND_GUI_QT6) endif() |