diff options
author | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-10-04 14:12:39 (GMT) |
commit | 3ea28c383846a4af67ddd0c7d33dad0537a9972e (patch) | |
tree | 901f26b86b820ec4b4fc949ae38b6ce165b386af /src/corelib/tools | |
parent | 7cc2e423d39c3b519279d21cd3881f1a135913fd (diff) | |
parent | d04664b9da6356d3c97e632fb35e27c6822e0dc9 (diff) | |
download | Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.zip Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.gz Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qsimd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index 7babf3a..b2fe2da 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -286,7 +286,7 @@ static inline uint detectProcessorFeatures() uint feature_result = 0; #if defined(Q_CC_GNU) - long tmp; + quint64 tmp; asm ("xchg %%rbx, %1\n" "cpuid\n" "xchg %%rbx, %1\n" |