diff options
| author | Lorn Potter <lorn.potter@jollamobile.com> | 2014-03-06 09:24:34 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-05 21:11:48 +0200 |
| commit | 3b3b759c6ccd65eb6251fca68e5618c5ed8b6dd5 (patch) | |
| tree | 995c0c10dacb109467d222968e1d5e2874ba3ba4 /src | |
| parent | 87338cd15b47cad56bf2b4c166d294c3306bdf2c (diff) | |
prefer os-release for operating system name
Change-Id: I5b945948a17dbb830cdd451758c584d69eed7d24
Reviewed-by: Jakub Adam <jakub.adam@ktknet.cz>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src')
| -rw-r--r-- | src/systeminfo/linux/qdeviceinfo_linux.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/systeminfo/linux/qdeviceinfo_linux.cpp b/src/systeminfo/linux/qdeviceinfo_linux.cpp index 6c19bfcc..ffd0059c 100644 --- a/src/systeminfo/linux/qdeviceinfo_linux.cpp +++ b/src/systeminfo/linux/qdeviceinfo_linux.cpp @@ -494,6 +494,9 @@ QString QDeviceInfoPrivate::version(QDeviceInfo::Version type) QString QDeviceInfoPrivate::operatingSystemName() { if (osName.isEmpty()) { + osName = findInRelease(QStringLiteral("NAME="), QStringLiteral("os-release")); + } + if (osName.isEmpty()) { osName = findInRelease(QStringLiteral("NAME=")); } |