path: root/src/tools/bootstrap
diff options
authorOswald Buddenhagen <>2013-03-20 16:51:32 +0100
committerThe Qt Project <>2013-03-20 19:03:45 +0100
commite79e1c1a166b8841724b6cd33b27b37a5ef6f4a0 (patch)
tree918ad7334e88717634a9aef9cfe7d35eb73e393f /src/tools/bootstrap
parent678320788ee781e36d2586a0d7586106034bcfdf (diff)
pass module version to syncqt
this is cleaner than having it parse qmake project files. the only remaining built-in version extraction is the fallback to qglobal.h needed for bootstrapping. as a "side effect", this fixes the build of modules with mismatched versions centralized in .qmake.conf, as this was simply not handled so far. the -mkspecsdir syncqt option goes away, as there is no use case for it any more. Task-number: QTBUG-29838 Change-Id: I6912a38f0e93a26bc267a9e3d738506fd3ad431b Reviewed-by: Thiago Macieira <> Reviewed-by: Jocelyn Turcotte <> Reviewed-by: Joerg Bornemann <>
Diffstat (limited to 'src/tools/bootstrap')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/bootstrap/ b/src/tools/bootstrap/
index 0d4b62fd16..1ec54deeb5 100644
--- a/src/tools/bootstrap/
+++ b/src/tools/bootstrap/
@@ -139,7 +139,7 @@ INSTALLS += lib
else: \
mod_component_base = $$dirname(_QMAKE_CACHE_)
QMAKE_SYNCQT += -minimal -module QtCore -module QtDBus -module QtXml \
- -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs -outdir $$mod_component_base $$dirname(_QMAKE_CONF_)
+ -version $$VERSION -outdir $$mod_component_base $$dirname(_QMAKE_CONF_)
contains(QT_CONFIG, zlib):QMAKE_SYNCQT += -module QtZlib
system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT")