diff options
Diffstat (limited to 'tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp')
| -rw-r--r-- | tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index ec48769ca3..45402f1aa4 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -61,11 +61,6 @@ #include <QtWidgets/5.0.0/QtWidgets/private/qapplication_p.h> #include <private/qtextcontrol_p.h> -#ifdef Q_OS_SYMBIAN -// In Symbian OS test data is located in applications private dir -#define SRCDIR "." -#endif - Q_DECLARE_METATYPE(QDeclarative1TextEdit::SelectionMode) QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual) @@ -2449,7 +2444,7 @@ void tst_qdeclarativetextedit::preeditMicroFocus() ic.sendPreeditText(preeditText, 0); currentRect = edit.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) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, false); // The cursor position hasn't changed. #endif QCOMPARE(cursorRectangleSpy.count(), 0); @@ -2461,7 +2456,7 @@ void tst_qdeclarativetextedit::preeditMicroFocus() ic.sendPreeditText(preeditText, i); currentRect = edit.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) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, true); #endif QVERIFY(cursorRectangleSpy.count() > 0); @@ -2476,7 +2471,7 @@ void tst_qdeclarativetextedit::preeditMicroFocus() ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>())); currentRect = edit.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) || defined(Q_WS_QWS) QCOMPARE(ic.updateReceived, true); #endif QVERIFY(cursorRectangleSpy.count() > 0); |