Make inputcontext plugin loading a bit more generic

Add a create() method to the inputcontext factory that
takes no arguments.
Add a virtual isValid() to QPlatformInputContext to
determine whether it actually works.
Remove IBUS dependencies in the xcb code so that it
can also load other plugins.

Change-Id: I6345a845f48fd4b3cacf6d8652711b16835a235c
Reviewed-on: http://codereview.qt-project.org/4487
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

1 files changed, 29 insertions, 2 deletions

diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp
index 255ed71fe2..494431e624 100644
--- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp
+++ b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp
@@ -46,14 +46,13 @@
 
 #include "qguiapplication.h"
 #include "qdebug.h"
+#include <stdlib.h>
 
 QT_BEGIN_NAMESPACE
 
 #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QPlatformInputContextFactoryInterface_iid, QLatin1String("/platforminputcontexts"), Qt::CaseInsensitive))
-Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, directLoader,
-                          (QPlatformInputContextFactoryInterface_iid, QLatin1String(""), Qt::CaseInsensitive))
 #endif
 
 QStringList QPlatformInputContextFactory::keys()
@@ -79,5 +78,33 @@ QPlatformInputContext *QPlatformInputContextFactory::create(const QString& key)
     return ret;
 }
 
+QPlatformInputContext *QPlatformInputContextFactory::create()
+{
+    QPlatformInputContext *ic = 0;
+
+    QString icString = QString::fromLatin1(getenv("QT_IM_MODULE"));
+    ic = create(icString);
+    qDebug() << ic << ic->isValid();
+    if (ic && ic->isValid())
+        return ic;
+
+    delete ic;
+    ic = 0;
+
+    QStringList k = keys();
+    for (int i = 0; i < k.size(); ++i) {
+        if (k.at(i) == icString)
+            continue;
+        ic = create(k.at(i));
+        if (ic && ic->isValid())
+            return ic;
+        delete ic;
+        ic = 0;
+    }
+
+    return 0;
+}
+
+
 QT_END_NAMESPACE