1 files changed, 3 insertions, 75 deletions

diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index 13a9ba1c73..5379b6545e 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -7,9 +7,7 @@ HEADERS += \
         painting/qcolor_p.h \
         painting/qcolormap.h \
         painting/qcosmeticstroker_p.h \
-        painting/qdrawutil.h \
         painting/qemulationpaintengine_p.h \
-        painting/qgraphicssystem_p.h \
         painting/qmatrix.h \
         painting/qmemrotate_p.h \
         painting/qoutlinemapper_p.h \
@@ -30,8 +28,6 @@ HEADERS += \
         painting/qpolygon.h \
         painting/qpolygonclipper_p.h \
         painting/qprintengine.h \
-        painting/qprintengine_pdf_p.h \
-        painting/qprintengine_ps_p.h \
         painting/qprinter.h \
         painting/qprinter_p.h \
         painting/qprinterinfo.h \
@@ -39,12 +35,10 @@ 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 \
         painting/qwindowsurface_p.h \
-        painting/qwmatrix.h \
         painting/qpaintbuffer_p.h
 
 
@@ -56,9 +50,7 @@ SOURCES += \
         painting/qcolor_p.cpp \
         painting/qcosmeticstroker.cpp \
         painting/qcssutil.cpp \
-        painting/qdrawutil.cpp \
         painting/qemulationpaintengine.cpp \
-        painting/qgraphicssystem.cpp \
         painting/qmatrix.cpp \
         painting/qmemrotate.cpp \
         painting/qoutlinemapper.cpp \
@@ -74,13 +66,11 @@ SOURCES += \
         painting/qpen.cpp \
         painting/qpolygon.cpp \
         painting/qprintengine_pdf.cpp \
-        painting/qprintengine_ps.cpp \
         painting/qprinter.cpp \
         painting/qprinterinfo.cpp \
         painting/qrasterizer.cpp \
         painting/qregion.cpp \
         painting/qstroker.cpp \
-        painting/qstylepainter.cpp \
         painting/qtessellator.cpp \
         painting/qtextureglyphcache.cpp \
         painting/qtransform.cpp \
@@ -116,28 +106,6 @@ win32 {
         !win32-borland:!wince*:LIBS += -lmsimg32
 }
 
-embedded {
-    HEADERS += \
-        painting/qgraphicssystem_qws_p.h \
-
-    SOURCES += \
-        painting/qgraphicssystem_qws.cpp \
-
-} else: if(!qpa) {
-    HEADERS += \
-        painting/qgraphicssystem_raster_p.h \
-        painting/qgraphicssystem_runtime_p.h \
-        painting/qgraphicssystemfactory_p.h \
-        painting/qgraphicssystemplugin_p.h \
-        painting/qwindowsurface_raster_p.h
-
-    SOURCES += \
-        painting/qgraphicssystem_raster.cpp \
-        painting/qgraphicssystem_runtime.cpp \
-        painting/qgraphicssystemfactory.cpp \
-        painting/qgraphicssystemplugin.cpp \
-        painting/qwindowsurface_raster.cpp
-}
 
 unix:x11 {
         HEADERS += \
@@ -149,17 +117,15 @@ unix:x11 {
                 painting/qpaintengine_x11.cpp
 }
 
-!embedded:!qpa:!x11:mac {
+!qpa:!x11:mac {
         HEADERS += \
                 painting/qpaintengine_mac_p.h \
-                painting/qgraphicssystem_mac_p.h \
                 painting/qprintengine_mac_p.h
 
         SOURCES += \
                 painting/qcolormap_mac.cpp \
                 painting/qpaintdevice_mac.cpp \
                 painting/qpaintengine_mac.cpp \
-                painting/qgraphicssystem_mac.cpp \
                 painting/qprinterinfo_mac.cpp
         OBJECTIVE_SOURCES += \
                 painting/qprintengine_mac.mm \
@@ -172,23 +138,6 @@ unix:!mac:!symbian|qpa {
                 painting/qprinterinfo_unix.cpp
 }
 
-win32|x11|mac|embedded|qpa|symbian {
-        SOURCES += painting/qbackingstore.cpp
-        HEADERS += painting/qbackingstore_p.h
-}
-
-embedded {
-        contains(QT_CONFIG,qtopia) {
-                DEFINES += QTOPIA_PRINTENGINE
-                HEADERS += painting/qprintengine_qws_p.h
-                SOURCES += painting/qprintengine_qws.cpp
-        }
-
-        SOURCES += \
-                painting/qcolormap_qws.cpp \
-                painting/qpaintdevice_qws.cpp
-}
-
 qpa {
         SOURCES += \
                 painting/qcolormap_qpa.cpp \
@@ -205,7 +154,7 @@ symbian {
                 painting/qpaintengine_s60_p.h
 }
 
-x11|embedded|qpa {
+x11|qpa {
         contains(QT_CONFIG,qtopia) {
             DEFINES += QT_NO_CUPS QT_NO_LPR
         } else {
@@ -230,29 +179,8 @@ if(mmx|3dnow|sse|sse2|iwmmxt) {
     IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp
 }
 
-x11 {
-        HEADERS += painting/qwindowsurface_x11_p.h
-        SOURCES += painting/qwindowsurface_x11.cpp
-}
-
-!embedded:!qpa:mac {
-        HEADERS += painting/qwindowsurface_mac_p.h \
-                   painting/qunifiedtoolbarsurface_mac_p.h
-        SOURCES += painting/qwindowsurface_mac.cpp \
-                   painting/qunifiedtoolbarsurface_mac.cpp
-}
-
-embedded {
-        HEADERS += painting/qwindowsurface_qws_p.h
-        SOURCES += painting/qwindowsurface_qws.cpp
-}
-
-
-
 symbian {
-        HEADERS += painting/qwindowsurface_s60_p.h \
-                    painting/qdrawhelper_arm_simd_p.h
-        SOURCES += painting/qwindowsurface_s60.cpp
+        HEADERS += painting/qdrawhelper_arm_simd_p.h
         armccIfdefBlock = \
         "$${LITERAL_HASH}if defined(ARMV6)" \
         "MACRO QT_HAVE_ARM_SIMD" \