diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-23 19:35:45 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-03-22 14:27:45 +0000 |
| commit | 97be8253fbe9d9e4954b6d345e8fe64bd566a395 (patch) | |
| tree | a671832f6c067ffc8866af691fa59dbd64653937 /mkspecs/features/qt_module.prf | |
| parent | 1b75a04336452bd4b5fc3764f26157d14c4e53a3 (diff) | |
fix bootstrapped modules in framework builds, take 2
the borrowing of headers always happens from "proper" modules which are
actually built as frameworks if so requested. that means that even
though the borrowing module itself never is a framework, it needs a
framework path and include paths that point into frameworks.
amends 20c7ab44.
Change-Id: Ic582060dd179cc592e9be7792ff02cebdfabd772
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs/features/qt_module.prf')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index ec31e457db..d5286ff340 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -41,8 +41,12 @@ host_build { } } -CONFIG(shared, static|shared):qtConfig(framework): \ - CONFIG += lib_bundle +qtConfig(framework) { + minimal_syncqt: \ + CONFIG += module_frameworks + else: CONFIG(shared, static|shared): \ + CONFIG += module_frameworks lib_bundle +} CONFIG += relative_qt_rpath # Qt libraries should be relocatable |