diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-06 06:23:07 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-06 06:23:07 (GMT) |
| commit | 57ceb11ecf95032418712a686418116cf2398e7a (patch) | |
| tree | 378533fcc07983d3a1b461aaaad07d842e50b81c /tests/auto/qclipboard/tst_qclipboard.cpp | |
| parent | 90d4366f1e9657b3240a872698614c7d9747f9e0 (diff) | |
| parent | a4fc85c75f068b73f9c2334c77b0ae2275510e17 (diff) | |
| download | Qt-57ceb11ecf95032418712a686418116cf2398e7a.zip Qt-57ceb11ecf95032418712a686418116cf2398e7a.tar.gz Qt-57ceb11ecf95032418712a686418116cf2398e7a.tar.bz2 | |
Merge commit 'origin/master'
Conflicts:
tests/auto/qfilesystemmodel/qfilesystemmodel.pro
tests/auto/qfontdialog/tst_qfontdialog.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
tests/auto/qsqldriver/qsqldriver.pro
tests/auto/qsqlquery/qsqlquery.pro
tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
tests/auto/qsqltablemodel/qsqltablemodel.pro
tests/auto/qsqlthread/qsqlthread.pro
tests/auto/qstatemachine/tst_qstatemachine.cpp
tests/auto/qtcpsocket/tst_qtcpsocket.cpp
Diffstat (limited to 'tests/auto/qclipboard/tst_qclipboard.cpp')
| -rw-r--r-- | tests/auto/qclipboard/tst_qclipboard.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qclipboard/tst_qclipboard.cpp b/tests/auto/qclipboard/tst_qclipboard.cpp index c01f274..2dc20d5 100644 --- a/tests/auto/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/qclipboard/tst_qclipboard.cpp @@ -198,7 +198,7 @@ void tst_QClipboard::copy_exit_paste() // ### 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 +#endif if (!nativeClipboardWorking()) QSKIP("Native clipboard not working in this setup", SkipAll); const QStringList stringArgument = QStringList() << "Test string."; @@ -242,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())); @@ -279,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); |