summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto.qnx@kdab.com>2012-10-10 17:38:05 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-17 12:01:14 (GMT)
commitd23ee1a4b519a625c1978ebd78df416fc6fb3374 (patch)
tree8ca4bdeff9b5bfdd733aa0ed4810bc42e4bf8f35
parent98b039db1165021e2d48b467f44650777e881467 (diff)
downloadQt-d23ee1a4b519a625c1978ebd78df416fc6fb3374.zip
Qt-d23ee1a4b519a625c1978ebd78df416fc6fb3374.tar.gz
Qt-d23ee1a4b519a625c1978ebd78df416fc6fb3374.tar.bz2
Do not skip tst_QClipboard::copy_exit_paste on QNX
This test is valid on QNX platforms cherry-picked from qt5 703fa6c361682cab0d64baabd9256c651da34779 Change-Id: I51c1d191cf8cdbde6239afc99019ca310bd2220a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--tests/auto/qclipboard/tst_qclipboard.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp
index e6b3aa6..a1896c9 100644
--- a/tests/auto/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/qclipboard/tst_qclipboard.cpp
@@ -235,7 +235,7 @@ void tst_QClipboard::testSignals()
void tst_QClipboard::copy_exit_paste()
{
#ifndef QT_NO_PROCESS
-#if defined Q_WS_X11 || defined Q_WS_QWS || defined (Q_WS_QPA)
+#if defined Q_WS_X11 || defined Q_WS_QWS || (!defined (Q_OS_QNX) && defined (Q_WS_QPA))
QSKIP("This test does not make sense on X11 and embedded, copied data disappears from the clipboard when the application exits ", SkipAll);
// ### It's still possible to test copy/paste - just keep the apps running
#elif defined (Q_OS_SYMBIAN) && defined (Q_CC_NOKIAX86)