summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-03-09 11:38:55 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-23 11:45:25 +0100
commit3b69fa6bc70efe6f14cb67546812f611b891709c (patch)
tree6eda4b00d5cafc9bb45404058bb669ef6b979a45 /tests
parent1fe7e557d75962c9c79cc344037a02ed50369430 (diff)
Implement QSystemTrayIcon for X11.
Reimplement using a QWidget. Use X Change-Id: I7f8326598fb7210d59bc1d682cdada4526d5b6dd Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
index 1f717727b0..9a09af0282 100644
--- a/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
+++ b/tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp
@@ -42,7 +42,7 @@
#include <QtTest/QtTest>
-#include <qcoreapplication.h>
+#include <qguiapplication.h>
#include <qdebug.h>
#include <qsystemtrayicon.h>
#include <qmenu.h>
@@ -125,7 +125,10 @@ void tst_QSystemTrayIcon::supportsMessages()
#elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
QCOMPARE(QSystemTrayIcon::supportsMessages(), true);
#else
- QEXPECT_FAIL("", "QTBUG-20978 QSystemTrayIcon is unimplemented for qpa", Abort);
+ const QString platform = QGuiApplication::platformName();
+ if (platform.compare(QStringLiteral("xcb"), Qt::CaseInsensitive)) {
+ QEXPECT_FAIL("", "QTBUG-20978 QSystemTrayIcon is unimplemented for qpa", Abort);
+ }
QCOMPARE(QSystemTrayIcon::supportsMessages(), true);
#endif
}