diff options
| author | Robin Burchell <robin.burchell@collabora.co.uk> | 2011-02-04 11:39:51 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-02-04 13:19:43 (GMT) |
| commit | bc21d7604c78cf05780bb9974911ba81e787b6f9 (patch) | |
| tree | fab6458f82aac112e04171d52da3c535fd78aa23 | |
| parent | 30dee4f433d2426ce2dc0bccda8e62683380a1c4 (diff) | |
| download | Qt-bc21d7604c78cf05780bb9974911ba81e787b6f9.zip Qt-bc21d7604c78cf05780bb9974911ba81e787b6f9.tar.gz Qt-bc21d7604c78cf05780bb9974911ba81e787b6f9.tar.bz2 | |
Fix builds with compilers without --with-fpu=neon as a default.
The changes introduced in fac68dca46131d63f11c37210834073848f5a93d do not work
correctly on compilers without --with-fpu=neon as a default, NEON_SOURCES would
be (incorrectly) compiled without -mfpu=neon, resulting in build failure.
This also moves -mfpu=neon after CXXFLAGS, as CXXFLAGS may contain
-mfpu=vfpv3-d16.
Issue noted by Carsten Munk while building Qt for MeeGo ARM with NEON.
Merge-request: 1042
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| -rw-r--r-- | src/gui/gui.pro | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index fe1a595..076fe0a 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -65,15 +65,14 @@ symbian { neon:*-g++* { DEFINES += QT_HAVE_NEON HEADERS += $$NEON_HEADERS - SOURCES += $$NEON_SOURCES DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM - neon_compiler.commands = $$QMAKE_CXX -c -mfpu=neon - neon_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} + neon_compiler.commands = $$QMAKE_CXX -c + neon_compiler.commands += $(CXXFLAGS) -mfpu=neon $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} neon_compiler.dependency_type = TYPE_C neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)} - neon_compiler.input = DRAWHELPER_NEON_ASM_FILES + neon_compiler.input = DRAWHELPER_NEON_ASM_FILES NEON_SOURCES neon_compiler.variable_out = OBJECTS neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN} silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands |