3 files changed, 22 insertions, 37 deletions
diff --git a/tests/auto/gui/kernel/qclipboard/copier/copier.pro b/tests/auto/gui/kernel/qclipboard/copier/copier.pro
index 1c188ca7de..def50b6476 100644
--- a/tests/auto/gui/kernel/qclipboard/copier/copier.pro
+++ b/tests/auto/gui/kernel/qclipboard/copier/copier.pro
@@ -1,9 +1,4 @@
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
 CONFIG -= app_bundle
 win32: DESTDIR = ../copier
-# Input
-SOURCES += main.cpp
 
+SOURCES += main.cpp
diff --git a/tests/auto/gui/kernel/qclipboard/paster/paster.pro b/tests/auto/gui/kernel/qclipboard/paster/paster.pro
index 2f50eefb1e..ef91e77b6e 100644
--- a/tests/auto/gui/kernel/qclipboard/paster/paster.pro
+++ b/tests/auto/gui/kernel/qclipboard/paster/paster.pro
@@ -1,10 +1,4 @@
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
 win32: DESTDIR = ../paster
 CONFIG -= app_bundle
-# Input
-SOURCES += main.cpp
-
 
+SOURCES += main.cpp
diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
index e1b0535e2f..7f41f0651e 100644
--- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp
@@ -291,19 +291,17 @@ void tst_QClipboard::setMimeData()
     QGuiApplication::clipboard()->clear(QClipboard::Selection); // used to crash on X11
     QGuiApplication::clipboard()->clear(QClipboard::FindBuffer);
 
-#if defined(Q_WS_X11)
-    QCOMPARE(spySelection.count(), 1);
-    QCOMPARE(spyData.count(), 1);
-    QCOMPARE(spyFindBuffer.count(), 0);
-#elif defined(Q_OS_MAC)
-    QCOMPARE(spySelection.count(), 0);
-    QCOMPARE(spyData.count(), 1);
-    QCOMPARE(spyFindBuffer.count(), 1);
-#elif defined(Q_WS_WIN)
-    QCOMPARE(spySelection.count(), 0);
+    if (QGuiApplication::clipboard()->supportsSelection())
+        QCOMPARE(spySelection.count(), 1);
+    else
+        QCOMPARE(spySelection.count(), 0);
+
+    if (QGuiApplication::clipboard()->supportsFindBuffer())
+        QCOMPARE(spyFindBuffer.count(), 1);
+    else
+        QCOMPARE(spyFindBuffer.count(), 0);
+
     QCOMPARE(spyData.count(), 1);
-    QCOMPARE(spyFindBuffer.count(), 0);
-#endif
 
     // an other crash test
     data = new QMimeData;
@@ -324,19 +322,17 @@ void tst_QClipboard::setMimeData()
     QGuiApplication::clipboard()->setMimeData(newData, QClipboard::Selection); // used to crash on X11
     QGuiApplication::clipboard()->setMimeData(newData, QClipboard::FindBuffer);
 
-#if defined(Q_WS_X11)
-    QCOMPARE(spySelection.count(), 1);
-    QCOMPARE(spyData.count(), 1);
-    QCOMPARE(spyFindBuffer.count(), 0);
-#elif defined(Q_OS_MAC)
-    QCOMPARE(spySelection.count(), 0);
-    QCOMPARE(spyData.count(), 1);
-    QCOMPARE(spyFindBuffer.count(), 1);
-#elif defined(Q_WS_WIN)
-    QCOMPARE(spySelection.count(), 0);
+    if (QGuiApplication::clipboard()->supportsSelection())
+        QCOMPARE(spySelection.count(), 1);
+    else
+        QCOMPARE(spySelection.count(), 0);
+
+    if (QGuiApplication::clipboard()->supportsFindBuffer())
+        QCOMPARE(spyFindBuffer.count(), 1);
+    else
+        QCOMPARE(spyFindBuffer.count(), 0);
+
     QCOMPARE(spyData.count(), 1);
-    QCOMPARE(spyFindBuffer.count(), 0);
-#endif
 }
 
 void tst_QClipboard::clearBeforeSetText()