10 files changed, 106 insertions, 0 deletions
diff --git a/tests/manual/cocoa/qsystemtrayicon/icons.qrc b/tests/manual/cocoa/qsystemtrayicon/icons.qrc
new file mode 100644
index 0000000000..2486dcab34
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/icons.qrc
@@ -0,0 +1,11 @@
+<RCC>
+     <qresource prefix="/">
+         <file>macsystray18x18.png</file>
+         <file>macsystray36x36.png</file>
+         <file>macsystray25x15.png</file>
+         <file>macsystray50x30.png</file>
+         <file>macsystray16x16.png</file>
+         <file>macsystray32x32.png</file>
+         <file>macsystray64x64.png</file>
+    </qresource>
+</RCC>
diff --git a/tests/manual/cocoa/qsystemtrayicon/macsystray16x16.png b/tests/manual/cocoa/qsystemtrayicon/macsystray16x16.png
new file mode 100644
index 0000000000..e6930f16c6
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/macsystray16x16.png
diff --git a/tests/manual/cocoa/qsystemtrayicon/macsystray18x18.png b/tests/manual/cocoa/qsystemtrayicon/macsystray18x18.png
new file mode 100644
index 0000000000..4316516d85
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/macsystray18x18.png
diff --git a/tests/manual/cocoa/qsystemtrayicon/macsystray25x15.png b/tests/manual/cocoa/qsystemtrayicon/macsystray25x15.png
new file mode 100644
index 0000000000..c1a98b898c
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/macsystray25x15.png
diff --git a/tests/manual/cocoa/qsystemtrayicon/macsystray32x32.png b/tests/manual/cocoa/qsystemtrayicon/macsystray32x32.png
new file mode 100644
index 0000000000..35f0f28ae7
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/macsystray32x32.png
diff --git a/tests/manual/cocoa/qsystemtrayicon/macsystray36x36.png b/tests/manual/cocoa/qsystemtrayicon/macsystray36x36.png
new file mode 100644
index 0000000000..d2c6df066c
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/macsystray36x36.png
diff --git a/tests/manual/cocoa/qsystemtrayicon/macsystray50x30.png b/tests/manual/cocoa/qsystemtrayicon/macsystray50x30.png
new file mode 100644
index 0000000000..afea90b7fe
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/macsystray50x30.png
diff --git a/tests/manual/cocoa/qsystemtrayicon/macsystray64x64.png b/tests/manual/cocoa/qsystemtrayicon/macsystray64x64.png
new file mode 100644
index 0000000000..b2a126d78f
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/macsystray64x64.png
diff --git a/tests/manual/cocoa/qsystemtrayicon/main.cpp b/tests/manual/cocoa/qsystemtrayicon/main.cpp
new file mode 100644
index 0000000000..9b3fc2bd13
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/main.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#include <QtWidgets>
+
+int main(int argc, char**argv)
+{
+    QApplication app(argc, argv);
+
+    QWidget window;
+    window.show();
+
+    QSystemTrayIcon systrayIcon(&window);
+
+
+    enum Iconset { Square,          // square icons, reccomended size (18 device-independent pixels or less)
+                   Rectangular,     // rectangular icons, good size
+                   PowerOfTwo,      // standard pow-2 icons, not optimized for the OS X menu bar
+                   Small,           // Not enough pixels
+                   UnreasonablyLarge  // please do something reasonable with my unreasonably large pixmap
+                   };
+
+    // Select icon set and load images
+    Iconset iconset = Square;
+    QIcon icon;
+    switch (iconset) {
+        case Square:
+            icon.addFile(":/macsystray36x36.png");
+            icon.addFile(":/macsystray18x18.png");
+        break;
+        case Rectangular:
+            icon.addFile(":/macsystray50x30.png");
+            icon.addFile(":/macsystray25x15.png");
+        break;
+        case PowerOfTwo:
+            icon.addFile(":/macsystray16x16.png");
+            icon.addFile(":/macsystray32x32.png");
+            icon.addFile(":/macsystray64x64.png");
+        break;
+        case Small:
+            icon.addFile(":/macsystray16x16.png");
+        case UnreasonablyLarge:
+            icon.addFile(":/macsystray64x64.png");
+        break;
+    }
+
+    systrayIcon.setIcon(icon);
+    systrayIcon.show();
+
+    return app.exec();
+}
diff --git a/tests/manual/cocoa/qsystemtrayicon/qsystemtrayicon.pro b/tests/manual/cocoa/qsystemtrayicon/qsystemtrayicon.pro
new file mode 100644
index 0000000000..459ebafa38
--- /dev/null
+++ b/tests/manual/cocoa/qsystemtrayicon/qsystemtrayicon.pro
@@ -0,0 +1,7 @@
+TEMPLATE = app
+TARGET = qsystemtrayicon
+INCLUDEPATH += .
+QT += widgets
+
+SOURCES += main.cpp
+RESOURCES += icons.qrc