Merge pull request #233 from docsteer/qt_515

Migrate to Qt 5.15
docsteer · Jan 9, 2021 · b094563 · b094563
2 parents 3c81d31 + c1711e1
commit b094563
Show file tree

Hide file tree

Showing 16 changed files with 746 additions and 190 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,17 +8,17 @@ matrix:
         addons:
           apt:
             sources:
-              - sourceline: 'ppa:beineri/opt-qt-5.12.3-xenial'
+              - sourceline: 'ppa:beineri/opt-qt-5.15.0-xenial'
               - sourceline: 'ppa:brightbox/ruby-ng'
             packages:
               # FPM dependencies
               - build-essential
               - ruby2.3
               - ruby2.3-dev
               # QT
-              - qt512base
-              - qt512multimedia
-              - qt512tools
+              - qt515base
+              - qt515multimedia
+              - qt515tools
               - mesa-common-dev
               - libgl1-mesa-dev
               # PCap
@@ -40,18 +40,18 @@ matrix:
           - echo "Uploading $BASENAME to file.io..." && curl -sF "file=@$FILE" https://file.io | xargs printf "$BASENAME uploaded - %s\n"
 
       - os: osx
-        osx_image: xcode9.4
+        osx_image: xcode11.6
+        addons:
+          homebrew:
+            packages:
+            - libpcap
+            - qt
+            - create-dmg
         before_install:
           - chmod +x install/mac/sign-mac-executable.sh
           - ./install/mac/sign-mac-executable.sh
-          - brew update
         install:
-          # PCap
-          - brew install libpcap
-          # QT 5.12.3
-          - git -C "$(brew --repo homebrew/core)" pull --unshallow
-          - git -C "$(brew --repo homebrew/core)" checkout -b qt5.12.3 65a45a9e61f15046a256cdba6a008f38f79570c9
-          - HOMEBREW_NO_AUTO_UPDATE=1 brew install qt
+          # QT
           - brew link --force qt
         script:
           - qmake

diff --git a/appveyor.yml b/appveyor.yml
@@ -20,11 +20,11 @@ environment:
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
       QT_Ver: 5.6
       MSVC_Compiler: msvc2015
-      MSVC_Name: Microsoft Visual Studio 14.0
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      QT_Ver: 5.12
-      MSVC_Compiler: msvc2017
-      MSVC_Name: Microsoft Visual Studio 14.0
+      VCVAR: 'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat'
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
+      QT_Ver: 5.15
+      MSVC_Compiler: msvc2019
+      VCVAR: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat'
 
 # build platform, i.e. x86, x64, Any CPU. This setting is optional.
 platform: x86
@@ -47,7 +47,7 @@ install:
 
   # MSVC Paths
   # https://www.appveyor.com/docs/lang/cpp/#visual-studio
-  - call "C:\Program Files (x86)\%MSVC_Name%\VC\vcvarsall.bat" x86
+  - call "%VCVAR%" x86
 
   # QT Paths
   # https://www.appveyor.com/docs/build-environment/#qt

diff --git a/deploy.pri b/deploy.pri
@@ -49,8 +49,9 @@ macx {
     DEPLOY_CLEANUP = codesign --force --deep --verify --verbose --sign \"Thomas Steer\" $${DEPLOY_TARGET} $$escape_expand(\\n\\t)
     DEPLOY_CLEANUP += $${QMAKE_DEL_FILE} $${DEPLOY_DIR}/sACNView*.dmg
 
-    DEPLOY_INSTALLER = $${_PRO_FILE_PWD_}/install/mac/create-dmg --volname "sACNView_Installer" --volicon "$${_PRO_FILE_PWD_}/res/icon.icns"
-    DEPLOY_INSTALLER += --background "$${_PRO_FILE_PWD_}/res/mac_install_bg.png" --window-pos 200 120 --window-size 800 400 --icon-size 100 --icon $${TARGET}$${TARGET_CUSTOM_EXT} 200 190 --hide-extension $${TARGET}$${TARGET_CUSTOM_EXT} --app-drop-link 600 185
+    DEPLOY_INSTALLER = create-dmg --volname "sACNView_Installer" --volicon "$${_PRO_FILE_PWD_}/res/icon.icns"
+    DEPLOY_INSTALLER += --background "$${_PRO_FILE_PWD_}/res/mac_install_bg.png" --window-pos 200 120 --window-size 800 400 --icon-size 100
+    DEPLOY_INSTALLER += --icon $${TARGET}$${TARGET_CUSTOM_EXT} 200 190 --hide-extension $${TARGET}$${TARGET_CUSTOM_EXT} --app-drop-link 600 185 --skip-jenkins
     DEPLOY_INSTALLER += $${DEPLOY_DIR}/sACNView_$${VERSION}.dmg $${OUT_PWD}/$${TARGET}$${TARGET_CUSTOM_EXT}
 }
 linux {