summaryrefslogtreecommitdiffstats
path: root/qt-ui/profile
diff options
context:
space:
mode:
authorGravatar Thiago Macieira <thiago@macieira.org>2015-02-13 23:49:58 -0800
committerGravatar Dirk Hohndel <dirk@hohndel.org>2015-02-15 06:00:52 -0800
commit39ffb0fced85c1179af361ad77f2bd40d61deb89 (patch)
tree4eb5aac5421471ad4c55bdd5db29dbe5ae3c6cc1 /qt-ui/profile
parentea143e96683d346aae26d8cbd210dc4f68f5f873 (diff)
downloadsubsurface-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 'qt-ui/profile')
0 files changed, 0 insertions, 0 deletions