Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1d3df6f

Browse files
committedNov 14, 2018
use Ubuntu cosmic for base image
This will easily allow newer version of Qt but mainly SIP for auto build of the Python API docs.
1 parent 8b9e86d commit 1d3df6f

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed
 

‎.ci/travis/linux/docker-build-test.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ cmake \
5959
-DPYTHON_TEST_WRAPPER="timeout -sSIGSEGV 55s"\
6060
-DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
6161
-DWERROR=TRUE \
62+
-DQT5_3DEXTRA_LIBRARY="/usr/lib/x86_64-linux-gnu/libQt53DExtras.so" \
63+
-DQT5_3DEXTRA_INCLUDE_DIR="/root/QGIS/external/qt3dextra-headers" \
64+
-DCMAKE_PREFIX_PATH="/root/QGIS/external/qt3dextra-headers/cmake" \
6265
..
6366
echo "travis_fold:end:cmake"
6467

‎.docker/qgis3-build-deps.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:18.10
22
MAINTAINER Denis Rouzaud <denis@opengis.ch>
33

44
LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
@@ -34,6 +34,7 @@ RUN apt-get update \
3434
libproj-dev \
3535
libqca-qt5-2-dev \
3636
libqca-qt5-2-plugins \
37+
libqt53dextras5 \
3738
libqt53drender5 \
3839
libqt5concurrent5 \
3940
libqt5opengl5-dev \
@@ -88,7 +89,6 @@ RUN apt-get update \
8889
qt5keychain-dev \
8990
qtbase5-dev \
9091
qtdeclarative5-dev-tools \
91-
qtdeclarative5-qtquick2-plugin \
9292
qtpositioning5-dev \
9393
qttools5-dev \
9494
qttools5-dev-tools \

0 commit comments

Comments
 (0)
Please sign in to comment.