diff options
Diffstat (limited to 'src/quicknativestyle/qstyle/qquickstyleoption.h')
| -rw-r--r-- | src/quicknativestyle/qstyle/qquickstyleoption.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/quicknativestyle/qstyle/qquickstyleoption.h b/src/quicknativestyle/qstyle/qquickstyleoption.h index e7770cc277..ed430baaca 100644 --- a/src/quicknativestyle/qstyle/qquickstyleoption.h +++ b/src/quicknativestyle/qstyle/qquickstyleoption.h @@ -9,11 +9,15 @@ #include <QtCore/qlocale.h> #include <QtCore/qvariant.h> #include <QtCore/qdebug.h> -#include <QtCore/qabstractitemmodel.h> #include <QtGui/qicon.h> #include <QtGui/qfontmetrics.h> +#include <QtQuick/private/qtquick-config_p.h> +#if QT_CONFIG(quick_itemview) +#include <QtCore/qabstractitemmodel.h> +#endif + QT_BEGIN_NAMESPACE class QQuickItem; @@ -35,7 +39,6 @@ public: SO_CustomBase = 0xf00, SO_ComplexCustomBase = 0xf000000 }; - Q_ENUMS(OptionType) enum StyleOptionType { Type = SO_Default }; enum StyleOptionVersion { Version = 1 }; @@ -376,6 +379,7 @@ protected: Q_DECL_DEPRECATED typedef QStyleOptionDockWidget QStyleOptionDockWidgetV2; +#if QT_CONFIG(quick_itemview) class QStyleOptionViewItem : public QStyleOption { public: @@ -429,6 +433,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionViewItem::ViewItemFeatures) Q_DECL_DEPRECATED typedef QStyleOptionViewItem QStyleOptionViewItemV2; Q_DECL_DEPRECATED typedef QStyleOptionViewItem QStyleOptionViewItemV3; Q_DECL_DEPRECATED typedef QStyleOptionViewItem QStyleOptionViewItemV4; +#endif // QT_CONFIG(quick_itemview) class QStyleOptionToolBox : public QStyleOption { @@ -514,6 +519,8 @@ public: int pageStep; qreal notchTarget; bool dialWrapping; + qreal startAngle; + qreal endAngle; QStyleOptionSlider(); QStyleOptionSlider(const QStyleOptionSlider &other) : QStyleOptionComplex(Version, Type) { *this = other; } |