diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-09-18 18:19:29 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-21 02:44:22 +0200 |
| commit | 5ad378859a185c681cdea39a21c850b46e1369bb (patch) | |
| tree | 39b05eeb0cc61bf174aff08b390a67b672bd2d30 /src/tools | |
| parent | 0da7f097249f71726140a38647bb4824b09fad7b (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 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 039277150f..0aa9436d03 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -127,3 +127,16 @@ QMAKE_EXTRA_TARGETS += freeze_target docs.commands = docs.depends = first QMAKE_EXTRA_TARGETS += docs + +# We need the forwarding headers before their respective modules are built, +# so do a minimal syncqt run. +qtPrepareTool(QMAKE_SYNCQT, syncqt) +QTDIR = $$[QT_HOST_PREFIX] +exists($$QTDIR/.qmake.cache): \ + mod_component_base = $$QTDIR +else: \ + mod_component_base = $$dirname(_QMAKE_CACHE_) +QMAKE_SYNCQT += -minimal -module QtCore -module QtDBus -module QtXml \ + -qtdir $$[QT_HOST_DATA/get] -outdir $$mod_component_base $$dirname(_QMAKE_CONF_) +!silent:message($$QMAKE_SYNCQT) +system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") |