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/qevent.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/qevent.cpp')
| -rw-r--r-- | src/gui/kernel/qevent.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp index 52f040e0b2..7ac5538d6e 100644 --- a/src/gui/kernel/qevent.cpp +++ b/src/gui/kernel/qevent.cpp @@ -1672,16 +1672,13 @@ void QInputMethodEvent::setCommitString(const QString &commitString, int replace } /*! - Sets the tentative commit string to \a tentativeCommitString. + \fn void QInputMethodEvent::setTentativeCommitString(const QString &string) + Sets the tentative commit string to \a string. The tentative commit string is what the preedit string is expected to be committed as. The string can be used within the editor to trigger code that reacts on text changes such as validators. \deprecated */ -void QInputMethodEvent::setTentativeCommitString(const QString &tentativeCommitString) -{ - tentativeCommit = tentativeCommitString; -} /*! \fn const QList<Attribute> &QInputMethodEvent::attributes() const |