diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /src/corelib/tools/qsimd.cpp | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'src/corelib/tools/qsimd.cpp')
| -rw-r--r-- | src/corelib/tools/qsimd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index b3d2d62819..6c07480f99 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -108,12 +108,12 @@ static inline uint detectProcessorFeatures() uint features = 0; #if defined(Q_OS_LINUX) - int auxv = ::qt_safe_open("/proc/self/auxv", O_RDONLY); + int auxv = qt_safe_open("/proc/self/auxv", O_RDONLY); if (auxv != -1) { unsigned long vector[64]; int nread; while (features == 0) { - nread = ::qt_safe_read(auxv, (char *)vector, sizeof vector); + nread = qt_safe_read(auxv, (char *)vector, sizeof vector); if (nread <= 0) { // EOF or error break; @@ -130,7 +130,7 @@ static inline uint detectProcessorFeatures() } } - ::qt_safe_close(auxv); + qt_safe_close(auxv); return features; } // fall back if /proc/self/auxv wasn't found |