diff options
| author | Andrew den Exter <andrew.den-exter@nokia.com> | 2011-11-29 15:33:56 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-02 09:05:05 +0100 |
| commit | 4f806b3e2490b2890c22a5671290fde94ffddf6b (patch) | |
| tree | 490e9e48d4a86a07a69521ae070cfd8601761cdd /tests/auto/qtquick1/qdeclarativetextedit | |
| parent | 310d1c18f3462d5fc04efd69dc4a246a5819189d (diff) | |
Use QWidgetTextControl in the QtQuick1 TextEdit.
QDeclarative1TextEdit and QTextEdit have the same compatbility
requirements so it makes sense they continue sharing the same line
control implementation. This allows the QtQuick 2 TextInput to diverge
without creating a third variation of QTextControl,
Task-number: QTBUG-22627
Change-Id: Id4a8f6a17aeb756c3385cf8fca3de61b8c4be757
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/qtquick1/qdeclarativetextedit')
| -rw-r--r-- | tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index f64688eb19..621c1753b2 100644 --- a/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/qtquick1/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -58,7 +58,7 @@ #include <QClipboard> #include <QMimeData> #include <private/qapplication_p.h> -#include <private/qtextcontrol_p.h> +#include <private/qwidgettextcontrol_p.h> Q_DECLARE_METATYPE(QDeclarative1TextEdit::SelectionMode) @@ -1977,7 +1977,7 @@ void tst_qdeclarativetextedit::canPaste() { QVERIFY(textEdit != 0); // check initial value - QTBUG-17765 - QTextControl tc; + QWidgetTextControl tc; QCOMPARE(textEdit->canPaste(), tc.canPaste()); #endif @@ -1995,7 +1995,7 @@ void tst_qdeclarativetextedit::canPasteEmpty() { QVERIFY(textEdit != 0); // check initial value - QTBUG-17765 - QTextControl tc; + QWidgetTextControl tc; QCOMPARE(textEdit->canPaste(), tc.canPaste()); #endif |