diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-03 16:00:09 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-06-04 14:09:39 +0200 |
| commit | 403e2a8a1a0789741515f766f8a91830c73757d6 (patch) | |
| tree | 6c927ecb61587349e7097567a64788143df0f8d4 | |
| parent | 46acc36d7f8e04a31e855bd5bea8fb8652471345 (diff) | |
fix lib name for static Qt libs on OS X
Change-Id: Ia43b7e59de5a802c72c844250e7331b6be2c31d9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | src/lib/qtprofilesetup/templates/qtfunctions.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/qtprofilesetup/templates/qtfunctions.js b/src/lib/qtprofilesetup/templates/qtfunctions.js index 8a667ee58..7058026f3 100644 --- a/src/lib/qtprofilesetup/templates/qtfunctions.js +++ b/src/lib/qtprofilesetup/templates/qtfunctions.js @@ -21,7 +21,7 @@ function getPlatformLibraryName(name, qtcore, qbs, isStaticLibrary) function getQtLibraryName(qtModule, qtcore, qbs, isStaticLibrary, prefix) { var libName = (prefix === undefined) ? "Qt" : prefix; - if (qtcore.versionMajor >= 5 && !qtcore.frameworkBuild) + if (qtcore.versionMajor >= 5 && (!qtcore.frameworkBuild || isStaticLibrary)) libName += qtcore.versionMajor; libName += qtModule; return getPlatformLibraryName(libName, qtcore, qbs, isStaticLibrary); |