From b8f79e7095d1e572bbd960b8a47e30d010126101 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 16 Mar 2015 13:05:46 +0100 Subject: make it possible to suppress the creation of a private module while every "real" module has private headers, a very small headers-only module could reasonably have none. entirely hypothetically, of course. ;) Change-Id: Ib51a66858fb7d62f45fe2928625c25aa1ffc2827 Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_module_pris.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mkspecs/features/qt_module_pris.prf') diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index be864c1697..b40e1391ac 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -124,7 +124,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri "" \ "QT_MODULES += $$MODULE" write_file($$MODULE_PRI, MODULE_PRI_CONT)|error("Aborting.") - !internal_module { + !internal_module:!no_private_module { module_build_type += internal_module no_link MODULE_PRIVATE_PRI_CONT = \ "QT.$${MODULE}_private.VERSION = $${VERSION}" \ @@ -160,7 +160,7 @@ MODULE_FWD_PRI = $$mod_work_pfx/qt_lib_$${MODULE_ID}.pri "QT_MODULE_PLUGIN_BASE = $$val_escape(MODULE_BASE_OUTDIR)/plugins" \ "include($$val_escape(MODULE_PRI))" \ "QT.$${MODULE_ID}.priority = 1" - !internal_module: MODULE_FWD_PRI_CONT += \ + !internal_module:!no_private_module: MODULE_FWD_PRI_CONT += \ "include($$val_escape(MODULE_PRIVATE_PRI))" \ "QT.$${MODULE}_private.priority = 1" MODULE_FWD_PRI_CONT += $$MODULE_FWD_PRI_CONT_SUFFIX -- cgit v1.2.3