diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-18 12:31:43 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2012-12-21 10:29:15 +0100 |
| commit | 9da657eedcf57ba842af6b80baa56ea7d5de8857 (patch) | |
| tree | cee6d0649a2f4679f7d2cadefbcbe2f4593538a5 /share | |
| parent | 77302f5c3964f4da0b2dbff4f35fa6acd600f56c (diff) | |
fix getLibraryName() in qtfunctions.js for framework builds
Task-number: QBS-182
Change-Id: I5adc9733da13a8f63d71c060daa1a12b91dbf67f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/qt/QtModule.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/qt/core/qtcore.qbs | 6 | ||||
| -rw-r--r-- | share/qbs/modules/qt/qtfunctions.js | 10 |
3 files changed, 10 insertions, 8 deletions
diff --git a/share/qbs/modules/qt/QtModule.qbs b/share/qbs/modules/qt/QtModule.qbs index afa3d5c4e..9f293e052 100644 --- a/share/qbs/modules/qt/QtModule.qbs +++ b/share/qbs/modules/qt/QtModule.qbs @@ -15,7 +15,7 @@ Module { property string qtLibInfix: qt.core.libInfix property string repository: qt.core.versionMajor === 5 ? 'qtbase' : undefined property string includeDirName: 'Qt' + qtModuleName - property string internalLibraryName: QtFunctions.getLibraryName(qtModuleName + qtLibInfix, qt.core.versionMajor, qbs) + property string internalLibraryName: QtFunctions.getLibraryName(qtModuleName + qtLibInfix, qt.core, qbs) property string qtVersion: qt.core.version Properties { diff --git a/share/qbs/modules/qt/core/qtcore.qbs b/share/qbs/modules/qt/core/qtcore.qbs index 35f42ff37..42dba6807 100644 --- a/share/qbs/modules/qt/core/qtcore.qbs +++ b/share/qbs/modules/qt/core/qtcore.qbs @@ -5,6 +5,8 @@ import "moc.js" 1.0 as Moc import '../qtfunctions.js' as QtFunctions Module { + id: qtcore + Depends { name: "cpp" } property string namespace @@ -54,9 +56,9 @@ Module { if (qbs.targetOS === 'windows' && !product.consoleApplication) return ["qtmain" + libInfix + (cpp.debugInformation ? "d" : "") + (qbs.toolchain !== "mingw" ? ".lib" : "")]; } - cpp.dynamicLibraries: frameworkBuild ? undefined : [QtFunctions.getLibraryName('Core' + libInfix, versionMajor, qbs)] + cpp.dynamicLibraries: frameworkBuild ? undefined : [QtFunctions.getLibraryName('Core' + libInfix, qtcore, qbs)] cpp.frameworkPaths: frameworkBuild ? [libPath] : undefined - cpp.frameworks: frameworkBuild ? [QtFunctions.getLibraryName('Core' + libInfix, versionMajor, qbs)] : undefined + cpp.frameworks: frameworkBuild ? [QtFunctions.getLibraryName('Core' + libInfix, qtcore, qbs)] : undefined cpp.rpaths: qbs.targetOS === 'linux' ? [libPath] : undefined cpp.positionIndependentCode: versionMajor >= 5 ? true : undefined cpp.cxxFlags: { diff --git a/share/qbs/modules/qt/qtfunctions.js b/share/qbs/modules/qt/qtfunctions.js index fa0ca7243..c96f8b624 100644 --- a/share/qbs/modules/qt/qtfunctions.js +++ b/share/qbs/modules/qt/qtfunctions.js @@ -1,15 +1,15 @@ // helper functions for the Qt modules -function getLibraryName(qtModule, versionMajor, qbs) +function getLibraryName(qtModule, qtcore, qbs) { var libName = "Qt"; - if (versionMajor >= 5) - libName += versionMajor; + if (qtcore.versionMajor >= 5 && !qtcore.frameworkBuild) + libName += qtcore.versionMajor; libName += qtModule; if (qbs.targetOS === 'windows') { libName += (qbs.enableDebugCode ? 'd' : ''); - if (versionMajor < 5) - libName += versionMajor; + if (qtcore.versionMajor < 5) + libName += qtcore.versionMajor; if (qbs.toolchain !== "mingw") libName += '.lib'; } |