path: root/src/angle/
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/angle/
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/angle/')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/angle/ b/src/angle/
index 00e0501d60..b4dbf8cf21 100644
--- a/src/angle/
+++ b/src/angle/
@@ -13,7 +13,7 @@ SUBDIRS += src
else: \
mod_component_base = $$dirname(_QMAKE_CACHE_)
QMAKE_SYNCQT += -minimal -module KHR -module EGL -module GLES2 \
- -mkspecsdir $$[QT_HOST_DATA/get]/mkspecs -outdir $$mod_component_base $$dirname(_QMAKE_CONF_)
+ -version none -outdir $$mod_component_base $$dirname(_QMAKE_CONF_)
system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT")