summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Weickelt <richard@weickelt.de>2019-10-20 21:44:06 +0200
committerRichard Weickelt <richard@weickelt.de>2019-10-21 09:35:42 +0000
commit671e578cd9f555b2a0a0bdddcd4e6cc3b99de85a (patch)
tree827d72bffc0c63a82c9dca981c7144cdeaff8c3b
parent4068328fdb9eb5b9d99b0e9f1866cb3f879274ec (diff)
Export the GLIB switch properly
The GLIB event dispatcher was disabled in order to work around QTBUG-79020. But the environment variable was not exported properly and hence, the work-around had no effect. Change-Id: I9bad99168456ae734c895db0ed4f46885d6b4d48 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--docker-compose.yml2
-rw-r--r--docker/bionic/Dockerfile2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index c29d09462..654d3b8d4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
bionic:
<< : *linux
hostname: bionic
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.13.1-2
+ image: ${DOCKER_USER:-qbsbuild}/qbsdev:bionic-5.12.5_1.13.1-3
build:
dockerfile: docker/bionic/Dockerfile
context: .
diff --git a/docker/bionic/Dockerfile b/docker/bionic/Dockerfile
index 5a4b1921e..ed0625fb1 100644
--- a/docker/bionic/Dockerfile
+++ b/docker/bionic/Dockerfile
@@ -180,4 +180,4 @@ RUN qbs-setup-toolchains /usr/bin/g++ gcc && \
USER root
# Work-around for QTBUG-79020
-RUN echo "QT_NO_GLIB=1" >> /etc/profile.d/qt.sh
+RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh