To support QT_NO_IM on Linux/Windows/Mac

Fix compilation issue when QT_NO_IM is defined.
Also fixed references in tests. But fixing
plugins/examples seem not necessary at this point.

Task-number: QTBUG-26109
Change-Id: I2067051951616012117efa6716640cbf198fdb2a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>

6 files changed, 16 insertions, 7 deletions

diff --git a/src/gui/inputmethod/qinputcontext.h b/src/gui/inputmethod/qinputcontext.h
index 47d7200586..147b8bad27 100644
--- a/src/gui/inputmethod/qinputcontext.h
+++ b/src/gui/inputmethod/qinputcontext.h
@@ -58,6 +58,7 @@
 
 #include <QtCore/qobject.h>
 #include <QtCore/qglobal.h>
+#include <QtCore/qconfig.h>
 #include <QtGui/qevent.h>
 #include <QtCore/qstring.h>
 #include <QtCore/qlist.h>
diff --git a/src/gui/inputmethod/qmacinputcontext_mac.cpp b/src/gui/inputmethod/qmacinputcontext_mac.cpp
index 270258fe3d..7cd1be15ee 100644
--- a/src/gui/inputmethod/qmacinputcontext_mac.cpp
+++ b/src/gui/inputmethod/qmacinputcontext_mac.cpp
@@ -38,7 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+#include <qconfig.h>
+#include <qglobal.h>
+#ifndef QT_NO_IM
 #include <qvarlengtharray.h>
 #include <qwidget.h>
 #include <private/qmacinputcontext_p.h>
@@ -378,3 +380,4 @@ QMacInputContext::globalEventProcessor(EventHandlerCallRef, EventRef event, void
 }
 
 QT_END_NAMESPACE
+#endif // QT_NO_IM
diff --git a/src/gui/inputmethod/qmacinputcontext_p.h b/src/gui/inputmethod/qmacinputcontext_p.h
index 00e5a49cae..e81865282d 100644
--- a/src/gui/inputmethod/qmacinputcontext_p.h
+++ b/src/gui/inputmethod/qmacinputcontext_p.h
@@ -41,7 +41,8 @@
 
 #ifndef QMACINPUTCONTEXT_P_H
 #define QMACINPUTCONTEXT_P_H
-
+#include <qconfig.h>
+#ifndef QT_NO_IM
 //
 //  W A R N I N G
 //  -------------
@@ -94,5 +95,5 @@ private:
 };
 
 QT_END_NAMESPACE
-
+#endif // QT_NO_IM
 #endif // QMACINPUTCONTEXT_P_H
diff --git a/src/gui/inputmethod/qwininputcontext_p.h b/src/gui/inputmethod/qwininputcontext_p.h
index ed9b11023a..ffb2862fd1 100644
--- a/src/gui/inputmethod/qwininputcontext_p.h
+++ b/src/gui/inputmethod/qwininputcontext_p.h
@@ -52,6 +52,8 @@
 //
 // We mean it.
 //
+#include <qconfig.h>
+#ifndef QT_NO_IM
 
 #include "QtGui/qinputcontext.h"
 #include "QtCore/qt_windows.h"
@@ -107,5 +109,5 @@ private:
 };
 
 QT_END_NAMESPACE
-
+#endif // QT_NO_IM
 #endif // QWININPUTCONTEXT_P_H
diff --git a/src/gui/inputmethod/qwininputcontext_win.cpp b/src/gui/inputmethod/qwininputcontext_win.cpp
index 8338f02276..21a159b56b 100644
--- a/src/gui/inputmethod/qwininputcontext_win.cpp
+++ b/src/gui/inputmethod/qwininputcontext_win.cpp
@@ -41,6 +41,7 @@
 
 #include "qwininputcontext_p.h"
 #include "qinputcontext_p.h"
+#ifndef QT_NO_IM
 
 #include "qfont.h"
 #include "qwidget.h"
@@ -181,7 +182,7 @@ static IActiveIMMApp *aimm = 0;
 static IActiveIMMMessagePumpOwner *aimmpump = 0;
 static QString *imeComposition = 0;
 static int        imePosition    = -1;
-bool qt_use_rtl_extensions = false;
+extern bool qt_use_rtl_extensions;
 static bool haveCaret = false;
 
 #ifndef LGRPID_INSTALLED
@@ -845,3 +846,4 @@ int QWinInputContext::reconvertString(RECONVERTSTRING *reconv)
 }
 
 QT_END_NAMESPACE
+#endif // QT_NO_IM
diff --git a/src/gui/inputmethod/qximinputcontext_p.h b/src/gui/inputmethod/qximinputcontext_p.h
index 8f36c3ca8c..ba7d6bc30a 100644
--- a/src/gui/inputmethod/qximinputcontext_p.h
+++ b/src/gui/inputmethod/qximinputcontext_p.h
@@ -66,8 +66,8 @@
 //
 // We mean it.
 //
-
-#if !defined(Q_NO_IM)
+#include <qconfig.h>
+#ifndef QT_NO_IM
 
 #include "QtCore/qglobal.h"
 #include "QtGui/qinputcontext.h"