From ded63fbb94088c3b0fbbf9d3b3a421b2b934ab50 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 10 Nov 2015 18:40:04 +0100 Subject: make a proper header-only module for QtZlib that way other modules can use the headers without hacks. this required making the base directory for paths in headers.pri configurable in syncqt. Change-Id: Id35cfe05bcf4c576d3f2d0d8d09590a5e23d21d3 Reviewed-by: Andy Nichols --- mkspecs/features/qt_module_headers.prf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mkspecs/features/qt_module_headers.prf') diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 3f2383c120..78a1e38bb0 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -38,6 +38,9 @@ git_build: \ else: \ INC_PATH = $$MODULE_BASE_INDIR include($$INC_PATH/include/$$MODULE_INCNAME/headers.pri, "", true) +CONFIG += qt_install_headers + +alien_syncqt: return() for (injection, SYNCQT.INJECTIONS) { injects = $$split(injection, :) @@ -82,8 +85,6 @@ SYNCQT.HEADER_FILES += $$MODULE_MASTER_DEPS_HEADER isEmpty(PRECOMPILED_HEADER): PRECOMPILED_HEADER = $$MODULE_MASTER_DEPS_HEADER } -CONFIG += qt_install_headers - headersclean:!internal_module { # Make sure that the header compiles with our strict options hcleanDEFS = -DQT_NO_CAST_TO_ASCII=1 \ -- cgit v1.2.3 From 004aeff8ee6d71e1d0a49bbea29cef0c148cfa24 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 12 Nov 2015 16:08:28 +0100 Subject: don't create distclean targets in minimal syncqt mode the projects which use full mode with the named modules have them. Change-Id: I3b9383d1cc2b43411c25690a5e35e7e84a55aa23 Reviewed-by: Joerg Bornemann Reviewed-by: Andy Nichols --- mkspecs/features/qt_module_headers.prf | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mkspecs/features/qt_module_headers.prf') diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index 78a1e38bb0..892a9a2c4b 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -25,9 +25,12 @@ load(qt_build_paths) !silent: message($$QMAKE_SYNCQT) system($$QMAKE_SYNCQT)|error("Failed to run: $$QMAKE_SYNCQT") - include-distclean.commands = $$QMAKE_DEL_TREE $$shell_quote($$shell_path($$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME)) - QMAKE_EXTRA_TARGETS += include-distclean - DISTCLEAN_DEPS += include-distclean + !minimal_syncqt { + include-distclean.commands = \ + $$QMAKE_DEL_TREE $$shell_quote($$shell_path($$MODULE_BASE_OUTDIR/include/$$MODULE_INCNAME)) + QMAKE_EXTRA_TARGETS += include-distclean + DISTCLEAN_DEPS += include-distclean + } } minimal_syncqt: return() -- cgit v1.2.3