diff options
| author | Pekka Vuorela <pekka.ta.vuorela@nokia.com> | 2012-01-24 17:44:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-02 11:10:04 +0100 |
| commit | 71726ccf676ef0921ef557c7162d2d87563066fb (patch) | |
| tree | 5c6095908fcc9bb37fb3716cdc430aad5de5aab1 /src/gui/kernel/qguiapplication.h | |
| parent | b2b3abe0ebc0ca147e1a29d06d1872bc09bf16cc (diff) | |
Renamed QInputPanel as QInputMethod
QInputMethod better describes what the class is about, input methods
in general, be they panels or just composing input from key events.
Compatability headers added for old name. Not bulletproof but should be
enough to get transition done.
Change-Id: Iefde6e7ccb1ec4a3b226cef3469089e751c60fc1
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Diffstat (limited to 'src/gui/kernel/qguiapplication.h')
| -rw-r--r-- | src/gui/kernel/qguiapplication.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index 9bf6a69c45..75046d8767 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -44,6 +44,7 @@ #include <QtCore/qcoreapplication.h> #include <QtGui/qwindowdefs.h> +#include <QtGui/qinputpanel.h> #include <QtCore/qlocale.h> #include <QtCore/qpoint.h> #include <QtCore/qsize.h> @@ -58,7 +59,6 @@ class QPlatformNativeInterface; class QPalette; class QScreen; class QStyleHints; -class QInputPanel; #if defined(qApp) #undef qApp @@ -121,7 +121,8 @@ public: static inline bool isLeftToRight() { return layoutDirection() == Qt::LeftToRight; } QStyleHints *styleHints() const; - QInputPanel *inputPanel() const; + QT_DEPRECATED QInputPanel *inputPanel() const; + QInputMethod *inputMethod() const; static QPlatformNativeInterface *platformNativeInterface(); |