5 files changed, 8 insertions, 13 deletions
diff --git a/src/widgets/styles/qcommonstylepixmaps_p.h b/src/widgets/styles/qcommonstylepixmaps_p.h
index 471903e927..8075256158 100644
--- a/src/widgets/styles/qcommonstylepixmaps_p.h
+++ b/src/widgets/styles/qcommonstylepixmaps_p.h
@@ -348,7 +348,7 @@ static const char * const qt_unshade_xpm[] = {
 "..........",
 ".........."};
 
-static const char * dock_widget_close_xpm[] = {
+static const char * const dock_widget_close_xpm[] = {
 "8 8 2 1",
 "# c #000000",
 ". c None",
diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 862a4302f3..1849331b79 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -2368,8 +2368,8 @@ QDebug operator<<(QDebug debug, QStyle::State state)
     return operator<< <QStyle::StateFlag>(debug, state);
 #    else
     Q_UNUSED(state);
-#    endif
     return debug;
+#    endif
 }
 #  endif // !QT_NO_DEBUG_STREAM
 #endif // QT_VERSION < QT_VERSION_CHECK(6,0,0)
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 86b5632d2e..40b8aaae9a 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -586,7 +586,7 @@ public:
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////
-static const char *knownStyleHints[] = {
+static const char *const knownStyleHints[] = {
     "activate-on-singleclick",
     "alignment",
     "arrow-keys-navigate-into-children",
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
index 40597a41f3..db8a649931 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -299,8 +299,8 @@ void QWindowsStyle::polish(QPalette &pal)
 
 int QWindowsStylePrivate::pixelMetricFromSystemDp(QStyle::PixelMetric pm, const QStyleOption *, const QWidget *widget)
 {
-    switch (pm) {
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
+    switch (pm) {
     case QStyle::PM_DockWidgetFrameWidth:
 #  ifndef Q_OS_WINCE
         return GetSystemMetrics(SM_CXFRAME);
@@ -337,13 +337,14 @@ int QWindowsStylePrivate::pixelMetricFromSystemDp(QStyle::PixelMetric pm, const
 #  else
         return GetSystemMetrics(SM_CYDLGFRAME);
 #  endif
-#else
-    Q_UNUSED(widget)
-#endif // Q_OS_WIN
 
     default:
         break;
     }
+#else // Q_OS_WIN && !Q_OS_WINRT
+    Q_UNUSED(pm);
+    Q_UNUSED(widget);
+#endif
     return QWindowsStylePrivate::InvalidMetric;
 }
 
diff --git a/src/widgets/styles/qwindowsvistastyle.cpp b/src/widgets/styles/qwindowsvistastyle.cpp
index f715d93298..daa8ab12a9 100644
--- a/src/widgets/styles/qwindowsvistastyle.cpp
+++ b/src/widgets/styles/qwindowsvistastyle.cpp
@@ -250,8 +250,6 @@ void QWindowsVistaStyle::drawPrimitive(PrimitiveElement element, const QStyleOpt
 
     int state = option->state;
     if (!QWindowsVistaStylePrivate::useVista()) {
-        foreach (const QObject *target, d->animationTargets())
-            d->stopAnimation(target);
         QWindowsStyle::drawPrimitive(element, option, painter, widget);
         return;
     }
@@ -810,8 +808,6 @@ void QWindowsVistaStyle::drawControl(ControlElement element, const QStyleOption
     QWindowsVistaStylePrivate *d = const_cast<QWindowsVistaStylePrivate*>(d_func());
 
     if (!QWindowsVistaStylePrivate::useVista()) {
-        foreach (const QObject *target, d->animationTargets())
-            d->stopAnimation(target);
         QWindowsStyle::drawControl(element, option, painter, widget);
         return;
     }
@@ -1494,8 +1490,6 @@ void QWindowsVistaStyle::drawComplexControl(ComplexControl control, const QStyle
 {
     QWindowsVistaStylePrivate *d = const_cast<QWindowsVistaStylePrivate*>(d_func());
     if (!QWindowsVistaStylePrivate::useVista()) {
-        foreach (const QObject *target, d->animationTargets())
-            d->stopAnimation(target);
         QWindowsStyle::drawComplexControl(control, option, painter, widget);
         return;
     }