diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-05 13:29:52 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-05 13:39:39 +0200 |
| commit | f9d612352b60ab82ad4d5ec731c01053ceaf915b (patch) | |
| tree | d672df00b505c2fe50d18cd07196c27d9453b28f | |
| parent | e9f63420c1a9fbc92f2f2fdd1f3c4bb80be7bd63 (diff) | |
Fix build after qtbase changes
93dad2bf91d414a41c6e2c7db6c75171b4917d4d requires adaptation on
declarations.
Note the declarations should probably end up removed for Qt6.
Change-Id: I8aef41f9be32374506212a953aceecd1ddc75eae
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| -rw-r--r-- | src/imports/nativestyle/qstyle/qquickstyleoption.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/imports/nativestyle/qstyle/qquickstyleoption.h b/src/imports/nativestyle/qstyle/qquickstyleoption.h index c41f557c..05c9ce57 100644 --- a/src/imports/nativestyle/qstyle/qquickstyleoption.h +++ b/src/imports/nativestyle/qstyle/qquickstyleoption.h @@ -152,8 +152,8 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionFrame::FrameFeatures) -typedef Q_DECL_DEPRECATED QStyleOptionFrame QStyleOptionFrameV2; -typedef Q_DECL_DEPRECATED QStyleOptionFrame QStyleOptionFrameV3; +Q_DECL_DEPRECATED typedef QStyleOptionFrame QStyleOptionFrameV2; +Q_DECL_DEPRECATED typedef QStyleOptionFrame QStyleOptionFrameV3; class QStyleOptionTab : public QStyleOption { @@ -217,7 +217,7 @@ protected: QStyleOptionTabWidgetFrame(int version); }; -typedef Q_DECL_DEPRECATED QStyleOptionTabWidgetFrame QStyleOptionTabWidgetFrameV2; +Q_DECL_DEPRECATED typedef QStyleOptionTabWidgetFrame QStyleOptionTabWidgetFrameV2; class QStyleOptionTabBarBase : public QStyleOption @@ -304,8 +304,8 @@ public: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionTab::CornerWidgets) -typedef Q_DECL_DEPRECATED QStyleOptionTab QStyleOptionTabV2; -typedef Q_DECL_DEPRECATED QStyleOptionTab QStyleOptionTabV3; +Q_DECL_DEPRECATED typedef QStyleOptionTab QStyleOptionTabV2; +Q_DECL_DEPRECATED typedef QStyleOptionTab QStyleOptionTabV3; class QStyleOptionToolBar : public QStyleOption @@ -406,7 +406,7 @@ protected: QStyleOptionDockWidget(int version); }; -typedef Q_DECL_DEPRECATED QStyleOptionDockWidget QStyleOptionDockWidgetV2; +Q_DECL_DEPRECATED typedef QStyleOptionDockWidget QStyleOptionDockWidgetV2; class QStyleOptionViewItem : public QStyleOption { @@ -458,9 +458,9 @@ protected: Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionViewItem::ViewItemFeatures) -typedef Q_DECL_DEPRECATED QStyleOptionViewItem QStyleOptionViewItemV2; -typedef Q_DECL_DEPRECATED QStyleOptionViewItem QStyleOptionViewItemV3; -typedef Q_DECL_DEPRECATED QStyleOptionViewItem QStyleOptionViewItemV4; +Q_DECL_DEPRECATED typedef QStyleOptionViewItem QStyleOptionViewItemV2; +Q_DECL_DEPRECATED typedef QStyleOptionViewItem QStyleOptionViewItemV3; +Q_DECL_DEPRECATED typedef QStyleOptionViewItem QStyleOptionViewItemV4; class QStyleOptionToolBox : public QStyleOption { @@ -485,7 +485,7 @@ protected: QStyleOptionToolBox(int version); }; -typedef Q_DECL_DEPRECATED QStyleOptionToolBox QStyleOptionToolBoxV2; +Q_DECL_DEPRECATED typedef QStyleOptionToolBox QStyleOptionToolBoxV2; class QStyleOptionRubberBand : public QStyleOption { |