AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make requirement for -private suffix explicit, take 2

Browse Source 
the previous attempt broke ActiveQt, as it actually has public modules
without headers (they are provided by a common base module).
so explicitly mark the internal modules as such instead of applying
heuristics.

Change-Id: I8d8a2ee66f02c3444da2036a497e7f382f089f62
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-07-04 18:20:44 +02:00 committed by The Qt Project
parent 22d1b3a823
commit 6d8f7a8d34
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt_functions.prf
View File

@ -61,7 +61,7 @@ defineTest(qtAddModule) {
MODULE_CONFIG = $$eval(QT.$${1}.module_config)
MODULE_MAJOR_VERSION = $$eval(QT.$${1}.MAJOR_VERSION)
isEmpty(MODULE_INCLUDES):!if(auto_use_privates|isEqual(2, UsePrivate)): \
contains(MODULE_CONFIG, internal_module):!if(auto_use_privates|isEqual(2, UsePrivate)): \
error("Module $$1 has no public API.")
qtProcessModuleFlags(CONFIG, QT.$${1}.CONFIG)

8
mkspecs/features/qt_module_pris.prf
View File

@ -51,11 +51,15 @@ else: \
else: \
module_rundep =
static: \
module_build_type = "QT.$${MODULE}.module_config = staticlib"
module_build_type = staticlib
else:mac:contains(QT_CONFIG, qt_framework): \
module_build_type = "QT.$${MODULE}.module_config = lib_bundle"
module_build_type = lib_bundle
else: \
module_build_type =
internal_module: \
module_build_type += internal_module
!isEmpty(module_build_type): \
module_build_type = "QT.$${MODULE}.module_config = $$module_build_type"
!isEmpty(MODULE_CONFIG): \
module_config = "QT.$${MODULE}.CONFIG = $$MODULE_CONFIG"
else: \