dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 13:59:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

migrate to Qt 5.9.1

Browse Source
This commit is contained in:
Le Tan 2017-10-02 20:22:46 +08:00
parent b3c8213e1a
commit 2f61ded269
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.travis_linux.sh
View File

@ -1,11 +1,11 @@
#!/bin/bash #!/bin/bash
project_dir=$(pwd) 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: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 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 source /opt/qt*/bin/qt*-env.sh
# Compile newer version fcitx-qt5 # 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/libFcitxQt5DBusAddons.so* /opt/qt*/lib/
sudo cp /usr/local/lib/libFcitxQt5WidgetsAddons.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} cd ${project_dir}
mkdir build 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/iconengines
mkdir -p ./dist/usr/plugins/imageformats mkdir -p ./dist/usr/plugins/imageformats
mkdir -p ./dist/usr/plugins/platforminputcontexts mkdir -p ./dist/usr/plugins/platforminputcontexts
cp /opt/qt57/plugins/iconengines/* ./dist/usr/plugins/iconengines/ cp /opt/qt59/plugins/iconengines/* ./dist/usr/plugins/iconengines/
cp /opt/qt57/plugins/imageformats/* ./dist/usr/plugins/imageformats/ cp /opt/qt59/plugins/imageformats/* ./dist/usr/plugins/imageformats/
cp /opt/qt57/plugins/platforminputcontexts/* ./dist/usr/plugins/platforminputcontexts/ cp /opt/qt59/plugins/platforminputcontexts/* ./dist/usr/plugins/platforminputcontexts/
# Copy other project files # Copy other project files
cp "${project_dir}/README.md" "dist/README.md" 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 ./linuxdeployqt*.AppImage ./dist/usr/share/applications/*.desktop -bundle-non-qt-libs
# Copy translations # 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. # Package it for the second time.
./linuxdeployqt*.AppImage ./dist/usr/share/applications/*.desktop -appimage ./linuxdeployqt*.AppImage ./dist/usr/share/applications/*.desktop -appimage

4
.travis_macos.sh
View File

@ -2,8 +2,8 @@
project_dir=$(pwd) project_dir=$(pwd)
brew update > /dev/null brew update > /dev/null
brew install qt@5.7 brew install qt@5.9
QTDIR="/usr/local/opt/qt@5.7" QTDIR="/usr/local/opt/qt@5.9"
PATH="$QTDIR/bin:$PATH" PATH="$QTDIR/bin:$PATH"
LDFLAGS=-L$QTDIR/lib LDFLAGS=-L$QTDIR/lib
CPPFLAGS=-I$QTDIR/include CPPFLAGS=-I$QTDIR/include

8
appveyor.yml
View File

@ -11,9 +11,9 @@ environment:
VSVER: 14 VSVER: 14
matrix: matrix:
- QT: C:\Qt\5.7\msvc2015_64 - QT: C:\Qt\5.9.1\msvc2015_64
PLATFORM: amd64 PLATFORM: amd64
- QT: C:\Qt\5.7\msvc2015 - QT: C:\Qt\5.9.1\msvc2015
PLATFORM: x86 PLATFORM: x86
clone_depth: 1 clone_depth: 1
@ -29,8 +29,8 @@ before_build:
# After calling vcvarsall.bat, %PLATFORM% will be X64 or x86 # After calling vcvarsall.bat, %PLATFORM% will be X64 or x86
- mkdir build - mkdir build
- cd build - cd build
- if "%PLATFORM%" EQU "X64" (qmake -r -spec win32-msvc2015 CONFIG+=x86_64 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-msvc2015 CONFIG+=Win32 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 # custom build scripts
build_script: build_script: