diff -r 000000000000 -r 1918ee327afb src/gui/painting/painting.pri
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/gui/painting/painting.pri	Mon Jan 11 14:00:40 2010 +0000
@@ -0,0 +1,389 @@
+# Qt gui library, paint module
+
+HEADERS += \
+        painting/qbezier_p.h \
+        painting/qbrush.h \
+        painting/qcolor.h \
+        painting/qcolor_p.h \
+        painting/qcolormap.h \
+        painting/qdrawutil.h \
+        painting/qemulationpaintengine_p.h \
+        painting/qgraphicssystem_p.h \
+        painting/qmatrix.h \
+        painting/qmemrotate_p.h \
+        painting/qoutlinemapper_p.h \
+        painting/qpaintdevice.h \
+        painting/qpaintengine.h \
+		painting/qpaintengine_p.h \
+        painting/qpaintengine_alpha_p.h \
+        painting/qpaintengine_preview_p.h \
+        painting/qpaintengineex_p.h \
+        painting/qpainter.h \
+        painting/qpainter_p.h \
+        painting/qpainterpath.h \
+        painting/qpainterpath_p.h \
+        painting/qvectorpath_p.h \
+        painting/qpathclipper_p.h \
+        painting/qpdf_p.h \
+        painting/qpen.h \
+        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 \
+        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
+
+
+SOURCES += \
+        painting/qbezier.cpp \
+        painting/qblendfunctions.cpp \
+        painting/qbrush.cpp \
+        painting/qcolor.cpp \
+        painting/qcolor_p.cpp \
+        painting/qcssutil.cpp \
+        painting/qdrawutil.cpp \
+        painting/qemulationpaintengine.cpp \
+        painting/qgraphicssystem.cpp \
+        painting/qmatrix.cpp \
+        painting/qmemrotate.cpp \
+        painting/qoutlinemapper.cpp \
+        painting/qpaintdevice.cpp \
+        painting/qpaintengine.cpp \
+        painting/qpaintengine_alpha.cpp \
+        painting/qpaintengine_preview.cpp \
+        painting/qpaintengineex.cpp \
+        painting/qpainter.cpp \
+        painting/qpainterpath.cpp \
+        painting/qpathclipper.cpp \
+        painting/qpdf.cpp \
+        painting/qpen.cpp \
+        painting/qpolygon.cpp \
+        painting/qprintengine_pdf.cpp \
+        painting/qprintengine_ps.cpp \
+        painting/qprinter.cpp \
+        painting/qrasterizer.cpp \
+        painting/qregion.cpp \
+        painting/qstroker.cpp \
+        painting/qstylepainter.cpp \
+        painting/qtessellator.cpp \
+        painting/qtextureglyphcache.cpp \
+        painting/qtransform.cpp \
+        painting/qwindowsurface.cpp \
+        painting/qpaintbuffer.cpp
+
+        SOURCES +=                                      \
+                painting/qpaintengine_raster.cpp        \
+                painting/qdrawhelper.cpp                \
+                painting/qimagescale.cpp                \
+                painting/qgrayraster.c
+
+        HEADERS +=                                      \
+                painting/qpaintengine_raster_p.h        \
+                painting/qrasterdefs_p.h                \
+                painting/qgrayraster_p.h
+
+win32 {
+        HEADERS += painting/qprintengine_win_p.h
+
+        SOURCES += \
+                painting/qcolormap_win.cpp \
+                painting/qpaintdevice_win.cpp \
+                painting/qprintengine_win.cpp \
+                painting/qprinterinfo_win.cpp
+
+        !win32-borland:!wince*:LIBS += -lmsimg32
+}
+
+embedded {
+    HEADERS += \
+        painting/qgraphicssystem_qws_p.h \
+
+    SOURCES += \
+        painting/qgraphicssystem_qws.cpp \
+
+} else {
+    HEADERS += \
+        painting/qgraphicssystem_raster_p.h \
+        painting/qgraphicssystemfactory_p.h \
+        painting/qgraphicssystemplugin_p.h \
+        painting/qwindowsurface_raster_p.h \
+
+    SOURCES += \
+        painting/qgraphicssystem_raster.cpp \
+        painting/qgraphicssystemfactory.cpp \
+        painting/qgraphicssystemplugin.cpp \
+        painting/qwindowsurface_raster.cpp \
+}
+
+unix:x11 {
+        HEADERS += \
+                painting/qpaintengine_x11_p.h
+
+        SOURCES += \
+                painting/qcolormap_x11.cpp \
+                painting/qpaintdevice_x11.cpp \
+                painting/qpaintengine_x11.cpp
+}
+
+!embedded:!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 \
+}
+
+unix:!mac:!symbian {
+        HEADERS += \
+                painting/qprinterinfo_unix_p.h
+        SOURCES += \
+                painting/qprinterinfo_unix.cpp
+}
+
+win32|x11|mac|embedded|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
+}
+
+symbian {
+        SOURCES += \
+				painting/qpaintengine_s60.cpp \
+                painting/qregion_s60.cpp \
+                painting/qcolormap_s60.cpp
+
+        HEADERS += \
+                painting/qpaintengine_s60_p.h
+}
+
+x11|embedded {
+        contains(QT_CONFIG,qtopia) {
+            DEFINES += QT_NO_CUPS QT_NO_LPR
+        } else {
+            SOURCES += painting/qcups.cpp
+            HEADERS += painting/qcups_p.h
+        }
+} else {
+        DEFINES += QT_NO_CUPS QT_NO_LPR
+}
+
+contains(QMAKE_MAC_XARCH, no) {
+    DEFINES += QT_NO_MAC_XARCH
+} else:if(mmx|3dnow|sse|sse2|iwmmxt) {
+    HEADERS += painting/qdrawhelper_x86_p.h \
+               painting/qdrawhelper_mmx_p.h \
+               painting/qdrawhelper_sse_p.h
+    mmx {
+        DEFINES += QT_HAVE_MMX
+        MMX_SOURCES += painting/qdrawhelper_mmx.cpp
+    }
+    3dnow {
+        DEFINES += QT_HAVE_3DNOW
+        MMX3DNOW_SOURCES += painting/qdrawhelper_mmx3dnow.cpp
+        sse {
+            SSE3DNOW_SOURCES += painting/qdrawhelper_sse3dnow.cpp
+        }
+    }
+    sse {
+        DEFINES += QT_HAVE_SSE
+        SSE_SOURCES += painting/qdrawhelper_sse.cpp
+
+        DEFINES += QT_HAVE_MMXEXT
+    }
+    sse2 {
+        DEFINES += QT_HAVE_SSE2
+        SSE2_SOURCES += painting/qdrawhelper_sse2.cpp
+    }
+    iwmmxt {
+        DEFINES += QT_HAVE_IWMMXT
+        IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp
+    }
+
+    win32-g++|!win32:!*-icc* {
+        mmx {
+            mmx_compiler.commands = $$QMAKE_CXX -c -Winline
+
+            mac {
+                mmx_compiler.commands += -Xarch_i386 -mmmx
+                mmx_compiler.commands += -Xarch_x86_64 -mmmx
+            } else {
+                mmx_compiler.commands += -mmmx
+            }
+
+            mmx_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            mmx_compiler.dependency_type = TYPE_C
+            mmx_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+            mmx_compiler.input = MMX_SOURCES
+            mmx_compiler.variable_out = OBJECTS
+            mmx_compiler.name = compiling[mmx] ${QMAKE_FILE_IN}
+            silent:mmx_compiler.commands = @echo compiling[mmx] ${QMAKE_FILE_IN} && $$mmx_compiler.commands
+            QMAKE_EXTRA_COMPILERS += mmx_compiler
+        }
+        3dnow {
+            mmx3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
+
+            mac {
+                mmx3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -mmmx
+                mmx3dnow_compiler.commands += -Xarch_x86_64 -m3dnow -Xarch_x86_64 -mmmx
+            } else {
+                mmx3dnow_compiler.commands += -m3dnow -mmmx
+            }
+
+            mmx3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            mmx3dnow_compiler.dependency_type = TYPE_C
+            mmx3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+            mmx3dnow_compiler.input = MMX3DNOW_SOURCES
+            mmx3dnow_compiler.variable_out = OBJECTS
+            mmx3dnow_compiler.name = compiling[mmx3dnow] ${QMAKE_FILE_IN}
+            silent:mmx3dnow_compiler.commands = @echo compiling[mmx3dnow] ${QMAKE_FILE_IN} && $$mmx3dnow_compiler.commands
+            QMAKE_EXTRA_COMPILERS += mmx3dnow_compiler
+            sse {
+                sse3dnow_compiler.commands = $$QMAKE_CXX -c -Winline
+
+                mac {
+                    sse3dnow_compiler.commands += -Xarch_i386 -m3dnow -Xarch_i386 -msse
+                    sse3dnow_compiler.commands += -Xarch_x86_64 -m3dnow -Xarch_x86_64 -msse
+                } else {
+                    sse3dnow_compiler.commands += -m3dnow -msse
+                }
+
+                sse3dnow_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+                sse3dnow_compiler.dependency_type = TYPE_C
+                sse3dnow_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+                sse3dnow_compiler.input = SSE3DNOW_SOURCES
+                sse3dnow_compiler.variable_out = OBJECTS
+                sse3dnow_compiler.name = compiling[sse3dnow] ${QMAKE_FILE_IN}
+                silent:sse3dnow_compiler.commands = @echo compiling[sse3dnow] ${QMAKE_FILE_IN} && $$sse3dnow_compiler.commands
+                QMAKE_EXTRA_COMPILERS += sse3dnow_compiler
+            }
+        }
+        sse {
+            sse_compiler.commands = $$QMAKE_CXX -c -Winline
+
+            mac {
+                sse_compiler.commands += -Xarch_i386 -msse
+                sse_compiler.commands += -Xarch_x86_64 -msse
+            } else {
+                sse_compiler.commands += -msse
+            }
+
+            sse_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            sse_compiler.dependency_type = TYPE_C
+            sse_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+            sse_compiler.input = SSE_SOURCES
+            sse_compiler.variable_out = OBJECTS
+            sse_compiler.name = compiling[sse] ${QMAKE_FILE_IN}
+            silent:sse_compiler.commands = @echo compiling[sse] ${QMAKE_FILE_IN} && $$sse_compiler.commands
+            QMAKE_EXTRA_COMPILERS += sse_compiler
+        }
+        sse2 {
+            sse2_compiler.commands = $$QMAKE_CXX -c -Winline
+
+            mac {
+                sse2_compiler.commands += -Xarch_i386 -msse2
+                sse2_compiler.commands += -Xarch_x86_64 -msse2
+            } else {
+                sse2_compiler.commands += -msse2
+            }
+
+            sse2_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            sse2_compiler.dependency_type = TYPE_C
+            sse2_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+            sse2_compiler.input = SSE2_SOURCES
+            sse2_compiler.variable_out = OBJECTS
+            sse2_compiler.name = compiling[sse2] ${QMAKE_FILE_IN}
+            silent:sse2_compiler.commands = @echo compiling[sse2] ${QMAKE_FILE_IN} && $$sse2_compiler.commands
+            QMAKE_EXTRA_COMPILERS += sse2_compiler
+        }
+        iwmmxt {
+            iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
+            iwmmxt_compiler.commands += -mcpu=iwmmxt
+            iwmmxt_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+            iwmmxt_compiler.dependency_type = TYPE_C
+            iwmmxt_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+            iwmmxt_compiler.input = IWMMXT_SOURCES
+            iwmmxt_compiler.variable_out = OBJECTS
+            iwmmxt_compiler.name = compiling[iwmmxt] ${QMAKE_FILE_IN}
+            silent:iwmmxt_compiler.commands = @echo compiling[iwmmxt] ${QMAKE_FILE_IN} && $$iwmmxt_compiler.commands
+            QMAKE_EXTRA_COMPILERS += iwmmxt_compiler
+        }
+    } else {
+        mmx: SOURCES += $$MMX_SOURCES
+        3dnow: SOURCES += $$MMX3DNOW_SOURCES
+        3dnow:sse: SOURCES += $$SSE3DNOW_SOURCES
+        sse: SOURCES += $$SSE_SOURCES
+        sse2: SOURCES += $$SSE2_SOURCES
+        iwmmxt: SOURCES += $$IWMMXT_SOURCES
+    }
+}
+
+x11 {
+        HEADERS += painting/qwindowsurface_x11_p.h
+        SOURCES += painting/qwindowsurface_x11.cpp
+}
+
+mac {
+        HEADERS += painting/qwindowsurface_mac_p.h
+        SOURCES += painting/qwindowsurface_mac.cpp
+}
+
+embedded {
+        HEADERS += painting/qwindowsurface_qws_p.h
+        SOURCES += painting/qwindowsurface_qws.cpp
+}
+
+
+
+symbian {
+        HEADERS += painting/qwindowsurface_s60_p.h
+        SOURCES += painting/qwindowsurface_s60.cpp
+        armccIfdefBlock = \
+        "$${LITERAL_HASH}if defined(ARMV6)" \
+        "MACRO QT_HAVE_ARMV6" \
+        "SOURCEPATH 	painting" \
+        "SOURCE			qblendfunctions_armv6_rvct.s" \
+        "SOURCE			qdrawhelper_armv6_rvct.s" \
+        "$${LITERAL_HASH}endif"
+
+        MMP_RULES += armccIfdefBlock
+        QMAKE_CXXFLAGS.ARMCC *= -O3
+}
+
+contains(QT_CONFIG, zlib) {
+   INCLUDEPATH += ../3rdparty/zlib
+} else:!contains(QT_CONFIG, no-zlib) {
+   unix:LIBS_PRIVATE += -lz
+#  win32:LIBS += libz.lib
+}
+