diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-04 10:09:00 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-04 10:09:00 (GMT) |
commit | dead11df75ef6957a56ad83de6020a6c4e87ba16 (patch) | |
tree | 8b5219cfb9355d82d9b7aecb9b7b6a4baefebe06 /src/corelib | |
parent | 625f6b92a08d8ef2a1e5697fce28ca39d29917fe (diff) | |
parent | 2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4 (diff) | |
download | Qt-dead11df75ef6957a56ad83de6020a6c4e87ba16.zip Qt-dead11df75ef6957a56ad83de6020a6c4e87ba16.tar.gz Qt-dead11df75ef6957a56ad83de6020a6c4e87ba16.tar.bz2 |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
src/multimedia/qml/qml.pri
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/tools/qsimd_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 724f3e0..21f308d 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -47,9 +47,6 @@ QT_BEGIN_HEADER -QT_BEGIN_NAMESPACE - -QT_MODULE(Core) #if defined(QT_NO_MAC_XARCH) || (defined(Q_OS_DARWIN) && (defined(__ppc__) || defined(__ppc64__))) // Disable MMX and SSE on Mac/PPC builds, or if the compiler @@ -103,6 +100,10 @@ QT_MODULE(Core) #include <mm3dnow.h> #endif +QT_BEGIN_NAMESPACE + +QT_MODULE(Core) + enum CPUFeatures { None = 0, MMX = 0x1, |