diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-02-03 10:07:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 09:54:58 +0100 |
| commit | e761f5b906c427433325debb9f08c4f2d0ba902d (patch) | |
| tree | fa8fbc933b6ed9ea2cdbc918d4317c95992c26e7 /tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp | |
| parent | 9634dc440269fc03f825a6d18b371d8e612ba9ec (diff) | |
Use QInputMethod instead of deprecated QInputPanel
Similarly deprecate Qt.application.inputPanel and
introduce replacement Qt.inputMethod.
Change-Id: Ie4fd467f93f75023c86b0a2d038d858fe5001146
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Sami Kananoja <sami.kananoja@nokia.com>
Diffstat (limited to 'tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp')
| -rw-r--r-- | tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp index fa19338f89..6b921a7356 100644 --- a/tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp +++ b/tests/auto/qtquick2/qdeclarativeapplication/tst_qdeclarativeapplication.cpp @@ -44,7 +44,7 @@ #include <QtDeclarative/qdeclarativeengine.h> #include <QtQuick/qquickitem.h> #include <QtQuick/qquickview.h> -#include <QtGui/qinputpanel.h> +#include <QtGui/qinputmethod.h> class tst_qdeclarativeapplication : public QObject { @@ -56,6 +56,7 @@ private slots: void active(); void layoutDirection(); void inputPanel(); + void inputMethod(); private: QDeclarativeEngine engine; @@ -135,9 +136,24 @@ void tst_qdeclarativeapplication::inputPanel() item->setParentItem(view.rootObject()); // check that the inputPanel property maches with application's input panel - QCOMPARE(qvariant_cast<QObject*>(item->property("inputPanel")), qApp->inputPanel()); + QCOMPARE(qvariant_cast<QObject*>(item->property("inputPanel")), qApp->inputMethod()); } +void tst_qdeclarativeapplication::inputMethod() +{ + // technically not in QDeclarativeApplication, but testing anyway here + QDeclarativeComponent component(&engine); + component.setData("import QtQuick 2.0; Item { property variant inputMethod: Qt.inputMethod }", QUrl::fromLocalFile("")); + QQuickItem *item = qobject_cast<QQuickItem *>(component.create()); + QVERIFY(item); + QQuickView view; + item->setParentItem(view.rootObject()); + + // check that the inputMethod property maches with application's input method + QCOMPARE(qvariant_cast<QObject*>(item->property("inputMethod")), qApp->inputMethod()); +} + + QTEST_MAIN(tst_qdeclarativeapplication) #include "tst_qdeclarativeapplication.moc" |