4 files changed, 20 insertions, 16 deletions
diff --git a/tests/auto/qclipboard/copier/main.cpp b/tests/auto/qclipboard/copier/main.cpp
index 49b0a35..dd9db5d 100644
--- a/tests/auto/qclipboard/copier/main.cpp
+++ b/tests/auto/qclipboard/copier/main.cpp
@@ -1,7 +1,6 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -21,9 +20,10 @@
 ** 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, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
diff --git a/tests/auto/qclipboard/paster/main.cpp b/tests/auto/qclipboard/paster/main.cpp
index 552355a..8e3507e 100644
--- a/tests/auto/qclipboard/paster/main.cpp
+++ b/tests/auto/qclipboard/paster/main.cpp
@@ -1,7 +1,6 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -21,9 +20,10 @@
 ** 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, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
diff --git a/tests/auto/qclipboard/test/test.pro b/tests/auto/qclipboard/test/test.pro
index ba70cff..508eba1 100644
--- a/tests/auto/qclipboard/test/test.pro
+++ b/tests/auto/qclipboard/test/test.pro
@@ -10,7 +10,7 @@ win32 {
   }
 }
 
-wince*: {
+wince*|symbian*: {
   copier.sources = ../copier/copier.exe
   copier.path = copier
   paster.sources = ../paster/paster.exe
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp
index 3745598..03235c7 100644
--- a/tests/auto/qclipboard/tst_qclipboard.cpp
+++ b/tests/auto/qclipboard/tst_qclipboard.cpp
@@ -1,7 +1,6 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -21,9 +20,10 @@
 ** 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, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** In addition, as a special exception, Nokia gives you certain
+** additional rights.  These rights are described in the Nokia Qt LGPL
+** Exception version 1.1, included in the file LGPL_EXCEPTION.txt in this
+** package.
 **
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at qt-info@nokia.com.
@@ -108,7 +108,7 @@ void tst_QClipboard::modes()
     if (!nativeClipboardWorking())
         QSKIP("Native clipboard not working in this setup", SkipAll);
 
-    const QString defaultMode = "deafult mode text;";
+    const QString defaultMode = "default mode text;";
     clipboard->setText(defaultMode);
     QCOMPARE(clipboard->text(), defaultMode);
 
@@ -192,9 +192,12 @@ void tst_QClipboard::testSignals()
 */
 void tst_QClipboard::copy_exit_paste()
 {
+#ifndef QT_NO_PROCESS
 #if defined Q_WS_X11 || defined Q_WS_QWS
     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)
+    QSKIP("emulator cannot launch multiple processes",SkipAll);
 #endif
     if (!nativeClipboardWorking())
         QSKIP("Native clipboard not working in this setup", SkipAll);
@@ -205,6 +208,7 @@ void tst_QClipboard::copy_exit_paste()
     QTest::qWait(100);
 #endif
     QCOMPARE(QProcess::execute("paster/paster", stringArgument), 0);
+#endif
 }
 
 void tst_QClipboard::setMimeData()
@@ -238,7 +242,7 @@ void tst_QClipboard::setMimeData()
     QApplication::clipboard()->setMimeData(data, QClipboard::Clipboard);
     QApplication::clipboard()->setMimeData(data, QClipboard::Selection);
     QApplication::clipboard()->setMimeData(data, QClipboard::FindBuffer);
-    
+
     QSignalSpy spySelection(QApplication::clipboard(), SIGNAL(selectionChanged()));
     QSignalSpy spyData(QApplication::clipboard(), SIGNAL(dataChanged()));
     QSignalSpy spyFindBuffer(QApplication::clipboard(), SIGNAL(findBufferChanged()));
@@ -275,7 +279,7 @@ void tst_QClipboard::setMimeData()
     spySelection.clear();
     spyData.clear();
     spyFindBuffer.clear();
-    
+
     QApplication::clipboard()->setMimeData(newData, QClipboard::Clipboard);
     QApplication::clipboard()->setMimeData(newData, QClipboard::Selection); // used to crash on X11
     QApplication::clipboard()->setMimeData(newData, QClipboard::FindBuffer);