summaryrefslogtreecommitdiffstats
path: root/src/tools/bootstrap/bootstrap.pro
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2013-03-21 08:18:12 +0100
committerOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-03-21 08:49:01 +0100
commit2ab9b747fcc5aa50e8cca758f7780158e734a222 (patch)
tree7017007823d54c2d658079e928f7220a1f57a852 /src/tools/bootstrap/bootstrap.pro
parentf1e681bed21e131864fe1e1c91679f7a56b06823 (diff)
parent8bfbaa41783dad66976fc83d4ca8c7e2673f5629 (diff)
Merge remote-tracking branch 'gerrit/release' into stable
Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
Diffstat (limited to 'src/tools/bootstrap/bootstrap.pro')
-rw-r--r--src/tools/bootstrap/bootstrap.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro
index 8b69c715d2..8b28b09e00 100644
--- a/src/tools/bootstrap/bootstrap.pro
+++ b/src/tools/bootstrap/bootstrap.pro
@@ -42,6 +42,7 @@ CONFIG += minimal_syncqt
QMAKE_SYNCQT_OPTIONS = -module QtCore -module QtDBus -module QtXml
contains(QT_CONFIG, zlib): \
QMAKE_SYNCQT_OPTIONS += -module QtZlib
+QMAKE_SYNCQT_OPTIONS += -version $$QT_VERSION
load(qt_module)