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>

2 files changed, 25 insertions, 5 deletions

diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 8c08ce6e0c..76c7148af3 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -127,8 +127,9 @@ private slots:
     void mouseSelectionMode_data();
     void mouseSelectionMode();
     void dragMouseSelection();
+#ifndef QT_NO_IM
     void inputMethodHints();
-
+#endif
     void positionAt();
 
     void cursorDelegate();
@@ -141,8 +142,10 @@ private slots:
     void canPaste();
     void canPasteEmpty();
     void textInput();
+#ifndef QT_NO_IM
     void openInputPanelOnClick();
     void openInputPanelOnFocus();
+#endif
     void geometrySignals();
     void pastingRichText_QTBUG_14003();
     void implicitSize_data();
@@ -151,10 +154,11 @@ private slots:
     void implicitSizePreedit();
     void testQtQuick11Attributes();
     void testQtQuick11Attributes_data();
-
+#ifndef QT_NO_IM
     void preeditMicroFocus();
     void inputContextMouseHandler();
     void inputMethodComposing();
+#endif
     void cursorRectangleSize();
     void deselect();
 
@@ -1604,6 +1608,7 @@ void tst_qdeclarativetextedit::mouseSelectionMode()
     delete canvas;
 }
 
+#ifndef QT_NO_IM
 void tst_qdeclarativetextedit::inputMethodHints()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
@@ -1619,6 +1624,7 @@ void tst_qdeclarativetextedit::inputMethodHints()
 
     delete canvas;
 }
+#endif
 
 void tst_qdeclarativetextedit::positionAt()
 {
@@ -2064,7 +2070,7 @@ QDeclarativeView *tst_qdeclarativetextedit::createView(const QString &filename)
     canvas->setSource(QUrl::fromLocalFile(filename));
     return canvas;
 }
-
+#ifndef QT_NO_IM
 class MyInputContext : public QInputContext
 {
 public:
@@ -2327,7 +2333,7 @@ void tst_qdeclarativetextedit::openInputPanelOnFocus()
     QVERIFY(view.inputContext() == 0);
     QVERIFY(!view.testAttribute(Qt::WA_InputMethodEnabled));
 }
-
+#endif //QT_NO_IM
 void tst_qdeclarativetextedit::geometrySignals()
 {
     QDeclarativeComponent component(&engine, SRCDIR "/data/geometrySignals.qml");
@@ -2484,6 +2490,7 @@ void tst_qdeclarativetextedit::testQtQuick11Attributes_data()
         << ":1 \"TextEdit.onLinkActivated\" is not available in QtQuick 1.0.\n";
 }
 
+#ifndef QT_NO_IM
 void tst_qdeclarativetextedit::preeditMicroFocus()
 {
     QString preeditText = "super";
@@ -2710,6 +2717,7 @@ void tst_qdeclarativetextedit::inputMethodComposing()
     QCOMPARE(edit.isInputMethodComposing(), false);
     QCOMPARE(spy.count(), 2);
 }
+#endif // QT_NO_IM
 
 void tst_qdeclarativetextedit::cursorRectangleSize()
 {
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index c0e96db256..5305ed0d51 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -116,8 +116,9 @@ private slots:
     void maxLength();
     void masks();
     void validators();
+#ifndef QT_NO_IM
     void inputMethods();
-
+#endif
     void passwordCharacter();
     void cursorDelegate();
     void cursorVisible();
@@ -129,8 +130,10 @@ private slots:
     void canPaste();
     void readOnly();
 
+#ifndef QT_NO_IM
     void openInputPanelOnClick();
     void openInputPanelOnFocus();
+#endif
     void setHAlignClearCache();
     void focusOutClearSelection();
 
@@ -142,10 +145,12 @@ private slots:
     void testQtQuick11Attributes();
     void testQtQuick11Attributes_data();
 
+#ifndef QT_NO_IM
     void preeditAutoScroll();
     void preeditMicroFocus();
     void inputContextMouseHandler();
     void inputMethodComposing();
+#endif
     void cursorRectangleSize();
     void deselect();
 
@@ -1521,6 +1526,7 @@ void tst_qdeclarativetextinput::validators()
     delete canvas;
 }
 
+#ifndef QT_NO_IM
 void tst_qdeclarativetextinput::inputMethods()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethods.qml");
@@ -1569,6 +1575,7 @@ void tst_qdeclarativetextinput::inputMethods()
 
     delete canvas;
 }
+#endif // QT_NO_IM
 
 /*
 TextInput element should only handle left/right keys until the cursor reaches
@@ -2155,6 +2162,8 @@ QDeclarativeView *tst_qdeclarativetextinput::createView(const QString &filename)
 
     return canvas;
 }
+
+#ifndef QT_NO_IM
 class MyInputContext : public QInputContext
 {
 public:
@@ -2389,6 +2398,7 @@ void tst_qdeclarativetextinput::openInputPanelOnFocus()
     QVERIFY(view.inputContext() == 0);
     QVERIFY(!view.testAttribute(Qt::WA_InputMethodEnabled));
 }
+#endif // QT_NO_IM
 
 class MyTextInput : public QDeclarativeTextInput
 {
@@ -2497,6 +2507,7 @@ void tst_qdeclarativetextinput::testQtQuick11Attributes_data()
         << "";
 }
 
+#ifndef QT_NO_IM
 void tst_qdeclarativetextinput::preeditAutoScroll()
 {
     QString committedText = "super";
@@ -2807,6 +2818,7 @@ void tst_qdeclarativetextinput::inputMethodComposing()
     QCOMPARE(input.isInputMethodComposing(), false);
     QCOMPARE(spy.count(), 2);
 }
+#endif // QT_NO_IM
 
 void tst_qdeclarativetextinput::cursorRectangleSize()
 {