From e7fb84adb5d5d9cc5c61db3bbd025f206854bcb4 Mon Sep 17 00:00:00 2001 From: Andrew den Exter Date: Fri, 11 Nov 2011 13:47:59 +1000 Subject: 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 --- tests/auto/qtquick2/qquicktextinput/tst_qquicktextinput.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests') 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(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(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 -- cgit v1.2.3