aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2022-08-05 12:55:42 +0200
committerIvan Komissarov <ABBAPOH@gmail.com>2022-08-05 16:49:35 +0000
commitb6f3683c63ceec32760da6a7018ef9c3c0c1952b (patch)
treec3ea5c5d12cd8c31f6fcba3d3abfa14b39bf3229
parent3e0553e4651197e61c5086d96048b75462bde897 (diff)
docker: install qdoc into Qt4 image
Change-Id: Ic0a05c8d97e77f441e6efdd1216715d2479cdb10 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--docker-compose.yml2
-rw-r--r--docker/focal/test-qt4.Dockerfile4
2 files changed, 3 insertions, 3 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 19ea817da..30d16e670 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -158,7 +158,7 @@ services:
focal-qt4:
<< : *linux
hostname: focal-qt4
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt4-0
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt4-1
build:
dockerfile: docker/focal/test-qt4.Dockerfile
context: .
diff --git a/docker/focal/test-qt4.Dockerfile b/docker/focal/test-qt4.Dockerfile
index c23a664d2..e49e255f9 100644
--- a/docker/focal/test-qt4.Dockerfile
+++ b/docker/focal/test-qt4.Dockerfile
@@ -36,5 +36,5 @@ RUN sudo add-apt-repository ppa:gezakovacs/ppa -y && \
apt-get update -qq && \
apt-get install -qq -y \
build-essential \
- libqt4-dev
-
+ libqt4-dev \
+ qt4-dev-tools