summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@nokia.com>2011-09-08 22:09:33 +0200
committerLars Knoll <lars.knoll@nokia.com>2011-09-08 22:12:46 +0200
commit970df646691f1fd1f710156af7ddf10abd72df07 (patch)
tree660758c46ab3346c17d0e9f5c27175b3056d0397 /src/gui
parent2cdd7886bf424a4986cfa1e08462cf9689c4c3d3 (diff)
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>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/kernel/qplatforminputcontext_qpa.cpp5
-rw-r--r--src/gui/kernel/qplatforminputcontext_qpa.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp
index 328d4f5b74..6482d4a34a 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.cpp
+++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp
@@ -52,6 +52,11 @@ QPlatformInputContext::~QPlatformInputContext()
{
}
+bool QPlatformInputContext::isValid() const
+{
+ return false;
+}
+
void QPlatformInputContext::reset()
{
}
diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h
index 804200708a..35763edf13 100644
--- a/src/gui/kernel/qplatforminputcontext_qpa.h
+++ b/src/gui/kernel/qplatforminputcontext_qpa.h
@@ -60,6 +60,8 @@ public:
QPlatformInputContext();
virtual ~QPlatformInputContext();
+ virtual bool isValid() const;
+
virtual void reset();
virtual void commit();
virtual void update(Qt::InputMethodQueries);