diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-03 16:02:59 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-05 15:41:45 +0200 |
| commit | 026cc4bead2e982966990221e5a84068799c13bd (patch) | |
| tree | 35cb57bc6a95124a4bc39dc2afce90ddc9f28adc | |
| parent | 403e2a8a1a0789741515f766f8a91830c73757d6 (diff) | |
fix linking of static Qt libs
Task-number: QBS-608
Change-Id: I71235675508a5a5d8e651ef6d025e4ef844b5cfc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/lib/qtprofilesetup/templates/QtModule.qbs | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/templates/QtModule.qbs b/src/lib/qtprofilesetup/templates/QtModule.qbs index 4445a58cf..5f245833e 100644 --- a/src/lib/qtprofilesetup/templates/QtModule.qbs +++ b/src/lib/qtprofilesetup/templates/QtModule.qbs @@ -34,10 +34,17 @@ Module { return paths; } - cpp.dynamicLibraries: Qt.core.frameworkBuild || !hasLibrary - ? undefined : [internalLibraryName] - cpp.frameworks: Qt.core.frameworkBuild && hasLibrary ? [internalLibraryName] : undefined cpp.defines: qtModuleName.contains("private") ? [] : [ "QT_" + qtModuleName.toUpperCase() + "_LIB" ] } + + Properties { + condition: qtModuleName != undefined && hasLibrary + cpp.staticLibraries: isStaticLibrary + ? [internalLibraryName] : undefined + cpp.dynamicLibraries: !isStaticLibrary && !Qt.core.frameworkBuild + ? [internalLibraryName] : undefined + cpp.frameworks: !isStaticLibrary && Qt.core.frameworkBuild + ? [internalLibraryName] : undefined + } } |