diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-22 14:40:52 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2016-01-22 14:28:53 +0000 |
| commit | ccaa12c225062e0ef654bee9a96cbe5e5f9724ae (patch) | |
| tree | dcb7105eec2b544b5bbe2d18e85ffe68dddd5274 /tests/auto/qml/qqmlvaluetypes | |
| parent | 90ba088773f669b9c87a000ff781b7033679679f (diff) | |
Leave out most of tst_qqmlvaluetypes::locale() on QT_NO_IM
We cannot get an input method from QQmlGuiProvider then.
Change-Id: I8d9c2323b8a18a00bc44fc0121ddefb90253228a
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'tests/auto/qml/qqmlvaluetypes')
| -rw-r--r-- | tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp index 2e3e54263b..d0b7737794 100644 --- a/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp +++ b/tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp @@ -320,6 +320,7 @@ void tst_qqmlvaluetypes::locale() QScopedPointer<QObject> object(component.create()); QVERIFY(!object.isNull()); +#ifndef QT_NO_IM QVERIFY(QQml_guiProvider()->inputMethod()); QInputMethod *inputMethod = qobject_cast<QInputMethod*>(QQml_guiProvider()->inputMethod()); QLocale locale = inputMethod->locale(); @@ -346,6 +347,7 @@ void tst_qqmlvaluetypes::locale() } QCOMPARE(weekDays, locale.weekdays()); QCOMPARE(object->property("zeroDigit").toString().at(0), locale.zeroDigit()); +#endif // QT_NO_IM } } |