diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-04-04 23:01:17 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2019-04-04 23:01:17 +0000 |
| commit | ed485243b594a730cebee4d76847e0f556d369f4 (patch) | |
| tree | 545dd98a3138782df786f742cac02bc63113eaf6 /src/widgets/dialogs | |
| parent | 8d7c97d428cdf89c3419a4e13b62a9849feefce9 (diff) | |
| parent | eb606d85b3f1548445cfd1fee43f882da88fb6e7 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qdialog.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index ce57ce5de7..ce2194a1de 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -70,10 +70,10 @@ public: void setVisible(bool visible) override; #if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED void setOrientation(Qt::Orientation orientation); - QT_DEPRECATED Qt::Orientation orientation() const; - QT_DEPRECATED void setExtension(QWidget* extension); - QT_DEPRECATED QWidget* extension() const; + QT_DEPRECATED_X("Use show/hide on the affected widget instead") void setOrientation(Qt::Orientation orientation); + QT_DEPRECATED_X("Use show/hide on the affected widget instead") Qt::Orientation orientation() const; + QT_DEPRECATED_X("Use show/hide on the affected widget instead") void setExtension(QWidget* extension); + QT_DEPRECATED_X("Use show/hide on the affected widget instead") QWidget* extension() const; #endif QSize sizeHint() const override; @@ -98,7 +98,7 @@ public Q_SLOTS: virtual void reject(); #if QT_DEPRECATED_SINCE(5, 13) - QT_DEPRECATED void showExtension(bool); + QT_DEPRECATED_X("Use show/hide on the affected widget instead") void showExtension(bool); #endif protected: |