diff options
| author | Pekka Vuorela <pvuorela@iki.fi> | 2012-08-21 14:19:47 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-23 11:20:37 +0200 |
| commit | 2292bf06693c683ba353bcbea6ab9bd1209044ea (patch) | |
| tree | 897c4d627f8123357637c6017b5633b22591d04e /src/gui/kernel/qguiapplication.h | |
| parent | b6f92043e054ca348bf82555d7f0bb5ed44af66c (diff) | |
Remove remaining bits of deprecated QInputPanel
Introduced during Qt5 development and renamed to QInputMethod.
Change-Id: If6744648dc98b779e65c449ae32626db574181df
Reviewed-by: Joona Petrell <joona.petrell@gmail.com>
Diffstat (limited to 'src/gui/kernel/qguiapplication.h')
| -rw-r--r-- | src/gui/kernel/qguiapplication.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index e171f81418..9d90cde993 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -44,7 +44,7 @@ #include <QtCore/qcoreapplication.h> #include <QtGui/qwindowdefs.h> -#include <QtGui/qinputpanel.h> +#include <QtGui/qinputmethod.h> #include <QtCore/qlocale.h> #include <QtCore/qpoint.h> #include <QtCore/qsize.h> @@ -131,9 +131,6 @@ public: static void setDesktopSettingsAware(bool on); static bool desktopSettingsAware(); -#if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED QInputPanel *inputPanel() const { return inputMethod(); } -#endif static QInputMethod *inputMethod(); static QPlatformNativeInterface *platformNativeInterface(); |