diff options
| author | Saturneric <[email protected]> | 2022-01-06 12:08:58 +0000 |
|---|---|---|
| committer | Saturneric <[email protected]> | 2022-01-06 12:08:58 +0000 |
| commit | 080b28f6a8bad02e61aac69db567f9e7caff899a (patch) | |
| tree | cae433d2a8ae11c13ca14f14f9ab8ffe7bbf1615 | |
| parent | <refactor>(ci): fixed ci file. (diff) | |
| download | GpgFrontend-080b28f6a8bad02e61aac69db567f9e7caff899a.tar.gz GpgFrontend-080b28f6a8bad02e61aac69db567f9e7caff899a.zip | |
<refactor>(project, ci): modify ci and project file.
1. use apt package qt5-default.
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/release-deb-package.yml | 17 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 |
2 files changed, 4 insertions, 17 deletions
diff --git a/.github/workflows/release-deb-package.yml b/.github/workflows/release-deb-package.yml index 104894aa..f3123552 100644 --- a/.github/workflows/release-deb-package.yml +++ b/.github/workflows/release-deb-package.yml @@ -38,7 +38,7 @@ jobs: - name: Install Dependence (Ubuntu 18.04) run: | sudo apt-get update - sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo + sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo qt5-default sudo apt-get -y install gcc-8 g++-8 libconfig++-dev libboost-all-dev sudo apt-get -y install gpgsm libxcb-xinerama0 libxcb-icccm4-dev libcups2-dev libdrm-dev libegl1-mesa-dev sudo apt-get -y install libgcrypt11-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp ninja-build @@ -53,7 +53,7 @@ jobs: - name: Install Dependence (Ubuntu 20.04) run: | sudo apt-get update - sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo + sudo apt-get -y install build-essential binutils git autoconf automake gettext texinfo qt5-default sudo apt-get -y install gcc g++ libconfig++-dev libboost-all-dev sudo apt-get -y install gpgsm libxcb-xinerama0 libxcb-icccm4-dev libcups2-dev libdrm-dev libegl1-mesa-dev sudo apt-get -y install libgcrypt20-dev libnss3-dev libpci-dev libpulse-dev libudev-dev libxtst-dev gyp ninja-build @@ -61,19 +61,6 @@ jobs: sudo apt-get -y install libglu1-mesa-dev libfontconfig1-dev libx11-xcb-dev libicu-dev libxcb-* if: matrix.os == 'ubuntu-20.04' - - name: Cache Qt - id: cache-qt - uses: actions/cache@v1 - with: - path: ../Qt - key: ${{ runner.os }}-QtCache-5.12.8 - - - name: Install Qt - uses: jurplel/install-qt-action@v2 - with: - cached: ${{ steps.cache-qt.outputs.cache-hit }} - version: '5.12.8' - - name: Build gpg-error run: | cd ${{github.workspace}}/third_party/libgpg-error diff --git a/CMakeLists.txt b/CMakeLists.txt index 10ea2766..38df1d65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -354,9 +354,9 @@ find_package(Boost COMPONENTS date_time filesystem REQUIRED) if (QT5_ENV_SUPPORT) # Support Qt version Both 5.12.x and 5.15.x if (LINUX_INSTALL_SOFTWARE) - find_package(Qt5 5.12 COMPONENTS Core Test Widgets PrintSupport Network REQUIRED) - else () find_package(Qt5 COMPONENTS Core Test Widgets PrintSupport Network REQUIRED) + else () + find_package(Qt5 5.15 COMPONENTS Core Test Widgets PrintSupport Network REQUIRED) endif () # find_package(Qt5 5.15.2 EXACT COMPONENTS Core Test Widgets PrintSupport Network LinguistTools REQUIRED) # Qt configuration |