Skip to content

Commit 81d0151

Browse files
authored
Switch to qt 5.15.2 and older VS. (#3)
* Update to Qt 5.15.2, last version before qt 6 * Compiler on windows using older VS version to resolve problems with pyside not being able to parse latest MSVC headers * Move Linux build from Travis to GHA * Disable ccache on Linux so that it doesn't have to be installed in CI. It doesn't save time in CI without additional setup which is somewhat tricky. * Remove xkb option because Qt removed it and changed defaults. See https://code.qt.io/cgit/qt/qtbase.git/tree/dist/changes-5.15.0/?h=v5.15.0
1 parent 8e091fb commit 81d0151

File tree

4 files changed

+32
-17
lines changed

4 files changed

+32
-17
lines changed

.github/workflows/package-build.yml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ on:
44
push:
55
branches:
66
- master
7-
#- qt14 # TODO: remove when branch is done
87
tags:
98
- v*
9+
- deploy-test*
1010
pull_request:
1111
branches:
1212
- master
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
1818
matrix:
19-
os: [windows-latest, macos-latest]
19+
os: [windows-2016, macos-latest, ubuntu-16.04]
2020
fail-fast: false
2121
steps:
2222
- uses: actions/checkout@v2
@@ -25,15 +25,28 @@ jobs:
2525
shell: powershell
2626
run: |
2727
./build_windows.ps1
28-
echo '::set-env name=UPLOAD_FILE::cutter-deps-qt-win.tar.gz'
29-
echo '::set-env name=UPLOAD_ASSET_TYPE::application/gzip'
28+
echo "UPLOAD_FILE=cutter-deps-qt-win.tar.gz" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
29+
echo "UPLOAD_ASSET_TYPE=application/gzip" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
3030
- name: build macos
3131
if: contains(matrix.os, 'macos')
3232
run: |
3333
xcode-select --print-path
3434
make
35-
echo '::set-env name=UPLOAD_FILE::cutter-deps-qt-macos.tar.gz'
36-
echo '::set-env name=UPLOAD_ASSET_TYPE::application/gzip'
35+
echo UPLOAD_FILE=cutter-deps-qt-macos.tar.gz >> $GITHUB_ENV
36+
echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV
37+
- name: build linux
38+
if: contains(matrix.os, 'ubuntu')
39+
run: |
40+
sudo apt-get install libxcb1-dev libxkbcommon-dev libxkbcommon-x11-dev libgtk-3-dev libgl1-mesa-dev libglu1-mesa-dev libxcb-*-dev
41+
make
42+
echo UPLOAD_FILE=cutter-deps-qt-linux.tar.gz >> $GITHUB_ENV
43+
echo UPLOAD_ASSET_TYPE=application/gzip >> $GITHUB_ENV
44+
- uses: actions/upload-artifact@v2
45+
if: startsWith(github.event.ref, 'refs/tags') == false
46+
with:
47+
name: ${{ env.UPLOAD_FILE }}
48+
path: ${{ env.UPLOAD_FILE }}
49+
if-no-files-found: warn
3750
- name: Get release
3851
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags')
3952
id: get_release
File renamed without changes.

Makefile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,25 @@ ifeq ($(filter ${PLATFORM},${PLATFORMS_SUPPORTED}),)
1818
endif
1919

2020
ifeq (${PLATFORM},win)
21-
QT_SRC_FILE=qt-everywhere-src-5.14.2.zip
22-
QT_SRC_MD5=93a3d5cae271fdab6b3cd9a8e0c4a260
23-
QT_SRC_URL=https://download.qt.io/official_releases/qt/5.14/5.14.2/single/qt-everywhere-src-5.14.2.zip
21+
QT_SRC_FILE=qt-everywhere-src-5.15.2.zip
22+
QT_SRC_MD5=40fc0bda97fbcc1eff8ab905ce2b0300
23+
QT_SRC_URL=https://download.qt.io/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.zip
2424
else
25-
QT_SRC_FILE=qt-everywhere-src-5.14.2.tar.xz
26-
QT_SRC_MD5=b3d2b6d00e6ca8a8ede6d1c9bdc74daf
27-
QT_SRC_URL=https://download.qt.io/official_releases/qt/5.14/5.14.2/single/qt-everywhere-src-5.14.2.tar.xz
25+
QT_SRC_FILE=qt-everywhere-src-5.15.2.tar.xz
26+
QT_SRC_MD5=e1447db4f06c841d8947f0a6ce83a7b5
27+
QT_SRC_URL=https://download.qt.io/official_releases/qt/5.15/5.15.2/single/qt-everywhere-src-5.15.2.tar.xz
2828
endif
2929

30-
QT_SRC_DIR=qt-everywhere-src-5.14.2
30+
QT_SRC_DIR=qt-everywhere-src-5.15.2
3131
QT_BUILD_DIR=${QT_SRC_DIR}/build
3232
QT_PREFIX=${ROOT_DIR}/qt
3333

3434
JOM_URL=https://download.qt.io/official_releases/jom/jom.zip
3535

3636
ifeq (${PLATFORM},linux)
3737
PLATFORM_QT_CONFIGURE=configure
38-
PLATFORM_QT_OPTIONS=-xcb -xkb -gtk -ccache -linker gold
38+
#-ccache
39+
PLATFORM_QT_OPTIONS=-xcb -gtk -linker gold
3940
# -linker gold https://bugreports.qt.io/browse/QTBUG-76196
4041
endif
4142
ifeq (${PLATFORM},macos)

build_windows.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ function Fatal-Error() {
1515
}
1616

1717
function SetupVsEnv() {
18+
vswhere -legacy -prerelease
1819
$path = vswhere -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath
1920
if (-not $?) {
2021
Fatal-Error "vswhere failed"
@@ -67,12 +68,12 @@ function DownloadAndCheckFile() {
6768

6869
SetupVsEnv
6970

70-
$version_base = "5.14"
71-
$version_full = "5.14.2"
71+
$version_base = "5.15"
72+
$version_full = "5.15.2"
7273
#$url = "https://download.qt.io/official_releases/qt/$version_base/$version_full/single/qt-everywhere-src-$version_full.zip"
7374
$url = "http://master.qt.io/archive/qt/$version_base/$version_full/single/qt-everywhere-src-$version_full.zip"
7475
$output = "qt-everywhere-src-$version_full.zip"
75-
$hash_expected = "847f39c5b9db3eeee890a2aee3065ae81032287ab9d5812015ff9b37d19b64d6"
76+
$hash_expected = "6c5d37aa96f937eb59fd4e9ce5ec97f45fbf2b5de138b086bdeff782ec661733"
7677
$QT_SRC_DIR = "qt-everywhere-src-$version_full"
7778
$qt_build_dir = "$QT_SRC_DIR/build"
7879
$QT_PREFIX = "$PSScriptRoot/qt"

0 commit comments

Comments
 (0)