diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-07-11 17:49:19 -0400 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-22 14:51:40 +0200 |
| commit | a2dece0a1d0d9abbddf275b356cbf83e6689578e (patch) | |
| tree | 4830c4b8258aa74b8cc58f792358647d1df2a99b /tests/auto/blackbox/tst_blackbox.cpp | |
| parent | 496707ce5ae88e124617553e8e24d887a750777c (diff) | |
Add support for compiling Interface Builder storyboards.
As a side effect, some capabilities introduced here also apply to XIBs.
Task-number: QBS-466
Change-Id: I27eaf1a9a73ef25475b4f6b2bc971dcd941b6371
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto/blackbox/tst_blackbox.cpp')
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 8e0edef9e..12a5ce46b 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -43,6 +43,11 @@ #include <QScriptEngine> #include <QScriptValue> +// from qsysinfo.h +#ifndef Q_MV_OSX +#define Q_MV_OSX(major, minor) (major == 10 ? minor + 2 : (major == 9 ? 1 : 0)) +#endif + using qbs::InstallOptions; using qbs::Internal::HostOsInfo; using qbs::Internal::removeDirectoryWithContents; @@ -2330,6 +2335,11 @@ void TestBlackbox::testAssetCatalog() QCOMPARE(runQbs(params), 0); QVERIFY((bool)m_qbsStdout.contains("actool")); QVERIFY((bool)m_qbsStdout.contains("iconutil")); + + // make sure the nibs/storyboards are in there + QVERIFY(regularFileExists(productBuildDir("assetcatalogempty") + "/assetcatalogempty.app/Contents/Resources/MainMenu.nib")); + if (QSysInfo::macVersion() >= Q_MV_OSX(10, 10)) + QVERIFY(regularFileExists(productBuildDir("assetcatalogempty") + "/assetcatalogempty.app/Contents/Resources/Storyboard.storyboardc")); } QString TestBlackbox::uniqueProductName(const QString &productName) const |