diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-05-22 16:23:17 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-06-01 11:14:13 +0000 |
| commit | 17059ccd06e56010fa0d44ebcaf0be7b85d69703 (patch) | |
| tree | 321e1b3bc972163c8fdb43a78c4c96d4720c665e /tests/auto/blackbox/tst_blackboxapple.cpp | |
| parent | e655352e1ebfd09f2b08114f4d61c7a2f8dfc645 (diff) | |
Simplify installation of applications and libraries
Add "install" and "installDir" convenience properties to our
Application, DynamicLibrary and StaticLibrary items, so users are no
longer required to write groups with file tag filters for the normal
installation case. The installDir property has a suitable default value
for the respective target platform, as does qbs.installPrefix.
[ChangeLog] The Application, DynamicLibrary and StaticLibrary items now
have properties for more convenient installation of target binaries.
Task-number: QBS-229
Change-Id: I9cfa4c02a7c555b0af637257da63967cd62cc119
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'tests/auto/blackbox/tst_blackboxapple.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackboxapple.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/blackbox/tst_blackboxapple.cpp b/tests/auto/blackbox/tst_blackboxapple.cpp index 6fc526cd8..64aca99f1 100644 --- a/tests/auto/blackbox/tst_blackboxapple.cpp +++ b/tests/auto/blackbox/tst_blackboxapple.cpp @@ -77,7 +77,7 @@ void TestBlackboxApple::initTestCase() void TestBlackboxApple::appleMultiConfig() { QDir::setCurrent(testDataDir + "/apple-multiconfig"); - QCOMPARE(runQbs(), 0); + QCOMPARE(runQbs(QbsRunParameters(QStringList{"qbs.installPrefix:''"})), 0); QVERIFY(QFileInfo2(defaultInstallRoot + "/singleapp.app/Contents/MacOS/singleapp").isExecutable()); QVERIFY(QFileInfo2(defaultInstallRoot + "/singleapp.app/Contents/Info.plist").isRegularFile()); @@ -285,7 +285,7 @@ void TestBlackboxApple::bundleStructure() QFETCH(bool, isShallow); QDir::setCurrent(testDataDir + "/bundle-structure"); - QbsRunParameters params; + QbsRunParameters params(QStringList{"qbs.installPrefix:''"}); params.arguments << "project.buildableProducts:" + productName; if (isShallow) { // Coerce shallow bundles - don't set bundle.isShallow directly because we want to test the @@ -624,7 +624,7 @@ void TestBlackboxApple::embedInfoPlist() { QDir::setCurrent(testDataDir + QLatin1String("/embedInfoPlist")); - QbsRunParameters params; + QbsRunParameters params(QStringList{"qbs.installPrefix:''"}); QCOMPARE(runQbs(params), 0); QVERIFY(!getEmbeddedBinaryPlist(defaultInstallRoot + "/app").isEmpty()); |