diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-09-08 17:22:55 +0300 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-09-08 21:40:40 +0200 |
| commit | 8be11227100498d7098eb7f39bbbe1e7ac6b01cf (patch) | |
| tree | 27a7b596fd69e014a8e4736fb9fd9d037603d643 /src/gui/kernel | |
| parent | 7ad91ad9ca89d868d59a1fcff85349cc9786f99a (diff) | |
Add plugin mechanism to load platform input contexts
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>
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qguiapplication_p.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qinputpanel.cpp | 1 | ||||
| -rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.h | 3 |
3 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 9f64911399..97cf7d371e 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -59,8 +59,6 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class QPlatformIntegration; - class Q_GUI_EXPORT QGuiApplicationPrivate : public QCoreApplicationPrivate { Q_DECLARE_PUBLIC(QGuiApplication) diff --git a/src/gui/kernel/qinputpanel.cpp b/src/gui/kernel/qinputpanel.cpp index 233ac93cb8..b6160dc71a 100644 --- a/src/gui/kernel/qinputpanel.cpp +++ b/src/gui/kernel/qinputpanel.cpp @@ -53,7 +53,6 @@ QInputPanel::~QInputPanel() { } - QObject *QInputPanel::inputItem() const { Q_D(const QInputPanel); diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h index 1720e634c7..804200708a 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.h +++ b/src/gui/kernel/qplatforminputcontext_qpa.h @@ -53,8 +53,9 @@ QT_MODULE(Gui) class QWindow; class QMouseEvent; -class Q_GUI_EXPORT QPlatformInputContext +class Q_GUI_EXPORT QPlatformInputContext : public QObject { + Q_OBJECT public: QPlatformInputContext(); virtual ~QPlatformInputContext(); |