diff options
Diffstat (limited to 'src/imports')
4 files changed, 3 insertions, 5 deletions
diff --git a/src/imports/controls/fusion/qquickfusionstyle_p.h b/src/imports/controls/fusion/qquickfusionstyle_p.h index 4655fd3d..c609e9c6 100644 --- a/src/imports/controls/fusion/qquickfusionstyle_p.h +++ b/src/imports/controls/fusion/qquickfusionstyle_p.h @@ -51,11 +51,10 @@ #include <QtCore/qobject.h> #include <QtGui/qcolor.h> #include <QtQml/qqml.h> +#include <QtQuick/private/qquickpalette_p.h> QT_BEGIN_NAMESPACE -class QQuickPalette; - class QQuickFusionStyle : public QObject { Q_OBJECT diff --git a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm b/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm index e61bdafa..bf638e8e 100644 --- a/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm +++ b/src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm @@ -2391,7 +2391,7 @@ int QMacStyle::styleHint(StyleHint sh, const QStyleOption *opt, QStyleHintReturn ret = true; break; case SH_Slider_AbsoluteSetButtons: - ret = Qt::LeftButton|Qt::MidButton; + ret = Qt::LeftButton|Qt::MiddleButton; break; case SH_Slider_PageSetButtons: ret = 0; diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp index d7b97f21..6e662e3d 100644 --- a/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp +++ b/src/imports/nativestyle/qstyle/qquickcommonstyle.cpp @@ -4724,7 +4724,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, QStyleHintRet ret = false; break; case SH_Slider_AbsoluteSetButtons: - ret = Qt::MidButton; + ret = Qt::MiddleButton; break; case SH_Slider_PageSetButtons: ret = Qt::LeftButton; diff --git a/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h b/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h index 2fed0cad..ba2b8689 100644 --- a/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h +++ b/src/imports/nativestyle/qstyle/qquickcommonstyle_p.h @@ -54,7 +54,6 @@ QT_BEGIN_NAMESPACE // We mean it. // -class QStringList; class QTextOption; namespace QQC2 { |