diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-06 15:52:37 +0200 |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-08-06 19:21:02 +0200 |
| commit | c45516f1f3781dcb504158f730b98897c7f2f2a1 (patch) | |
| tree | 9aca91f65d7fb66bbcd1fc26624707e54cdbb3c1 | |
| parent | 296cf92e1047409a203294e81fb388cc6a0e5c85 (diff) | |
Remove the definition of QT_HAVE_NEON from qt.prf
Since we cannot use NEON and VFP concurrently, it is better not to
force neon all over the place :)
Reviewed-by: Andreas Kling
Reviewed-by: Thiago Macieira
| -rw-r--r-- | mkspecs/features/qt.prf | 1 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 5 | ||||
| -rw-r--r-- | src/gui/gui.pro | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index aa0f06e40b..84010a0727 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -211,7 +211,6 @@ mac { } #SIMD defines: -neon: DEFINES += QT_HAVE_NEON mmx:DEFINES += QT_HAVE_MMX 3dnow:DEFINES += QT_HAVE_3DNOW sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index bc8ef9ff92..728bdf98f5 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -53,6 +53,9 @@ symbian: { DEPLOYMENT = partial_upgrade $$DEPLOYMENT } -neon: QMAKE_CXXFLAGS *= -mfpu=neon +neon { + DEFINES += QT_HAVE_NEON + QMAKE_CXXFLAGS *= -mfpu=neon +} diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 89ae06fbbe..3943e261c1 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -77,8 +77,9 @@ symbian { DEPLOYMENT = partial_upgrade $$DEPLOYMENT } -neon: QMAKE_CXXFLAGS *= -mfpu=neon neon:*-g++* { + DEFINES += QT_HAVE_NEON + QMAKE_CXXFLAGS *= -mfpu=neon HEADERS += $$NEON_HEADERS SOURCES += $$NEON_SOURCES |