summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-09-18 18:19:29 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-21 02:44:22 +0200
commit5ad378859a185c681cdea39a21c850b46e1369bb (patch)
tree39b05eeb0cc61bf174aff08b390a67b672bd2d30 /mkspecs/features
parent0da7f097249f71726140a38647bb4824b09fad7b (diff)
move syncqt call to qt_module_headers.prf
for one, the syncqt invocation is qt module magic and thus simply does not belong into the generic default_pre file. second, this way the forwarding header generation is now linked to the rest of the build magic for a particular module, which is way less confusing for the unsuspecting developer. Change-Id: Idc8e420d3faf173d7fff4a41e6e1c59af15c3023 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/default_pre.prf15
-rw-r--r--mkspecs/features/qt_module_headers.prf9
2 files changed, 9 insertions, 15 deletions
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index 5ba2fdb551..8b9cae5a6d 100644
--- a/mkspecs/features/default_pre.prf
+++ b/mkspecs/features/default_pre.prf
@@ -12,21 +12,6 @@ CONFIG = lex yacc warn_on debug exceptions depend_includepath $$CONFIG
cache(QMAKEMODULES, add super, modpath)
unset(modpath)
}
- } else {
- # When doing a build without -prefix, put the headers directly into qtbase.
- isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$[QT_HOST_DATA]
- }
-
- qtPrepareTool(QMAKE_SYNCQT, syncqt)
- contains(QT_CONFIG, private_tests): \ # -developer-build
- QMAKE_SYNCQT += -check-includes
- isEmpty(MODULE_BASE_OUTDIR): MODULE_BASE_OUTDIR = $$OUT_PWD
- MSG = $$quote($$QMAKE_SYNCQT -qtdir $$[QT_HOST_DATA/get] -outdir $$MODULE_BASE_OUTDIR $$_PRO_FILE_PWD_)
- !silent:message($$MSG)
- system($$MSG) {
- # success! Nothing to do
- } else {
- error("Failed to run: $$MSG")
}
}
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index cd41c17b85..ef2f72f36d 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -4,6 +4,15 @@ QTDIR = $$[QT_HOST_PREFIX]
else: \
mod_component_base = $$MODULE_BASE_OUTDIR
+!build_pass {
+ qtPrepareTool(QMAKE_SYNCQT, syncqt)
+ contains(QT_CONFIG, private_tests): \ # -developer-build
+ QMAKE_SYNCQT += -check-includes
+ QMAKE_SYNCQT += -module $$TARGET -qtdir $$[QT_HOST_DATA/get] -outdir $$mod_component_base $$MODULE_BASE_DIR
+ !silent: message($$QMAKE_SYNCQT)
+ system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT")
+}
+
#load up the headers info
include($$mod_component_base/include/$$TARGET/headers.pri, "", true)