diff options
| author |  Thiago Macieira <thiago@macieira.org> | 2015-02-13 23:49:58 -0800 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-02-15 06:00:52 -0800 |
| commit | 39ffb0fced85c1179af361ad77f2bd40d61deb89 (patch) | |
| tree | 4eb5aac5421471ad4c55bdd5db29dbe5ae3c6cc1 /subsurfacesysinfo.h | |
| parent | ea143e96683d346aae26d8cbd210dc4f68f5f873 (diff) | |
| download | subsurface-39ffb0fced85c1179af361ad77f2bd40d61deb89.tar.gz | |
Fix Subsurface build with Qt 5.4.1 and later
The intention had been all along to use the 5.4 QSysInfo API, but due to
a silly mistake in the QT_VERSION check, it never got enabled for 5.4.0.
On 5.4.1 it does get enabled and, unfortunately, causes compilation
errors because the API changed between the time we backported to
Subsurface and the final version.
This commit backports the final QSysInfo API from Qt 5.4 into
Subsurface, which includes the renaming of a few functions. Since the
prettyOsName function no longer exists in the Qt API in that form, I've
reimplemented it using the API that does exist.
Signed-off-by: Thiago Macieira <thiago@macieira.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurfacesysinfo.h')
| -rw-r--r-- | subsurfacesysinfo.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/subsurfacesysinfo.h b/subsurfacesysinfo.h index 877f7ef00..23c7011bc 100644 --- a/subsurfacesysinfo.h +++ b/subsurfacesysinfo.h @@ -205,16 +205,18 @@ class SubsurfaceSysInfo : public QSysInfo { public: -#if QT_VERSION <= 0x050400 - static QString cpuArchitecture(); - static QString fullCpuArchitecture(); - static QString osType(); - static QString osKernelVersion(); - static QString osVersion(); - static QString prettyOsName(); - +#if QT_VERSION < 0x050400 + static QString buildCpuArchitecture(); + static QString currentCpuArchitecture(); + static QString buildAbi(); + + static QString kernelType(); + static QString kernelVersion(); + static QString productType(); + static QString productVersion(); + static QString prettyProductName(); #endif - static QString osArch(); + static QString prettyOsName(); }; |