From 57614bc6719c9e63e53ad0a484c554852ebff5f4 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Fri, 5 Feb 2021 15:35:15 +0100 Subject: Fix namespaced Qt build Pick-to: 6.1 Change-Id: I688bdd73c939304f572d0e162e7aa09499bf737f Reviewed-by: Mitch Curtis --- src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp b/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp index ea062a2e..d8cf7f32 100644 --- a/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp +++ b/src/imports/nativestyle/qstyle/windows/qquickwindowsstyle.cpp @@ -70,8 +70,6 @@ QT_BEGIN_NAMESPACE -namespace QQC2 { - #if defined(Q_OS_WIN) QT_BEGIN_INCLUDE_NAMESPACE @@ -91,6 +89,8 @@ QT_BEGIN_INCLUDE_NAMESPACE #include QT_END_INCLUDE_NAMESPACE +namespace QQC2 { + enum QSliderDirection { SlUp, SlDown, SlLeft, SlRight }; /* @@ -2378,7 +2378,7 @@ QIcon QWindowsStyle::standardIcon(StandardPixmap standardIcon, const QStyleOptio return QCommonStyle::standardIcon(standardIcon, option); } -} //namespace QQC2 +} // namespace QQC2 QT_END_NAMESPACE -- cgit v1.2.3