From 2f61ded26997ae3e07167b7f841a6e2e7622e84d Mon Sep 17 00:00:00 2001 From: Le Tan Date: Mon, 2 Oct 2017 20:22:46 +0800 Subject: [PATCH] migrate to Qt 5.9.1 --- .travis_linux.sh | 16 ++++++++-------- .travis_macos.sh | 4 ++-- appveyor.yml | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.travis_linux.sh b/.travis_linux.sh index c793b23c..f1acda01 100644 --- a/.travis_linux.sh +++ b/.travis_linux.sh @@ -1,11 +1,11 @@ #!/bin/bash project_dir=$(pwd) -# Install qt5.7 +# Install qt5.9 sudo add-apt-repository ppa:george-edison55/cmake-3.x -y -sudo add-apt-repository ppa:beineri/opt-qt571-trusty -y +sudo add-apt-repository ppa:beineri/opt-qt591-trusty -y sudo apt-get update -qq -sudo apt-get -y install qt57base qt57webengine qt57webchannel qt57svg qt57location qt57tools qt57translations +sudo apt-get -y install qt59base qt59webengine qt59webchannel qt59svg qt59location qt59tools qt59translations source /opt/qt*/bin/qt*-env.sh # Compile newer version fcitx-qt5 @@ -34,7 +34,7 @@ make -j$(nproc) && sudo make install sudo cp /usr/local/lib/libFcitxQt5DBusAddons.so* /opt/qt*/lib/ sudo cp /usr/local/lib/libFcitxQt5WidgetsAddons.so* /opt/qt*/lib/ -tree /opt/qt57/lib/ +tree /opt/qt59/lib/ cd ${project_dir} mkdir build @@ -53,9 +53,9 @@ INSTALL_ROOT=${project_dir}/build/dist make install ; tree dist/ mkdir -p ./dist/usr/plugins/iconengines mkdir -p ./dist/usr/plugins/imageformats mkdir -p ./dist/usr/plugins/platforminputcontexts -cp /opt/qt57/plugins/iconengines/* ./dist/usr/plugins/iconengines/ -cp /opt/qt57/plugins/imageformats/* ./dist/usr/plugins/imageformats/ -cp /opt/qt57/plugins/platforminputcontexts/* ./dist/usr/plugins/platforminputcontexts/ +cp /opt/qt59/plugins/iconengines/* ./dist/usr/plugins/iconengines/ +cp /opt/qt59/plugins/imageformats/* ./dist/usr/plugins/imageformats/ +cp /opt/qt59/plugins/platforminputcontexts/* ./dist/usr/plugins/platforminputcontexts/ # Copy other project files cp "${project_dir}/README.md" "dist/README.md" @@ -70,7 +70,7 @@ unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH ./linuxdeployqt*.AppImage ./dist/usr/share/applications/*.desktop -bundle-non-qt-libs # Copy translations -cp /opt/qt57/translations/*_zh_CN.qm ./dist/usr/translations/ +cp /opt/qt59/translations/*_zh_CN.qm ./dist/usr/translations/ # Package it for the second time. ./linuxdeployqt*.AppImage ./dist/usr/share/applications/*.desktop -appimage diff --git a/.travis_macos.sh b/.travis_macos.sh index 4e76c9a4..39215947 100644 --- a/.travis_macos.sh +++ b/.travis_macos.sh @@ -2,8 +2,8 @@ project_dir=$(pwd) brew update > /dev/null -brew install qt@5.7 -QTDIR="/usr/local/opt/qt@5.7" +brew install qt@5.9 +QTDIR="/usr/local/opt/qt@5.9" PATH="$QTDIR/bin:$PATH" LDFLAGS=-L$QTDIR/lib CPPFLAGS=-I$QTDIR/include diff --git a/appveyor.yml b/appveyor.yml index 714a91e9..4c32fe15 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,9 +11,9 @@ environment: VSVER: 14 matrix: - - QT: C:\Qt\5.7\msvc2015_64 + - QT: C:\Qt\5.9.1\msvc2015_64 PLATFORM: amd64 - - QT: C:\Qt\5.7\msvc2015 + - QT: C:\Qt\5.9.1\msvc2015 PLATFORM: x86 clone_depth: 1 @@ -29,8 +29,8 @@ before_build: # After calling vcvarsall.bat, %PLATFORM% will be X64 or x86 - mkdir build - cd build - - if "%PLATFORM%" EQU "X64" (qmake -r -spec win32-msvc2015 CONFIG+=x86_64 CONFIG-=debug CONFIG+=release ../VNote.pro) - - if "%PLATFORM%" EQU "x86" (qmake -r -spec win32-msvc2015 CONFIG+=Win32 CONFIG-=debug CONFIG+=release ../VNote.pro) + - if "%PLATFORM%" EQU "X64" (qmake -r -spec win32-msvc CONFIG+=x86_64 CONFIG-=debug CONFIG+=release ../VNote.pro) + - if "%PLATFORM%" EQU "x86" (qmake -r -spec win32-msvc CONFIG+=Win32 CONFIG-=debug CONFIG+=release ../VNote.pro) # custom build scripts build_script: