diff options
| author | Donald Carr <donald.carr@nokia.com> | 2012-03-12 16:29:59 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-14 18:31:31 +0100 |
| commit | 7f09f36873aa38810ab4315cce0ed80536c301eb (patch) | |
| tree | cd28e29a8f03c0c7f04a5d46d771a59281c00dc2 /src | |
| parent | a3420b127e14787d6679c7431464ac6a26c6464b (diff) | |
Explicit use of null namespace breaks namespaced build
These changes are currently required to successfully build Qt when it is
configured with a namespace via the configure -qtnamespace argument
Change-Id: I9f3ab30579c16085c4d3d05705336b810466c331
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
| -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 |