diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-15 16:25:58 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-09-15 17:44:56 +0200 |
| commit | 7199b7f73087a0e2501baacb7de76164684f5dfe (patch) | |
| tree | 6802acc43e02a390493fbad764a4e0699c2d626b /src/imports/nativestyle/qstyle | |
| parent | 82f19b9d594e26a9538f2135eb0fcfa357f4c693 (diff) | |
Fix build after qtbase changes
Change-Id: I240b7410a409bb2f72213c02f50870f4ed99db9a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/imports/nativestyle/qstyle')
| -rw-r--r-- | src/imports/nativestyle/qstyle/mac/qquickmacstyle_mac.mm | 2 | ||||
| -rw-r--r-- | src/imports/nativestyle/qstyle/qquickcommonstyle.cpp | 2 | ||||
| -rw-r--r-- | src/imports/nativestyle/qstyle/qquickcommonstyle_p.h | 1 |
3 files changed, 2 insertions, 3 deletions
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 { |