Comment 67 for bug 664431

Revision history for this message
Jani Monoses (jani) wrote :

Unpatched Qt 4.7.2 FTBFS as -mfpu=neon is not passed to two cpp files (painting/drawhelper_neon.cpp and image/qimage_neon.cpp) .

This fixes it but it needs better variable naming probably, I just went for minimal number of lines changed.

Index: qt4-x11-4.7.2/src/gui/gui.pro
===================================================================
--- qt4-x11-4.7.2.orig/src/gui/gui.pro 2011-03-06 21:41:47.058276259 +0200
+++ qt4-x11-4.7.2/src/gui/gui.pro 2011-03-06 21:38:16.569232507 +0200
@@ -65,9 +65,9 @@
 neon:*-g++* {
     DEFINES += QT_HAVE_NEON
     HEADERS += $$NEON_HEADERS
- SOURCES += $$NEON_SOURCES

     DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM
+ DRAWHELPER_NEON_ASM_FILES += $$NEON_SOURCES

     neon_compiler.commands = $$QMAKE_CXX -c -mfpu=neon
     neon_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}