Changeset 846 for trunk/src/gui/painting/painting.pri

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/painting.pri (modified) (6 diffs)

trunk/src/gui/painting/painting.pri

@@ -92 +92 @@
         HEADERS +=                                      \
                 painting/qpaintengine_raster_p.h        \
+                painting/qdrawhelper_p.h                \
+                painting/qblendfunctions_p.h            \
                 painting/qrasterdefs_p.h                \
                 painting/qgrayraster_p.h
@@ -124 +126 @@
     HEADERS += \
         painting/qgraphicssystem_raster_p.h \
+        painting/qgraphicssystem_runtime_p.h \
         painting/qgraphicssystemfactory_p.h \
         painting/qgraphicssystemplugin_p.h \
@@ -130 +133 @@
     SOURCES += \
         painting/qgraphicssystem_raster.cpp \
+        painting/qgraphicssystem_runtime.cpp \
         painting/qgraphicssystemfactory.cpp \
         painting/qgraphicssystemplugin.cpp \
@@ -210 +214 @@
 }
 
-contains(QMAKE_MAC_XARCH, no) {
-    DEFINES += QT_NO_MAC_XARCH
-} else:if(mmx|3dnow|sse|sse2|iwmmxt) {
+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 {
-            os2:mmx_compiler.commands = $$QMAKE_RUN_CXX -Winline
-            else: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
-            }
-
-            os2 {
-                mmx_compiler.commands = $$replace(mmx_compiler.commands, \\$src, ${QMAKE_FILE_IN})
-                mmx_compiler.commands = $$replace(mmx_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
-            } else {
-                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 {
-            os2:mmx3dnow_compiler.commands = $$QMAKE_RUN_CXX -Winline
-            else: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
-            }
-
-            os2 {
-                mmx3dnow_compiler.commands = $$replace(mmx3dnow_compiler.commands, \\$src, ${QMAKE_FILE_IN})
-                mmx3dnow_compiler.commands = $$replace(mmx3dnow_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
-            } else {
-                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 {
-                os2:sse3dnow_compiler.commands = $$QMAKE_RUN_CXX -Winline
-                else: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:os2 {
-                    # SSE data types (__m128i etc.) don't get 16-byte alignment on stack with GCC 4.4.4
-                    # (compiler bug?), force it with -mstackrealign to avoid spontaneous SIGSEGVs
-                    sse3dnow_compiler.commands += -m3dnow -msse -mstackrealign
-                } else {
-                    sse3dnow_compiler.commands += -m3dnow -msse
-                }
-
-                os2 {
-                    sse3dnow_compiler.commands = $$replace(sse3dnow_compiler.commands, \\$src, ${QMAKE_FILE_IN})
-                    sse3dnow_compiler.commands = $$replace(sse3dnow_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
-                } else {
-                    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 {
-            os2:sse_compiler.commands = $$QMAKE_RUN_CXX -Winline
-            else:sse_compiler.commands = $$QMAKE_CXX -c -Winline
-
-            mac {
-                sse_compiler.commands += -Xarch_i386 -msse
-                sse_compiler.commands += -Xarch_x86_64 -msse
-            } else:os2 {
-                # SSE data types (__m128i etc.) don't get 16-byte alignment on stack with GCC 4.4.4
-                # (compiler bug?), force it with -mstackrealign to avoid spontaneous SIGSEGVs
-                sse_compiler.commands += -msse -mstackrealign
-            } else {
-                sse_compiler.commands += -msse
-            }
-
-            os2 {
-                sse_compiler.commands = $$replace(sse_compiler.commands, \\$src, ${QMAKE_FILE_IN})
-                sse_compiler.commands = $$replace(sse_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
-            } else {
-                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 {
-            os2:sse2_compiler.commands = $$QMAKE_RUN_CXX -Winline
-            else:sse2_compiler.commands = $$QMAKE_CXX -c -Winline
-
-            mac {
-                sse2_compiler.commands += -Xarch_i386 -msse2
-                sse2_compiler.commands += -Xarch_x86_64 -msse2
-            } else:os2 {
-                # SSE data types (__m128i etc.) don't get 16-byte alignment on stack with GCC 4.4.4
-                # (compiler bug?), force it with -mstackrealign to avoid spontaneous SIGSEGVs
-                sse2_compiler.commands += -msse2 -mstackrealign
-            } else {
-                sse2_compiler.commands += -msse2
-            }
-
-            os2 {
-                sse2_compiler.commands = $$replace(sse2_compiler.commands, \\$src, ${QMAKE_FILE_IN})
-                sse2_compiler.commands = $$replace(sse2_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
-            } else {
-                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 {
-            os2:iwmmxt_compiler.commands = $$QMAKE_RUN_CXX -Winline
-            else:iwmmxt_compiler.commands = $$QMAKE_CXX -c -Winline
-            iwmmxt_compiler.commands += -mcpu=iwmmxt
-            os2 {
-                iwmmxt_compiler.commands = $$replace(iwmmxt_compiler.commands, \\$src, ${QMAKE_FILE_IN})
-                iwmmxt_compiler.commands = $$replace(iwmmxt_compiler.commands, \\$obj, ${QMAKE_FILE_OUT})
-            } else {
-                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
-    }
+               painting/qdrawhelper_sse_p.h \
+               painting/qdrawingprimitive_sse2_p.h
+    MMX_SOURCES += painting/qdrawhelper_mmx.cpp
+    MMX3DNOW_SOURCES += painting/qdrawhelper_mmx3dnow.cpp
+    SSE3DNOW_SOURCES += painting/qdrawhelper_sse3dnow.cpp
+    SSE_SOURCES += painting/qdrawhelper_sse.cpp
+    SSE2_SOURCES += painting/qdrawhelper_sse2.cpp
+    SSSE3_SOURCES += painting/qdrawhelper_ssse3.cpp
+    IWMMXT_SOURCES += painting/qdrawhelper_iwmmxt.cpp
 }
 
@@ -429 +249 @@
 
 symbian {
-        HEADERS += painting/qwindowsurface_s60_p.h
+        HEADERS += painting/qwindowsurface_s60_p.h \
+                    painting/qdrawhelper_arm_simd_p.h
         SOURCES += painting/qwindowsurface_s60.cpp
         armccIfdefBlock = \
         "$${LITERAL_HASH}if defined(ARMV6)" \
+        "MACRO QT_HAVE_ARM_SIMD" \
         "SOURCEPATH     painting" \
-        "SOURCE                 qblendfunctions_armv6_rvct.s" \
-        "SOURCE                 qdrawhelper_armv6_rvct.s" \
+        "SOURCE                 qdrawhelper_arm_simd.cpp" \
         "$${LITERAL_HASH}endif"
 
@@ -442 +263 @@
 }
 
-neon {
-    DEFINES += QT_HAVE_NEON
-    HEADERS += painting/qdrawhelper_neon_p.h
-    SOURCES += painting/qdrawhelper_neon.cpp
-    QMAKE_CXXFLAGS *= -mfpu=neon
-}
-
-contains(QT_CONFIG, zlib) {
-   INCLUDEPATH += ../3rdparty/zlib
-} else:!contains(QT_CONFIG, no-zlib) {
-   unix:LIBS_PRIVATE += -lz
-#  win32:LIBS += libz.lib
-}
-
+NEON_SOURCES += painting/qdrawhelper_neon.cpp
+NEON_HEADERS += painting/qdrawhelper_neon_p.h
+NEON_ASM += ../3rdparty/pixman/pixman-arm-neon-asm.S painting/qdrawhelper_neon_asm.S
+
+include($$PWD/../../3rdparty/zlib_dependency.pri)