diff options
Diffstat (limited to 'mkspecs/features/qt_module_headers.prf')
| -rw-r--r-- | mkspecs/features/qt_module_headers.prf | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 72471d7a01..bbded56b42 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -114,8 +114,6 @@ syncQtResolve(HEADER_FILES, $$_PRO_FILE_PWD_) syncQtResolve(PRIVATE_HEADER_FILES, $$_PRO_FILE_PWD_) syncQtResolve(QPA_HEADER_FILES, $$_PRO_FILE_PWD_) syncQtResolve(GENERATED_HEADER_FILES, $$INC_PATH/include/$$MODULE_INCNAME) -syncQtResolve(INJECTED_HEADER_FILES, $$OUT_PWD) -syncQtResolve(INJECTED_PRIVATE_HEADER_FILES, $$OUT_PWD) !lib_bundle: \ # Headers are embedded into the bundle, so don't install them separately. CONFIG += qt_install_headers @@ -129,8 +127,6 @@ exists($$OUT_PWD/$${MODULE_CFG_FILE}.h) { SYNCQT.INJECTIONS += \ $$fwd_rel/$${MODULE_CFG_FILE}.h:$${MODULE_CFG_FILE}.h \ $$fwd_rel/$${MODULE_CFG_FILE}_p.h:$$MODULE_VERSION/$$MODULE_INCNAME/private/$${MODULE_CFG_FILE}_p.h - SYNCQT.INJECTED_HEADER_FILES += $$OUT_PWD/$${MODULE_CFG_FILE}.h - SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$OUT_PWD/$${MODULE_CFG_FILE}_p.h } for (injection, SYNCQT.INJECTIONS) { @@ -143,6 +139,10 @@ for (injection, SYNCQT.INJECTIONS) { write_file($$MAIN_FWD, MAIN_FWD_CONT)|error() equals(fwd_hdr, ofwd_hdr): touch($$MAIN_FWD, $$dst_hdr) !git_build: QMAKE_DISTCLEAN += $$MAIN_FWD + !contains(ofwd_hdr, .*/private/.*): \ + SYNCQT.INJECTED_HEADER_FILES += $$dst_hdr + else: \ + SYNCQT.INJECTED_PRIVATE_HEADER_FILES += $$dst_hdr injects = $$member(injects, 2, -1) for (inject, injects) { CLASS_FWD = $$MODULE_INC_OUTDIR/$$inject @@ -150,6 +150,7 @@ for (injection, SYNCQT.INJECTIONS) { write_file($$CLASS_FWD, CLASS_FWD_CONT)|error() touch($$CLASS_FWD, $$MAIN_FWD) !git_build: QMAKE_DISTCLEAN += $$CLASS_FWD + SYNCQT.INJECTED_HEADER_FILES += $$CLASS_FWD } } |