Merge lp:~zsombi/ubuntu-ui-toolkit/im-detection-fix into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Ignore QT_IM_MODULE values like ibus, none or compose.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1315
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1201/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6456/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/1034/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1033/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/1033/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7708/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1201/rebuild

review: Needs Fixing (continuous-integration)

[lp:~zsombi/ubuntu-ui-toolkit/im-detection-fix]

1316. By Zsombor Egri on 2014-11-05

missing .pro file added

[Timo Jyrinki (timo-jyrinki)]

Looking good!!

https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-002/+sourcepub/4552364/+listing-archive-extra

i386 passed already, I'd expect amd64 and armhf to successfully finish as well.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1316
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1202/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6466
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-amd64-ci/1035
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1034
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-armhf-ci/1034/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-utopic-i386-ci/1034
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6064
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7718
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7718/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15456

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1202/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.cpp'
--- modules/Ubuntu/Components/plugin/quickutils.cpp	2014-08-12 10:58:30 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.cpp	2014-11-05 07:48:25 +0000
@@ -35,6 +35,7 @@
     m_rootView(0)
 {
     QGuiApplication::instance()->installEventFilter(this);
+    m_omitIM << "ibus" << "none" << "compose";
 }
 
 /*!
@@ -107,7 +108,9 @@
 
 QString QuickUtils::inputMethodProvider() const
 {
-    return QString(getenv("QT_IM_MODULE"));
+    QString im(getenv("QT_IM_MODULE"));
+
+    return m_omitIM.contains(im) ? QString() : im;
 }
 
 bool QuickUtils::touchScreenAvailable() const

=== modified file 'modules/Ubuntu/Components/plugin/quickutils.h'
--- modules/Ubuntu/Components/plugin/quickutils.h	2014-06-10 11:47:09 +0000
+++ modules/Ubuntu/Components/plugin/quickutils.h	2014-11-05 07:48:25 +0000
@@ -58,6 +58,7 @@
 private:
     explicit QuickUtils(QObject *parent = 0);
     QPointer<QQuickView> m_rootView;
+    QStringList m_omitIM;
 
     void lookupQuickView();
 };

=== added directory 'tests/unit/tst_quickutils'
=== added file 'tests/unit/tst_quickutils/tst_quickutils.cpp'
--- tests/unit/tst_quickutils/tst_quickutils.cpp	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_quickutils/tst_quickutils.cpp	2014-11-05 07:48:25 +0000
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#include "uctestcase.h"
+#include "quickutils.h"
+
+class tst_QuickUtils : public QObject
+{
+    Q_OBJECT
+public:
+    tst_QuickUtils() {}
+
+private:
+    QString imEnvVar;
+
+private Q_SLOTS:
+    void initTestCase()
+    {
+        imEnvVar = qgetenv("QT_IM_MODULE");
+        QuickUtils::instance();
+    }
+    void cleanupTestCase()
+    {
+        qputenv("QT_IM_MODULE", imEnvVar.toLocal8Bit());
+    }
+
+    void test_inputmethod_data()
+    {
+        QTest::addColumn<QByteArray>("envVar");
+
+        QTest::newRow("(empty)") << QByteArray("");
+        QTest::newRow("ibus") << QByteArray("ibus");
+        QTest::newRow("compose") << QByteArray("compose");
+        QTest::newRow("none") << QByteArray("none");
+    }
+    void test_inputmethod()
+    {
+        QFETCH(QByteArray, envVar);
+        qputenv("QT_IM_MODULE", envVar);
+        QVERIFY(QuickUtils::instance().inputMethodProvider().isEmpty());
+    }
+};
+
+QTEST_MAIN(tst_QuickUtils)
+
+#include "tst_quickutils.moc"

=== added file 'tests/unit/tst_quickutils/tst_quickutils.pro'
--- tests/unit/tst_quickutils/tst_quickutils.pro	1970-01-01 00:00:00 +0000
+++ tests/unit/tst_quickutils/tst_quickutils.pro	2014-11-05 07:48:25 +0000
@@ -0,0 +1,2 @@
+include(../test-include.pri)
+SOURCES += tst_quickutils.cpp

=== modified file 'tests/unit/unit.pro'
--- tests/unit/unit.pro	2014-06-09 08:26:24 +0000
+++ tests/unit/unit.pro	2014-11-05 07:48:25 +0000
@@ -23,4 +23,5 @@
     tst_arguments \
     tst_argument \
     tst_alarms \
-    tst_theme
+    tst_theme \
+    tst_quickutils