diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-12 01:41:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-12 01:41:56 (GMT) |
| commit | 029b83bdc604ac9bbbd2974f22df61739dab9eeb (patch) | |
| tree | 4d5b5564ed219be7536f15e614603c54a058569f /src/gui | |
| parent | e61071a2a170eaeb524778e9e903100323b88bbe (diff) | |
| parent | fac68dca46131d63f11c37210834073848f5a93d (diff) | |
| download | Qt-029b83bdc604ac9bbbd2974f22df61739dab9eeb.zip Qt-029b83bdc604ac9bbbd2974f22df61739dab9eeb.tar.gz Qt-029b83bdc604ac9bbbd2974f22df61739dab9eeb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Don't set -mfpu=neon globally if the compiler supports neon.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/gui.pro | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 90b5de5..4d51fa8 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -64,13 +64,12 @@ symbian { neon:*-g++* { DEFINES += QT_HAVE_NEON - QMAKE_CXXFLAGS *= -mfpu=neon HEADERS += $$NEON_HEADERS SOURCES += $$NEON_SOURCES DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM - neon_compiler.commands = $$QMAKE_CXX -c + neon_compiler.commands = $$QMAKE_CXX -c -mfpu=neon neon_compiler.commands += $(CXXFLAGS) $(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)} |