diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-12 17:56:32 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-15 17:02:34 +0000 |
| commit | ede6c447560b9419ee9d2991059e488a7d5a3208 (patch) | |
| tree | f280b15ab9d93136c97b05b2484b872ad6cd7ae4 /mkspecs | |
| parent | a060bf9673477499d85b04d8d5b21fb2a2f15c4f (diff) | |
syncqt: fix injected headers outside qtbase in non-prefix builds
in non-prefix configs, one has to differentiate between the module's own
build dir and qtbase's build dir, because the forwarding headers are
placed in -outdir under include/, while the actual headers end up in the
real build dir under src/.
Change-Id: I1d8ac904556b354bd113995316ba11dd6560a70d
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 931a26f5ae..62b88c6fe2 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -22,7 +22,8 @@ load(qt_build_paths) for(mod, MODULE_INCNAME): \ QMAKE_SYNCQT += -module $$mod QMAKE_SYNCQT += \ - -version $$VERSION -outdir $$system_quote($$MODULE_BASE_OUTDIR) $$MODULE_SYNCQT_DIR + -version $$VERSION -outdir $$system_quote($$MODULE_BASE_OUTDIR) \ + -builddir $$system_quote($$shadowed($$MODULE_BASE_INDIR)) $$MODULE_SYNCQT_DIR !silent: message($$QMAKE_SYNCQT) system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") |