diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/painting/painting.pri
--- a/src/gui/painting/painting.pri	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/gui/painting/painting.pri	Tue Feb 02 00:43:10 2010 +0200
@@ -370,7 +370,6 @@
         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" \
@@ -380,6 +379,13 @@
         QMAKE_CXXFLAGS.ARMCC *= -O3
 }
 
+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) {