From 455ae6a32c1c4b35e359f88d1f8ac2b85f0db689 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 15 Apr 2015 12:35:41 +0200 Subject: support headers-only modules automatically set TEMPLATE=aux if qt_no_install_library is set. Change-Id: Iccceda468da762b181fdd5c8e511bf6ed19af599 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_module.prf | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 7c4d574874..afa20a9ab1 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -58,10 +58,14 @@ else: \ MODULE_DEFINE = QT_$${ucmodule}_LIB MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES -load(qt_module_pris) +load(qt_build_paths) -#other -TEMPLATE = lib +qt_no_install_library { + TEMPLATE = aux + CONFIG += force_qt # Needed for the headers_clean tests. +} else { + TEMPLATE = lib +} DESTDIR = $$MODULE_BASE_OUTDIR/lib win32:!wince*:!prefix_build: DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin @@ -69,6 +73,7 @@ CONFIG += qmake_cache target_qt QMAKE_DOCS_TARGETDIR = qt$${MODULE} +load(qt_module_pris) load(qt_common) !no_module_headers: load(qt_module_headers) -- cgit v1.2.3