diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-30 14:26:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 11:14:09 +0200 |
| commit | 36b3a6ad3818b6c8d0849d5e5d63de22c2a2a430 (patch) | |
| tree | 209a6267ce8ca7a05ae5f9a46b37e6c8255cfbc9 /src/gui/kernel/qguiapplication.cpp | |
| parent | bcd477e0bc48bb028193d7707d1ecfbd61b5bdc1 (diff) | |
Fix compilation of public headers with QT_NO_DEPRECATED defined
Put the functions in QT_DEPRECATED_SINCE if possible
QPluginLoader::staticInstances is not documented as deprecated, and do
not reference any alternative use. So I unmarked it as deprecated.
Change-Id: I556c3f3657fb0490dd5543fcc56718fe9bd394e7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 91c2a9d99b..e7c2b60305 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -2163,18 +2163,17 @@ QInputMethod *QGuiApplication::inputMethod() const } /*! + \fn QInputPanel *QGuiApplication::inputPanel() const returns the input panel. The input panel returns properties about the state and position of the virtual keyboard. It also provides information about the position of the current focused input element. - \sa QInputPanel + \obsolete + + \sa inputMethod() */ -QInputPanel *QGuiApplication::inputPanel() const -{ - return inputMethod(); -} /*! \fn void QGuiApplication::fontDatabaseChanged() |