Add support for -qwindowicon command line argument.

[ChangeLog][QtGui][QGuiApplication] Add support for -icon command line
argument on X11, add -qwindowicon on all platforms.

Change-Id: Iacc602466699bf634d8b34aab7ed73c83fd9844f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

5 files changed, 27 insertions, 0 deletions

diff --git a/tests/auto/gui/kernel/qguiapplication/icons/appicon.png b/tests/auto/gui/kernel/qguiapplication/icons/appicon.png
new file mode 100644
index 0000000000..b5d3ecbddf
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiapplication/icons/appicon.png
diff --git a/tests/auto/gui/kernel/qguiapplication/icons/usericon.png b/tests/auto/gui/kernel/qguiapplication/icons/usericon.png
new file mode 100644
index 0000000000..8d703640c1
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiapplication/icons/usericon.png
diff --git a/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro b/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro
index cd363bab31..895c2a0307 100644
--- a/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro
+++ b/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro
@@ -7,3 +7,5 @@ INCLUDEPATH += $$CORE_TEST_PATH
 TARGET = tst_qguiapplication
 QT += gui-private
 SOURCES += tst_qguiapplication.cpp
+
+RESOURCES = tst_qguiapplication.qrc
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
index 6ef9957fa1..eea72cd246 100644
--- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp
@@ -61,6 +61,7 @@ class tst_QGuiApplication: public tst_QCoreApplication
 private slots:
     void displayName();
     void firstWindowTitle();
+    void windowIcon();
     void focusObject();
     void allWindows();
     void topLevelWindows();
@@ -95,6 +96,24 @@ void tst_QGuiApplication::firstWindowTitle()
     QCOMPARE(window.title(), QString("User Title"));
 }
 
+void tst_QGuiApplication::windowIcon()
+{
+    int argc = 3;
+    char *argv[] = { const_cast<char*>("tst_qguiapplication"), const_cast<char*>("-qwindowicon"), const_cast<char*>(":/icons/usericon.png") };
+    QGuiApplication app(argc, argv);
+    QIcon appIcon(":/icons/appicon.png");
+    app.setWindowIcon(appIcon);
+
+    QWindow window;
+    window.show();
+
+    QIcon userIcon(":/icons/usericon.png");
+    // Comparing icons is hard. cacheKey() differs because the icon was independently loaded.
+    // So we use availableSizes, after making sure that the app and user icons do have different sizes.
+    QVERIFY(userIcon.availableSizes() != appIcon.availableSizes());
+    QCOMPARE(window.icon().availableSizes(), userIcon.availableSizes());
+}
+
 class DummyWindow : public QWindow
 {
 public:
diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.qrc b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.qrc
new file mode 100644
index 0000000000..b26fba37b9
--- /dev/null
+++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/">
+  <file>icons/usericon.png</file>
+  <file>icons/appicon.png</file>
+</qresource>
+</RCC>