diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-04-02 21:32:51 +0000 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2010-04-02 21:32:51 +0000 |
commit | 1cc1f4ee77e2778a0cdde199689980fc3b8167fc (patch) | |
tree | 21a7769119cde4c9659ca43f3a5a099826a78cae | |
parent | 9fedc8187f746960ea4608f7bb9e5e9b2667fd39 (diff) | |
download | rockbox-1cc1f4ee77e2778a0cdde199689980fc3b8167fc.tar.gz rockbox-1cc1f4ee77e2778a0cdde199689980fc3b8167fc.zip |
System Info: display OS X version number and architecture too.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25442 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | rbutil/rbutilqt/base/system.cpp | 29 | ||||
-rw-r--r-- | rbutil/rbutilqt/rbutilqt.pro | 4 |
2 files changed, 32 insertions, 1 deletions
diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp index 7797157493..80e787515c 100644 --- a/rbutil/rbutilqt/base/system.cpp +++ b/rbutil/rbutilqt/base/system.cpp | |||
@@ -63,6 +63,7 @@ | |||
63 | 63 | ||
64 | #include <CoreFoundation/CoreFoundation.h> | 64 | #include <CoreFoundation/CoreFoundation.h> |
65 | #include <SystemConfiguration/SystemConfiguration.h> | 65 | #include <SystemConfiguration/SystemConfiguration.h> |
66 | #include <CoreServices/CoreServices.h> | ||
66 | #endif | 67 | #endif |
67 | 68 | ||
68 | #include "utils.h" | 69 | #include "utils.h" |
@@ -180,6 +181,34 @@ QString System::osVersionString(void) | |||
180 | 181 | ||
181 | result = QString("CPU: %1<br/>System: %2<br/>Release: %3<br/>Version: %4") | 182 | result = QString("CPU: %1<br/>System: %2<br/>Release: %3<br/>Version: %4") |
182 | .arg(u.machine).arg(u.sysname).arg(u.release).arg(u.version); | 183 | .arg(u.machine).arg(u.sysname).arg(u.release).arg(u.version); |
184 | #if defined(Q_OS_MACX) | ||
185 | SInt32 major; | ||
186 | SInt32 minor; | ||
187 | SInt32 bugfix; | ||
188 | OSErr error; | ||
189 | error = Gestalt(gestaltSystemVersionMajor, &major); | ||
190 | error = Gestalt(gestaltSystemVersionMinor, &minor); | ||
191 | error = Gestalt(gestaltSystemVersionBugFix, &bugfix); | ||
192 | |||
193 | result += QString("<br/>OS X %1.%2.%3 ").arg(major).arg(minor).arg(bugfix); | ||
194 | // 1: 86k, 2: ppc, 10: i386 | ||
195 | SInt32 arch; | ||
196 | error = Gestalt(gestaltSysArchitecture, &arch); | ||
197 | switch(arch) { | ||
198 | case 1: | ||
199 | result.append("(86k)"); | ||
200 | break; | ||
201 | case 2: | ||
202 | result.append("(ppc)"); | ||
203 | break; | ||
204 | case 10: | ||
205 | result.append("(x86)"); | ||
206 | break; | ||
207 | default: | ||
208 | result.append("(unknown)"); | ||
209 | break; | ||
210 | } | ||
211 | #endif | ||
183 | #endif | 212 | #endif |
184 | result += QString("<br/>Qt version %1").arg(qVersion()); | 213 | result += QString("<br/>Qt version %1").arg(qVersion()); |
185 | return result; | 214 | return result; |
diff --git a/rbutil/rbutilqt/rbutilqt.pro b/rbutil/rbutilqt/rbutilqt.pro index d3fb9c4b84..bb191f59c9 100644 --- a/rbutil/rbutilqt/rbutilqt.pro +++ b/rbutil/rbutilqt/rbutilqt.pro | |||
@@ -139,7 +139,9 @@ macx { | |||
139 | QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc | 139 | QMAKE_LFLAGS_PPC=-mmacosx-version-min=10.4 -arch ppc |
140 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386 | 140 | QMAKE_LFLAGS_X86=-mmacosx-version-min=10.4 -arch i386 |
141 | CONFIG+=x86 ppc | 141 | CONFIG+=x86 ppc |
142 | LIBS += -L/usr/local/lib -framework IOKit -framework CoreFoundation -framework Carbon -framework SystemConfiguration -lz | 142 | LIBS += -L/usr/local/lib -lz \ |
143 | -framework IOKit -framework CoreFoundation -framework Carbon \ | ||
144 | -framework SystemConfiguration -framework CoreServices | ||
143 | INCLUDEPATH += /usr/local/include | 145 | INCLUDEPATH += /usr/local/include |
144 | 146 | ||
145 | # rule for creating a dmg file | 147 | # rule for creating a dmg file |