summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforminputcontexts
Commit message (Collapse)AuthorAgeFilesLines
* Fix missing/incorrect license headersJason McDonald2011-09-151-1/+1
| | | | | | | Change-Id: I9db33c63c951f288f7a106c3008771699662d104 Reviewed-on: http://codereview.qt-project.org/4852 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Don't build ibus when dbus is not availablePaul Olav Tvete2011-09-141-2/+2
| | | | | | | Change-Id: I0011cae034f186f239f486f5d83635bf4d11b88d Reviewed-on: http://codereview.qt-project.org/4879 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Windows: correctly disable ibus plugin on WindowsRohan McGovern2011-09-141-1/+1
| | | | | | | | | The correct qmake scope is `win32', not `win'. Change-Id: I148e764bbe94b6ca824a55458e080ca948dc304d Reviewed-on: http://codereview.qt-project.org/4844 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* don't build ibus plugin on windows/macGunnar Sletta2011-09-121-1/+1
| | | | | | | Change-Id: I932eaea19806e3ce75803cb2849d04292885fbd5 Reviewed-on: http://codereview.qt-project.org/4631 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Make inputcontext plugin loading a bit more genericLars Knoll2011-09-081-1/+1
| | | | | | | | | | | | | | 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>
* Fixup a few minor errors in the previous commitLars Knoll2011-09-081-2/+2
| | | | | | | | | | | Methods need to be Q_INVOKABLE to be able to call them with QMetaObject::invokeMethod(). Also use the correct return type. This makes the IBUS input context work again. Change-Id: If7ed6dd8fb99f3363c4ecebb98f889ed9eeeff00 Reviewed-on: http://codereview.qt-project.org/4486 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Add plugin mechanism to load platform input contextsJoona Petrell2011-09-0813-0/+1216
Change-Id: I6e74fd395325445420efce4adf13e89abe8177ee Reviewed-on: http://codereview.qt-project.org/4482 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>