diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2012-11-23 02:47:45 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-26 18:47:36 +0100 |
| commit | e9e49c6157f7cfb84faeaab0438b0a30380f68f8 (patch) | |
| tree | 3bbf70c61e46b808db18a3258025da260fc2c13b /src/quick/util | |
| parent | cedaf867421f4c43a2da712f00e9626e64c8b250 (diff) | |
Enable module build with QT_NO_IM
Change-Id: I90f8ec7e6357db7b4038bb1646fe9d3835821556
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
Diffstat (limited to 'src/quick/util')
| -rw-r--r-- | src/quick/util/qquickglobal.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickutilmodule.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp index 3a42e30a62..ae5354d966 100644 --- a/src/quick/util/qquickglobal.cpp +++ b/src/quick/util/qquickglobal.cpp @@ -964,10 +964,12 @@ public: return new QQuickApplication(parent); } +#ifndef QT_NO_IM QInputMethod *inputMethod() { return qGuiApp->inputMethod(); } +#endif QStringList fontFamilies() { diff --git a/src/quick/util/qquickutilmodule.cpp b/src/quick/util/qquickutilmodule.cpp index fd2037aa2f..7ecb792b73 100644 --- a/src/quick/util/qquickutilmodule.cpp +++ b/src/quick/util/qquickutilmodule.cpp @@ -65,8 +65,10 @@ void QQuickUtilModule::defineModule() { +#ifndef QT_NO_IM qmlRegisterUncreatableType<QInputMethod>("QtQuick",2,0,"InputMethod", QInputMethod::tr("InputMethod is an abstract class")); +#endif qmlRegisterUncreatableType<QQuickAbstractAnimation>("QtQuick",2,0,"Animation",QQuickAbstractAnimation::tr("Animation is an abstract class")); qmlRegisterType<QQuickBehavior>("QtQuick",2,0,"Behavior"); |