diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-24 15:18:55 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-06-24 18:00:11 +0200 |
| commit | e9ddf75f2d3732bfc5fc3d8268e2490754c42c61 (patch) | |
| tree | 5a5bd95109e348fda5d6629a373f22dd0972c12d | |
| parent | d0eafa6d03f3b0b54d05902507bf5883c0892ce5 (diff) | |
fix static library dependencies
Task-number: QBS-294
Change-Id: Ie285cb98db052176a563f52a187279b5dae4c1bf
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | share/qbs/modules/cpp/GenericGCC.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/windows-msvc.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/share/qbs/modules/cpp/GenericGCC.qbs b/share/qbs/modules/cpp/GenericGCC.qbs index 045a85bc1..b09f95e6b 100644 --- a/share/qbs/modules/cpp/GenericGCC.qbs +++ b/share/qbs/modules/cpp/GenericGCC.qbs @@ -137,7 +137,7 @@ CppModule { var lib = inputs.staticlibrary[i] result.push(lib.fileName) var impliedLibs = ModUtils.moduleProperties(lib, 'staticLibraries') - result.concat(impliedLibs) + result = result.concat(impliedLibs); } return result } diff --git a/share/qbs/modules/cpp/windows-msvc.qbs b/share/qbs/modules/cpp/windows-msvc.qbs index 5d22d6eff..4895d2ced 100644 --- a/share/qbs/modules/cpp/windows-msvc.qbs +++ b/share/qbs/modules/cpp/windows-msvc.qbs @@ -181,7 +181,7 @@ CppModule { var lib = inputs.staticlibrary[i] result.push(lib.fileName) var impliedLibs = ModUtils.moduleProperties(lib, 'staticLibraries') - result.concat(impliedLibs) + result = result.concat(impliedLibs); } return result } diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 3ae823170..399405e8a 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -222,7 +222,6 @@ void TestBlackbox::build_project() QDir::setCurrent(testDataDir + projectSubDir); rmDirR(buildDir); - QEXPECT_FAIL("link static libs", "QBS-294", Abort); QCOMPARE(runQbs(), 0); QVERIFY2(QFile::exists(productFileName), qPrintable(productFileName)); QVERIFY(QFile::exists(buildGraphPath)); |