diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 03:56:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 03:56:15 (GMT) |
| commit | 2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4 (patch) | |
| tree | 55ebf8f3c738a516c089bffd71e5385b5c730fb7 /src/corelib/tools | |
| parent | 46dbe721c8a9efc555eb4c449141071825f2f747 (diff) | |
| parent | 1cc9c745f09c3399aeccc0f9b8ca07bbbfaf143b (diff) | |
| download | Qt-2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4.zip Qt-2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4.tar.gz Qt-2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fix namespace qml decleration.
Cocoa namespace fixes.
Namespace fixes.
QT7 mediaservice; Fix memory leak
Undo a doc revert.
Remove dependency on declarative from multimedia.
Diffstat (limited to 'src/corelib/tools')
| -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, |