whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Donald Carr 2012-03-12 16:29:59 +00:00 committed by Qt by Nokia
parent a3420b127e
commit 7f09f36873
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/tools/qsimd.cpp
View File

@ -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