diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-04 06:17:13 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-04 06:17:13 (GMT) |
| commit | 723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b (patch) | |
| tree | 4ddef15ac99c9a4babd23986c4f93eaa2009e512 /src/corelib/tools | |
| parent | c86449e2e45b67662b652d58e95e0ca7c99782fd (diff) | |
| parent | 9d0317c91dbbe660af2ed2aa8ea47446049467d2 (diff) | |
| download | Qt-723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b.zip Qt-723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b.tar.gz Qt-723fcb85aeb69b8dbfcba57b0b96c7adaf9cd00b.tar.bz2 | |
Merge branch '4.7' into mimir
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" |