diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-27 10:48:03 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-07-05 07:38:57 +0000 |
| commit | 3523be5d90a2502540a99ca2b57e28da41476b76 (patch) | |
| tree | a2c57602e3dc88c8e92f1ecb43c7a13545ff146f /tests/auto/blackbox/testdata | |
| parent | 5821d32afc9eb44359ce6934d8c6d25afd7088d9 (diff) | |
mingw: Create import libraries alongside DLLs
This is the platform standard, and it gives us smart relinking for free.
Change-Id: Iee9e14fe66c9418adaa14893fe2b4f573408f77d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata')
3 files changed, 2 insertions, 6 deletions
diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs index 148902eda..30f87337d 100644 --- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs +++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/thelib/thelib.qbs @@ -13,7 +13,7 @@ Module { } Group { name: "thelib dll import" - condition: qbs.targetOS.contains("windows") && !qbs.toolchain.contains("mingw") + condition: qbs.targetOS.contains("windows") files: FileInfo.joinPaths(product.thelib.baseDir, "thelib.lib") fileTags: ["dynamiclibrary_import"] filesAreTargets: true diff --git a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs index 52d19c13c..1eb1e01a5 100644 --- a/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs +++ b/tests/auto/blackbox/testdata/dynamic-library-in-module/modules/theotherlib/theotherlib.qbs @@ -13,7 +13,7 @@ Module { } Group { name: "theotherlib dll import" - condition: qbs.targetOS.contains("windows") && !qbs.toolchain.contains("mingw") + condition: qbs.targetOS.contains("windows") files: FileInfo.joinPaths(product.theotherlib.baseDir, "theotherlib.lib") fileTags: ["dynamiclibrary_import"] filesAreTargets: true diff --git a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs index 0ae3d62e3..8a97f74a1 100644 --- a/tests/auto/blackbox/testdata/install-locations/install-locations.qbs +++ b/tests/auto/blackbox/testdata/install-locations/install-locations.qbs @@ -6,10 +6,6 @@ Project { console.info("is mac"); else console.info("is unix"); - if (qbs.toolchain.contains("msvc")) - console.info("is msvc") - else - console.info("is gcc"); } CppApplication { name: "theapp" |