diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2010-11-11 09:39:09 (GMT) |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2010-11-11 12:52:28 (GMT) |
| commit | fac68dca46131d63f11c37210834073848f5a93d (patch) | |
| tree | 02044261c86ab1985e6e301ff3e7623554c3fc40 /src/gui/gui.pro | |
| parent | d134345b02c6813289e67ba6c5ffe6daa1086516 (diff) | |
| download | Qt-fac68dca46131d63f11c37210834073848f5a93d.zip Qt-fac68dca46131d63f11c37210834073848f5a93d.tar.gz Qt-fac68dca46131d63f11c37210834073848f5a93d.tar.bz2 | |
Don't set -mfpu=neon globally if the compiler supports neon.
By default only drawhelpers and image loaders will now use neon.
If -mfpu=neon has been explicitly enabled in the mkspec,
QT_ALWAYS_HAVE_NEON will be defined, allowing the use of neon
intrinsics elsewhere.
Task-number: QTBUG-15163
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
Diffstat (limited to 'src/gui/gui.pro')
| -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)} |