diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-18 12:11:44 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-18 15:32:15 +0100 |
| commit | 5cb4b375ef9b36f61f05ad741a77c937bfdbc327 (patch) | |
| tree | 6b8c0fc3f1656433887b434da5987f5d6736dcfc | |
| parent | 4d97182f31e19881d8246324bc1a119b7d77e28a (diff) | |
Fix check for qbs library type.
Qt 5 no longer guarantees that "shared" or "static" appear in the CONFIG
variable. So assume "shared" whenever "static" is not set.
Change-Id: I9f9f71d4aeacd4c083842a01458fdd25a9980523
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/lib/use.pri | 2 | ||||
| -rw-r--r-- | src/lib/use_installed.pri | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/use.pri b/src/lib/use.pri index 7ac510712..26442fe76 100644 --- a/src/lib/use.pri +++ b/src/lib/use.pri @@ -15,7 +15,7 @@ unix { macx:QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../lib } -CONFIG(shared, static|shared) { +!CONFIG(static, static|shared) { QBSCORELIBSUFFIX = $$QBS_VERSION_MAJ } diff --git a/src/lib/use_installed.pri b/src/lib/use_installed.pri index 4f9a4beea..c3b1dd5af 100644 --- a/src/lib/use_installed.pri +++ b/src/lib/use_installed.pri @@ -9,7 +9,7 @@ unix { !disable_rpath:unix:QMAKE_LFLAGS += -Wl,-rpath,$${QBSLIBDIR} -CONFIG(shared, static|shared) { +!CONFIG(static, static|shared) { QBSCORELIBSUFFIX = $$QBS_VERSION_MAJ } |