QStylePainter belongs in QtWidgets

Move it into the styles/ directory that will end up
in the QtWidgets library

src/gui/painting/painting.pri

@@ -35,7 +35,6 @@ HEADERS += \
         painting/qrasterizer_p.h \
         painting/qregion.h \
         painting/qstroker_p.h \
-        painting/qstylepainter.h \
         painting/qtessellator_p.h \
         painting/qtextureglyphcache_p.h \
         painting/qtransform.h \
@@ -72,7 +71,6 @@ SOURCES += \
         painting/qrasterizer.cpp \
         painting/qregion.cpp \
         painting/qstroker.cpp \
-        painting/qstylepainter.cpp \
         painting/qtessellator.cpp \
         painting/qtextureglyphcache.cpp \
         painting/qtransform.cpp \

src/gui/styles/styles.pri

@@ -10,7 +10,8 @@ HEADERS += \
 	styles/qstylehelper_p.h \
 	styles/qproxystyle.h \
 	styles/qproxystyle_p.h \
-	styles/qstylesheetstyle_p.h
+        styles/qstylepainter.h \
+        styles/qstylesheetstyle_p.h
 
 SOURCES += \
 	styles/qstyle.cpp \
@@ -20,6 +21,7 @@ SOURCES += \
 	styles/qstylehelper.cpp \
 	styles/qcommonstyle.cpp \
 	styles/qproxystyle.cpp \
+        styles/qstylepainter.cpp \
         styles/qstylesheetstyle.cpp \
         styles/qstylesheetstyle_default.cpp