From 3b69fa6bc70efe6f14cb67546812f611b891709c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Fri, 9 Mar 2012 11:38:55 +0100
Subject: Implement QSystemTrayIcon for X11.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reimplement using a QWidget. Use X

Change-Id: I7f8326598fb7210d59bc1d682cdada4526d5b6dd
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 tests/auto/widgets/util/qsystemtrayicon/tst_qsystemtrayicon.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tests/auto')

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
 }
-- 
cgit v1.2.3