diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-23 14:08:14 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-02-23 13:45:52 +0000 |
| commit | 2f8557af56fadefc0b3308444efed68f884234cb (patch) | |
| tree | df8f08fa9b087db2b25a5474c10a47669b0f72fa /tests/auto/blackbox/testdata/whole-archive | |
| parent | bd21380419fa7e80ad9722ce058841c246421d14 (diff) | |
Fix wholeArchive() autotest
We should read qbs.toolchain rather than qbs.toolchainType, for better
compatibility with existing profiles and tools.
Change-Id: Ib26bce59a2aa039823542ea14c9b2b525654da74
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'tests/auto/blackbox/testdata/whole-archive')
| -rw-r--r-- | tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs index 082adba57..855ab44d0 100644 --- a/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs +++ b/tests/auto/blackbox/testdata/whole-archive/whole-archive.qbs @@ -29,11 +29,11 @@ Project { Depends { name: "cpp" } Probe { id: dummy - property string toolchainType: qbs.toolchainType + property stringList toolchain: qbs.toolchain property string compilerVersion: cpp.compilerVersion property string dummy: product.linkWholeArchive // To force probe re-execution configure: { - if (toolchainType !== "msvc" + if (!toolchain.contains("msvc") || Utilities.versionCompare(compilerVersion, "19.0.25123") >= 0) { console.info("can link whole archives"); } else { |