diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-09-27 19:53:01 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-29 06:41:42 +0200 |
commit | 95cebd34ebc5b4d39b11dc91610309a35e488663 (patch) | |
tree | 90ceffef5acea093dd2b8f8f7e8c30593023b85a /tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp | |
parent | ab061e3e436fab35eac8666f3e950e98f66c4d3e (diff) |
Remove Symbian-specific code from tests.
Symbian is not a supported platform for Qt5, so this code is no longer
required.
Change-Id: I1172e6a42d518490e63e9599bf10579df08259aa
Reviewed-on: http://codereview.qt-project.org/5657
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp')
-rw-r--r-- | tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp index 4d3bb29e13..34bc581396 100644 --- a/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp +++ b/tests/auto/gui/kernel/qclipboard/tst_qclipboard.cpp @@ -47,14 +47,6 @@ #ifdef Q_WS_MAC #include <Carbon/Carbon.h> #endif -#ifdef Q_OS_SYMBIAN -#include "private/qcore_symbian_p.h" -#include "txtetext.h" -#include <baclipb.h> -#endif -#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS -#include "txtclipboard.h" -#endif //TESTED_CLASS= //TESTED_FILES= @@ -70,10 +62,6 @@ private slots: void testSignals(); void setMimeData(); void clearBeforeSetText(); -#ifdef Q_OS_SYMBIAN - void pasteCopySymbian(); - void copyPasteSymbian(); -#endif private: bool nativeClipboardWorking(); @@ -208,8 +196,6 @@ void tst_QClipboard::copy_exit_paste() #if defined Q_WS_X11 || defined Q_WS_QWS || 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) - QSKIP("emulator cannot launch multiple processes",SkipAll); #endif if (!nativeClipboardWorking()) QSKIP("Native clipboard not working in this setup", SkipAll); @@ -347,76 +333,6 @@ void tst_QClipboard::clearBeforeSetText() QCOMPARE(QApplication::clipboard()->text(), text); } -/* - Test that text copied from qt application - can be pasted with symbian clipboard -*/ -#ifdef Q_OS_SYMBIAN -// ### This test case only makes sense in symbian -void tst_QClipboard::pasteCopySymbian() -{ - if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); - const QString string("Test string symbian."); - QApplication::clipboard()->setText(string); - - const TInt KPlainTextBegin = 0; - RFs fs = qt_s60GetRFs(); - CClipboard* cb = CClipboard::NewForReadingLC(fs); - - CPlainText* text = CPlainText::NewL(); - CleanupStack::PushL(text); - TInt dataLength = text->PasteFromStoreL(cb->Store(), cb->StreamDictionary(), - KPlainTextBegin); - if (dataLength == 0) { - User::Leave(KErrNotFound); - } - HBufC* hBuf = HBufC::NewL(dataLength); - TPtr buf = hBuf->Des(); - text->Extract(buf, KPlainTextBegin, dataLength); - - QString storeString = qt_TDesC2QString(buf); - CleanupStack::PopAndDestroy(text); - CleanupStack::PopAndDestroy(cb); - - QCOMPARE(string, storeString); -} -#endif - -/* - Test that text copied to symbian clipboard - can be pasted to qt clipboard -*/ -#ifdef Q_OS_SYMBIAN -// ### This test case only makes sense in symbian -void tst_QClipboard::copyPasteSymbian() -{ - if (!nativeClipboardWorking()) - QSKIP("Native clipboard not working in this setup", SkipAll); - const QString string("Test string symbian."); - const TInt KPlainTextBegin = 0; - - RFs fs = qt_s60GetRFs(); - CClipboard* cb = CClipboard::NewForWritingLC(fs); - CStreamStore& store = cb->Store(); - CStreamDictionary& dict = cb->StreamDictionary(); - RStoreWriteStream symbianStream; - TStreamId symbianStId = symbianStream.CreateLC(cb->Store()); - - CPlainText* text = CPlainText::NewL(); - CleanupStack::PushL(text); - TPtrC textPtr(qt_QString2TPtrC(string)); - text->InsertL(KPlainTextBegin, textPtr); - text->CopyToStoreL(store, dict, KPlainTextBegin, textPtr.Length()); - CleanupStack::PopAndDestroy(text); - (cb->StreamDictionary()).AssignL(KClipboardUidTypePlainText, symbianStId); - cb->CommitL(); - CleanupStack::PopAndDestroy(2, cb); - - QCOMPARE(QApplication::clipboard()->text(), string); -} -#endif - QTEST_MAIN(tst_QClipboard) #include "tst_qclipboard.moc" |