diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-19 11:06:55 +0100 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-19 11:10:24 +0100 |
| commit | 83525ca84ba7adadaeeb65ffa55a6d0f2630caaa (patch) | |
| tree | 83a26fc42ba3811baf38776d266d4bf600684715 /src/corelib/corelib.pro | |
| parent | b115770cc3bba68740a6848c7ccaed932399aca9 (diff) | |
| parent | 4082e4711a1c54947429b15504caf778c6da22d0 (diff) | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/kernel/qgesturemanager.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Changes in qmake/generators/win32/msvc_objectmodel.cpp come
from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
Diffstat (limited to 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 349b3d462d..e946d5d1ae 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -44,10 +44,3 @@ symbian: { MMP_RULES -= PAGED MMP_RULES *= UNPAGED } - -neon { - DEFINES += QT_HAVE_NEON - QMAKE_CXXFLAGS *= -mfpu=neon -} - - |