diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-04 18:20:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-05 11:36:22 +0200 |
| commit | 6d8f7a8d34906187c834e948b3ccd12a92fcccaa (patch) | |
| tree | 97dcb491f488077e82b066aa5464f0196c068f62 /mkspecs/features/qt_module_pris.prf | |
| parent | 22d1b3a823384123a3398cc444a9c06733f2f720 (diff) | |
make requirement for -private suffix explicit, take 2
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>
Diffstat (limited to 'mkspecs/features/qt_module_pris.prf')
| -rw-r--r-- | mkspecs/features/qt_module_pris.prf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index 81b37f0e92..90e5288524 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -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: \ |