diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-11-11 13:47:59 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-16 00:53:17 +0100 |
| commit | e7fb84adb5d5d9cc5c61db3bbd025f206854bcb4 (patch) | |
| tree | f5e1d922b8cc0a3ffe01358efdddd15a93867d30 /tests | |
| parent | d70cca804e88110eae32f92baff7cee957a6a531 (diff) | |
Merge QQuickLineControl into QQuickTextInput.
There's no clear separation of responsibilty between these classes and
keeping them in sync and forwarding signals is a unnecessary overhead
that can be avoided by combining them.
Task-number: QTBUG-22627
Change-Id: I4350eb3c612b10d4ed34886374889ae893b8183a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp index e4ea569f45..6b6fd73b01 100644 --- a/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp +++ b/tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp @@ -1823,8 +1823,7 @@ void tst_qquicktextinput::canPasteEmpty() { QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create()); QVERIFY(textInput != 0); - QQuickLineControl lc; - bool cp = !lc.isReadOnly() && QGuiApplication::clipboard()->text().length() != 0; + bool cp = !textInput->isReadOnly() && QGuiApplication::clipboard()->text().length() != 0; QCOMPARE(textInput->canPaste(), cp); #endif @@ -1841,8 +1840,7 @@ void tst_qquicktextinput::canPaste() { QQuickTextInput *textInput = qobject_cast<QQuickTextInput*>(textInputComponent.create()); QVERIFY(textInput != 0); - QQuickLineControl lc; - bool cp = !lc.isReadOnly() && QGuiApplication::clipboard()->text().length() != 0; + bool cp = !textInput->isReadOnly() && QGuiApplication::clipboard()->text().length() != 0; QCOMPARE(textInput->canPaste(), cp); #endif |