diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-07-04 20:26:36 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2008-07-04 20:26:36 +0000 |
commit | 980a759560c898bb45ebcdeddcdbc29096da8aea (patch) | |
tree | 6ee8f04714a49b0cb7a18e8257063ad06d9ca100 /rbutil/rbutilqt/detect.cpp | |
parent | a5f99f2a51d9064fe86a68bfb634d1898f761ee7 (diff) | |
download | rockbox-980a759560c898bb45ebcdeddcdbc29096da8aea.tar.gz rockbox-980a759560c898bb45ebcdeddcdbc29096da8aea.zip |
w32: only display additional OS info string if it's not empty.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17941 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil/rbutilqt/detect.cpp')
-rw-r--r-- | rbutil/rbutilqt/detect.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/detect.cpp b/rbutil/rbutilqt/detect.cpp index 75a892571b..7c3d949012 100644 --- a/rbutil/rbutilqt/detect.cpp +++ b/rbutil/rbutilqt/detect.cpp | |||
@@ -159,7 +159,11 @@ QString Detect::osVersionString(void) | |||
159 | GetVersionEx(&osvi); | 159 | GetVersionEx(&osvi); |
160 | 160 | ||
161 | result = QString("Windows version %1.%2, ").arg(osvi.dwMajorVersion).arg(osvi.dwMinorVersion); | 161 | result = QString("Windows version %1.%2, ").arg(osvi.dwMajorVersion).arg(osvi.dwMinorVersion); |
162 | result += QString("build %1 (%2)").arg(osvi.dwBuildNumber).arg(QString::fromWCharArray(osvi.szCSDVersion)); | 162 | if(osvi.szCSDVersion) |
163 | result += QString("build %1 (%2)").arg(osvi.dwBuildNumber) | ||
164 | .arg(QString::fromWCharArray(osvi.szCSDVersion)); | ||
165 | else | ||
166 | result += QString("build %1").arg(osvi.dwBuildNumber); | ||
163 | #endif | 167 | #endif |
164 | #if defined(Q_OS_LINUX) || defined(Q_OS_MACX) | 168 | #if defined(Q_OS_LINUX) || defined(Q_OS_MACX) |
165 | struct utsname u; | 169 | struct utsname u; |