diff options
| author | Damian Jansen <damian.jansen@nokia.com> | 2011-10-19 15:04:15 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-26 09:01:28 +0200 |
| commit | 4ae7aecb68b506f21bd5411bf92a1e8d9fe807bb (patch) | |
| tree | f264def252b28943e7dda1538ecd73e72746538a /tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp | |
| parent | 27933ae4ee5741d09b607635213232d94c444633 (diff) | |
Remove Q_WS_*, symbian and maemo code in QtDeclarative
Change-Id: If64daf80f9d19973e0bc2d864b003a66be5ca61d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp')
| -rw-r--r-- | tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp b/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp index 86c33a64d8..bcc1a4c5d7 100644 --- a/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp +++ b/tests/auto/declarative/qquicktextedit/tst_qquicktextedit.cpp @@ -63,7 +63,7 @@ #include <private/qtextcontrol_p.h> #include "../shared/util.h" -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC #include <Carbon/Carbon.h> #endif @@ -1780,7 +1780,7 @@ void tst_qquicktextedit::navigation() void tst_qquicktextedit::copyAndPaste() { #ifndef QT_NO_CLIPBOARD -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC { PasteboardRef pasteboard; OSStatus status = PasteboardCreate(0, &pasteboard); @@ -2207,9 +2207,7 @@ void tst_qquicktextedit::preeditMicroFocus() ic.sendPreeditText(preeditText, 0); currentRect = edit->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, false); // The cursor position hasn't changed. -#endif QCOMPARE(cursorRectangleSpy.count(), 0); // Verify that the micro focus rect moves to the left as the cursor position @@ -2219,9 +2217,7 @@ void tst_qquicktextedit::preeditMicroFocus() ic.sendPreeditText(preeditText, i); currentRect = edit->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QVERIFY(previousRect.left() < currentRect.left()); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, true); -#endif QVERIFY(cursorRectangleSpy.count() > 0); cursorRectangleSpy.clear(); previousRect = currentRect; @@ -2234,9 +2230,7 @@ void tst_qquicktextedit::preeditMicroFocus() ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>())); currentRect = edit->inputMethodQuery(Qt::ImCursorRectangle).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, true); -#endif QVERIFY(cursorRectangleSpy.count() > 0); #endif } |