diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-26 20:02:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-06 22:11:33 +0000 |
| commit | d6d33f0b80dd85043c71f71a3ed5485d6014e6c4 (patch) | |
| tree | 69e56ae26c27185dc4449a7a974d33e882911975 /src/widgets/widgets | |
| parent | 4715ca7bc54fc1f30dd7e603a396c876d667c92c (diff) | |
QtWidgets: mark obsolete functions as deprecated
Mark some long obsolete functions as deprecated so the can be removed
with Qt6:
- QLayout::margin()/setMargin()
- QComboBox::autoCompletion()/setAutoCompletion()
- QComboBox::autoCompletionCaseSensitivity()
- QComboBox::setAutoCompletionCaseSensitivity()
- QTextStream& operator<<(QTextStream&, const QSplitter&)
- QTextStream& operator>>(QTextStream&, QSplitter&);
Change-Id: Ic16b36bf647413b5b3ea2d9105981b95370b3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qcombobox.h | 4 | ||||
| -rw-r--r-- | src/widgets/widgets/qsplitter.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qsplitter.h | 4 |
4 files changed, 12 insertions, 0 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 2f67a9202c..2c478f364d 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -1483,6 +1483,7 @@ int QComboBox::maxCount() const } #if QT_CONFIG(completer) +#if QT_DEPRECATED_SINCE(5, 13) /*! \property QComboBox::autoCompletion @@ -1576,6 +1577,7 @@ void QComboBox::setAutoCompletionCaseSensitivity(Qt::CaseSensitivity sensitivity if (d->lineEdit && d->lineEdit->completer()) d->lineEdit->completer()->setCaseSensitivity(sensitivity); } +#endif // QT_DEPRECATED_SINCE(5, 13) #endif // QT_CONFIG(completer) diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index 671c883584..542a3bd3b9 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -73,8 +73,10 @@ class Q_WIDGETS_EXPORT QComboBox : public QWidget Q_PROPERTY(QSize iconSize READ iconSize WRITE setIconSize) #if QT_CONFIG(completer) +#if QT_DEPRECATED_SINCE(5, 13) Q_PROPERTY(bool autoCompletion READ autoCompletion WRITE setAutoCompletion DESIGNABLE false) Q_PROPERTY(Qt::CaseSensitivity autoCompletionCaseSensitivity READ autoCompletionCaseSensitivity WRITE setAutoCompletionCaseSensitivity DESIGNABLE false) +#endif #endif // QT_CONFIG(completer) Q_PROPERTY(bool duplicatesEnabled READ duplicatesEnabled WRITE setDuplicatesEnabled) @@ -93,12 +95,14 @@ public: int maxCount() const; #if QT_CONFIG(completer) +#if QT_DEPRECATED_SINCE(5, 13) bool autoCompletion() const; void setAutoCompletion(bool enable); Qt::CaseSensitivity autoCompletionCaseSensitivity() const; void setAutoCompletionCaseSensitivity(Qt::CaseSensitivity sensitivity); #endif +#endif bool duplicatesEnabled() const; void setDuplicatesEnabled(bool enable); diff --git a/src/widgets/widgets/qsplitter.cpp b/src/widgets/widgets/qsplitter.cpp index 9e38c8f18a..0b90714363 100644 --- a/src/widgets/widgets/qsplitter.cpp +++ b/src/widgets/widgets/qsplitter.cpp @@ -1783,6 +1783,7 @@ void QSplitter::setStretchFactor(int index, int stretch) } +#if QT_DEPRECATED_SINCE(5, 13) /*! \relates QSplitter \obsolete @@ -1813,6 +1814,7 @@ QTextStream& operator>>(QTextStream& ts, QSplitter& splitter) splitter.restoreState(std::move(line).toLatin1()); return ts; } +#endif QT_END_NAMESPACE diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index 16fac48d1c..ec980d9ee3 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -129,8 +129,12 @@ private: friend class QSplitterHandle; }; +#if QT_DEPRECATED_SINCE(5, 13) +QT_DEPRECATED_X("Use QSplitter::saveState() instead") Q_WIDGETS_EXPORT QTextStream& operator<<(QTextStream&, const QSplitter&); +QT_DEPRECATED_X("Use QSplitter::restoreState() instead") Q_WIDGETS_EXPORT QTextStream& operator>>(QTextStream&, QSplitter&); +#endif class QSplitterHandlePrivate; class Q_WIDGETS_EXPORT QSplitterHandle : public QWidget |