diff options
author | Jake Petroules <jake.petroules@petroules.com> | 2014-07-11 16:47:51 -0400 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-07-21 11:58:36 +0200 |
commit | 847020fb6d2b943d3e09bcc9a99b340b5821297e (patch) | |
tree | c442d9709c32c808b4e84bf3229e03b0341a191f /tests/auto | |
parent | 3d9a145965b6c98f652a19520e9b4d9c62e46eb5 (diff) |
Add support for compiling OS X icon sets.
Task-number: QBS-493
Change-Id: Ie6e4a00f672ce4305f03e00ec0b0b7ebcbd942c3
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/blackbox/testdata/ib/iconset/iconset.qbs | 7 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/ib/iconset/white.iconset/icon_16x16.png | bin | 0 -> 3303 bytes | |||
-rw-r--r-- | tests/auto/blackbox/testdata/ib/iconset/white.iconset/icon_16x16@2x.png | bin | 0 -> 3336 bytes | |||
-rw-r--r-- | tests/auto/blackbox/testdata/ib/iconsetapp/iconsetapp.qbs | 6 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/ib/iconsetapp/main.c | 4 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/ib/iconsetapp/white.iconset/icon_16x16.png | bin | 0 -> 3303 bytes | |||
-rw-r--r-- | tests/auto/blackbox/testdata/ib/iconsetapp/white.iconset/icon_16x16@2x.png | bin | 0 -> 3336 bytes | |||
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 30 | ||||
-rw-r--r-- | tests/auto/blackbox/tst_blackbox.h | 2 |
9 files changed, 49 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/ib/iconset/iconset.qbs b/tests/auto/blackbox/testdata/ib/iconset/iconset.qbs new file mode 100644 index 000000000..1d563f180 --- /dev/null +++ b/tests/auto/blackbox/testdata/ib/iconset/iconset.qbs @@ -0,0 +1,7 @@ +import qbs + +Product { + Depends { name: "ib" } + type: ["icns"] + files: ["white.iconset"] +} diff --git a/tests/auto/blackbox/testdata/ib/iconset/white.iconset/icon_16x16.png b/tests/auto/blackbox/testdata/ib/iconset/white.iconset/icon_16x16.png Binary files differnew file mode 100644 index 000000000..65ff1ff57 --- /dev/null +++ b/tests/auto/blackbox/testdata/ib/iconset/white.iconset/icon_16x16.png diff --git a/tests/auto/blackbox/testdata/ib/iconset/white.iconset/icon_16x16@2x.png b/tests/auto/blackbox/testdata/ib/iconset/white.iconset/icon_16x16@2x.png Binary files differnew file mode 100644 index 000000000..a5c69bccd --- /dev/null +++ b/tests/auto/blackbox/testdata/ib/iconset/white.iconset/icon_16x16@2x.png diff --git a/tests/auto/blackbox/testdata/ib/iconsetapp/iconsetapp.qbs b/tests/auto/blackbox/testdata/ib/iconsetapp/iconsetapp.qbs new file mode 100644 index 000000000..7e5323a0c --- /dev/null +++ b/tests/auto/blackbox/testdata/ib/iconsetapp/iconsetapp.qbs @@ -0,0 +1,6 @@ +import qbs + +CppApplication { + Depends { name: "ib" } + files: ["main.c", "white.iconset"] +} diff --git a/tests/auto/blackbox/testdata/ib/iconsetapp/main.c b/tests/auto/blackbox/testdata/ib/iconsetapp/main.c new file mode 100644 index 000000000..905869dfa --- /dev/null +++ b/tests/auto/blackbox/testdata/ib/iconsetapp/main.c @@ -0,0 +1,4 @@ +int main() +{ + return 0; +} diff --git a/tests/auto/blackbox/testdata/ib/iconsetapp/white.iconset/icon_16x16.png b/tests/auto/blackbox/testdata/ib/iconsetapp/white.iconset/icon_16x16.png Binary files differnew file mode 100644 index 000000000..65ff1ff57 --- /dev/null +++ b/tests/auto/blackbox/testdata/ib/iconsetapp/white.iconset/icon_16x16.png diff --git a/tests/auto/blackbox/testdata/ib/iconsetapp/white.iconset/icon_16x16@2x.png b/tests/auto/blackbox/testdata/ib/iconsetapp/white.iconset/icon_16x16@2x.png Binary files differnew file mode 100644 index 000000000..a5c69bccd --- /dev/null +++ b/tests/auto/blackbox/testdata/ib/iconsetapp/white.iconset/icon_16x16@2x.png diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 605582961..c791a6993 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -2265,6 +2265,36 @@ void TestBlackbox::testTypeScript() QVERIFY(regularFileExists(productBuildDir("animals") + "/main.js")); } +void TestBlackbox::testIconset() +{ + if (!HostOsInfo::isOsxHost()) + SKIP_TEST("only applies on OS X"); + + QDir::setCurrent(testDataDir + QLatin1String("/ib/iconset")); + + QbsRunParameters params; + params.arguments = QStringList() << "-f" << "iconset.qbs"; + QCOMPARE(runQbs(params), 0); + + QVERIFY((bool)m_qbsStdout.contains("warning")); // because some images are missing + QVERIFY(regularFileExists(productBuildDir("iconset") + "/white.icns")); +} + +void TestBlackbox::testIconsetApp() +{ + if (!HostOsInfo::isOsxHost()) + SKIP_TEST("only applies on OS X"); + + QDir::setCurrent(testDataDir + QLatin1String("/ib/iconsetapp")); + + QbsRunParameters params; + params.arguments = QStringList() << "-f" << "iconsetapp.qbs"; + QCOMPARE(runQbs(params), 0); + + QVERIFY((bool)m_qbsStdout.contains("warning")); // because some images are missing + QVERIFY(regularFileExists(productBuildDir("iconsetapp") + "/iconsetapp.app/Contents/Resources/white.icns")); +} + QString TestBlackbox::uniqueProductName(const QString &productName) const { return productName + '.' + buildProfileName; diff --git a/tests/auto/blackbox/tst_blackbox.h b/tests/auto/blackbox/tst_blackbox.h index cf3ebb146..0ac522d76 100644 --- a/tests/auto/blackbox/tst_blackbox.h +++ b/tests/auto/blackbox/tst_blackbox.h @@ -185,6 +185,8 @@ private slots: void testWiX(); void testNodeJs(); void testTypeScript(); + void testIconset(); + void testIconsetApp(); private: QString uniqueProductName(const QString &productName) const; |