diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-22 07:27:19 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-09-22 07:27:19 (GMT) |
commit | 52920c5a1cabddb9d0e31a8ef91b741a8c38c69b (patch) | |
tree | 761f47fc8bba32b96913ff9734ac97fc6d6e1b10 /tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp | |
parent | 6b2e0b4c5851a156c1f5fa0f73e9b1266ddc6930 (diff) | |
parent | 83fa27d3fc692e06e10cb0dd57b8f59b38d24637 (diff) | |
download | Qt-52920c5a1cabddb9d0e31a8ef91b741a8c38c69b.zip Qt-52920c5a1cabddb9d0e31a8ef91b741a8c38c69b.tar.gz Qt-52920c5a1cabddb9d0e31a8ef91b741a8c38c69b.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp')
-rw-r--r-- | tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp index c4fc506..ffbb09b 100644 --- a/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp +++ b/tests/auto/declarative/qfxtextedit/tst_qfxtextedit.cpp @@ -424,10 +424,10 @@ void tst_qfxtextedit::selection() QVERIFY(textEditObject->selectedText().size() == 10); } -#include <QFxView> +#include <QmlView> void tst_qfxtextedit::cursorDelegate() { - QFxView* view = new QFxView(0); + QmlView* view = new QmlView(0); view->show(); view->setUrl(QUrl("data/cursorTest.qml")); view->execute(); |