diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-14 12:26:07 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-08-16 15:03:46 +0200 |
| commit | e1536e3a86de1dfb834eaba4dddd4a148e6911f9 (patch) | |
| tree | 9c1dda65662a41ac6e8aee9515ac268484d6d5bc | |
| parent | 5076ce54be86081ed7f7d36b64e880a2c12c51b2 (diff) | |
Purge versioned style options from UIC
For Qt 6.0, all versioned style option types have been merged into the base
class, and version number has been reset to 1.
Task-number: QTBUG-84221
Change-Id: If729720813c0cf284271a9084311ed6eb820ecca
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
| -rw-r--r-- | src/tools/uic/qclass_lib_map.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h index c0862a9c02..22dd9105da 100644 --- a/src/tools/uic/qclass_lib_map.h +++ b/src/tools/uic/qclass_lib_map.h @@ -783,29 +783,17 @@ QT_CLASS_LIB(QStyleFactory, QtWidgets, qstylefactory.h) QT_CLASS_LIB(QStyleOption, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionFocusRect, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionFrame, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionFrameV2, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionFrameV3, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionTabWidgetFrame, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionTabWidgetFrameV2, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionTabBarBase, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionTabBarBaseV2, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionHeader, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionButton, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionTab, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionTabV2, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionTabV3, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionToolBar, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionProgressBar, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionProgressBarV2, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionMenuItem, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionDockWidget, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionDockWidgetV2, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionViewItem, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionViewItemV2, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionViewItemV3, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionViewItemV4, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionToolBox, QtWidgets, qstyleoption.h) -QT_CLASS_LIB(QStyleOptionToolBoxV2, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionRubberBand, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionComplex, QtWidgets, qstyleoption.h) QT_CLASS_LIB(QStyleOptionSlider, QtWidgets, qstyleoption.h) |