Travis build fix
This commit is contained in:
parent
ac7d224645
commit
ce27af6083
2 changed files with 3 additions and 20 deletions
21
.travis.yml
21
.travis.yml
|
@ -169,22 +169,7 @@ jobs:
|
|||
- mesa-common-dev
|
||||
- libpulse-dev
|
||||
- libxcb-*
|
||||
- libxcb-icccm4
|
||||
- libxcb-image0
|
||||
- libxcb-shm0
|
||||
- libxcb-util1
|
||||
- libxcb-keysyms1
|
||||
- libxcb-randr0
|
||||
- libxcb-render-util0
|
||||
- libxcb-render0
|
||||
- libxcb-shape0
|
||||
- libxcb-sync1
|
||||
- libxcb-xfixes0
|
||||
- libxcb-randr0-dev
|
||||
- libxcb-xtest0-dev
|
||||
- libxcb-xinerama0-dev
|
||||
- libxcb-shape0-dev
|
||||
- libxcb-xkb-dev
|
||||
- libxkbcommon-x11-0
|
||||
|
||||
env:
|
||||
- QT_VERSION=5.15.2
|
||||
|
@ -269,8 +254,8 @@ jobs:
|
|||
wget https://dl.google.com/android/repository/sdk-tools-linux-4333796.zip -qO $HOME/sdk.zip > /dev/null && \
|
||||
unzip -q -d $ANDROID_SDK_ROOT $HOME/sdk.zip && \
|
||||
echo "Download tools" && \
|
||||
yes | $ANDROID_SDK_ROOT/tools/bin/sdkmanager --licenses && \
|
||||
$ANDROID_SDK_ROOT/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-30" "build-tools;30.0.2" || exit 1 ; \
|
||||
yes | $ANDROID_SDK_ROOT/tools/bin/sdkmanager --licenses > /dev/null 2>&1 && \
|
||||
$ANDROID_SDK_ROOT/tools/bin/sdkmanager --install "cmdline-tools;latest" "platform-tools" "platforms;android-30" "build-tools;30.0.2" > /dev/null 2>&1 || exit 1 ; \
|
||||
fi
|
||||
- |
|
||||
if [ ! -f $ANDROID_NDK_ROOT/ndk-build ]; then \
|
||||
|
|
|
@ -8,8 +8,6 @@ CONFIG += qzxing_multimedia \
|
|||
enable_decoder_qr_code \
|
||||
enable_encoder_qr_code
|
||||
|
||||
DEFINES += QT_DEPRECATED_WARNINGS
|
||||
|
||||
include("3rd/QtSsh/src/ssh/qssh.pri")
|
||||
include("3rd/QtSsh/src/botan/botan.pri")
|
||||
!android:!ios:include("3rd/SingleApplication/singleapplication.pri")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue