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/qml/qml/qqmlglobal.cpp | |
| 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/qml/qml/qqmlglobal.cpp')
| -rw-r--r-- | src/qml/qml/qqmlglobal.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmlglobal.cpp b/src/qml/qml/qqmlglobal.cpp index c9ab2fa16d..f770f53964 100644 --- a/src/qml/qml/qqmlglobal.cpp +++ b/src/qml/qml/qqmlglobal.cpp @@ -332,6 +332,7 @@ QObject *QQmlGuiProvider::application(QObject *) { return 0; } QStringList QQmlGuiProvider::fontFamilies() { return QStringList(); } bool QQmlGuiProvider::openUrlExternally(QUrl &) { return false; } +#ifndef QT_NO_IM QObject *QQmlGuiProvider::inputMethod() { // We don't have any input method code by default @@ -339,6 +340,7 @@ QObject *QQmlGuiProvider::inputMethod() o->setObjectName(QString::fromLatin1("No inputMethod available")); return o; } +#endif static QQmlGuiProvider *guiProvider = 0; |