summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2011-05-29 19:46:20 +0000
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2011-05-29 19:46:20 +0000
commitb5feacfaac4dc82888a6a2facd2866e7e560fa4b (patch)
tree00bed2eea431181a4cea7fdb9f342f7c5fd83a04 /rbutil/rbutilqt/base
parent2ce1dfedaa9fe42d93b2be5b4322494a2eec6350 (diff)
downloadrockbox-b5feacfaac4dc82888a6a2facd2866e7e560fa4b.tar.gz
rockbox-b5feacfaac4dc82888a6a2facd2866e7e560fa4b.zip
Fix some gcc 4.6 warnings.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29933 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/base')
-rw-r--r--rbutil/rbutilqt/base/system.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp
index 4b97dea0f0..c7c28b3503 100644
--- a/rbutil/rbutilqt/base/system.cpp
+++ b/rbutil/rbutilqt/base/system.cpp
@@ -190,9 +190,14 @@ QString System::osVersionString(void)
190#else 190#else
191 long cores = sysconf(_SC_NPROCESSORS_ONLN); 191 long cores = sysconf(_SC_NPROCESSORS_ONLN);
192#endif 192#endif
193 result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores); 193 if(ret != -1) {
194 result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4") 194 result = QString("CPU: %1, %2 processor(s)").arg(u.machine).arg(cores);
195 .arg(u.sysname).arg(u.release).arg(u.version); 195 result += QString("<br/>System: %2<br/>Release: %3<br/>Version: %4")
196 .arg(u.sysname).arg(u.release).arg(u.version);
197 }
198 else {
199 result = QString("(Error when retrieving system information)");
200 }
196#if defined(Q_OS_MACX) 201#if defined(Q_OS_MACX)
197 SInt32 major; 202 SInt32 major;
198 SInt32 minor; 203 SInt32 minor;