diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-26 10:02:17 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-27 01:08:41 +0200 |
| commit | 4a6008dfede3c81a055792424cf5a6671e0dc41a (patch) | |
| tree | 00acfd32a3bcc7f43ce0750d75e187a6ce32bb11 /tests | |
| parent | 32ace476d08bad2397026f8d70f6e534ef366aa8 (diff) | |
Remove obsolete use of Q_WS_QWS.
Change-Id: I0c2af5663852a1fa456684424c220697fa6824e8
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 1be84e55..17b74687 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -2477,7 +2477,7 @@ void tst_qdeclarativetextedit::preeditMicroFocus() sendPreeditText(preeditText, 0); currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) +#if defined(Q_WS_X11) QCOMPARE(ic.updateCallCount, 0); // The cursor position hasn't changed. #endif QCOMPARE(cursorRectangleSpy.count(), 0); @@ -2489,7 +2489,7 @@ void tst_qdeclarativetextedit::preeditMicroFocus() sendPreeditText(preeditText, i); currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect(); QVERIFY(previousRect.left() < currentRect.left()); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) +#if defined(Q_WS_X11) QVERIFY(ic.updateCallCount > 0); #endif QVERIFY(cursorRectangleSpy.count() > 0); @@ -2505,7 +2505,7 @@ void tst_qdeclarativetextedit::preeditMicroFocus() QApplication::sendEvent(qApp->inputMethod()->inputItem(), &imEvent); currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) +#if defined(Q_WS_X11) QVERIFY(ic.updateCallCount > 0); #endif QVERIFY(cursorRectangleSpy.count() > 0); diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index e1132b69..dbce1881 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -2582,7 +2582,7 @@ void tst_qdeclarativetextinput::preeditMicroFocus() sendPreeditText(preeditText, 0); currentRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) +#if defined(Q_WS_X11) QVERIFY(ic.updateCallCount > 0); #endif @@ -2593,7 +2593,7 @@ void tst_qdeclarativetextinput::preeditMicroFocus() sendPreeditText(preeditText, i); currentRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect(); QVERIFY(previousRect.left() < currentRect.left()); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) +#if defined(Q_WS_X11) QVERIFY(ic.updateCallCount > 0); #endif previousRect = currentRect; @@ -2606,7 +2606,7 @@ void tst_qdeclarativetextinput::preeditMicroFocus() QApplication::sendEvent(&view, &imEvent); currentRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect(); QCOMPARE(currentRect, previousRect); -#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN) +#if defined(Q_WS_X11) QVERIFY(ic.updateCallCount > 0); #endif } |