diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-03-06 13:32:31 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-09 19:39:48 +0200 |
| commit | 442a6ef029b56f706bc207cca76549d418008256 (patch) | |
| tree | 0b616d55cef62dcc2be938d5fddcafb02a40428e /src/corelib/io | |
| parent | 1ec8df439a1b3d82c6f4d443c22fc9bb00566d1e (diff) | |
Add QSysInfo::osType()
This function returns the OS kernel type. It's usually the same as the
first part of the mkspec, in qmake, or the result of uname. Usually,
because it's not the case for a few systems, like Android, OS X, iOS,
BlackBerry, etc.
Change-Id: I295d92048d33ef02987e8696772ea89e925428d3
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qfileselector.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp index b4021c060f..fbf3b31291 100644 --- a/src/corelib/io/qfileselector.cpp +++ b/src/corelib/io/qfileselector.cpp @@ -51,10 +51,6 @@ #include <QtCore/QLocale> #include <QtCore/QDebug> -#ifdef Q_OS_UNIX -#include <sys/utsname.h> -#endif - QT_BEGIN_NAMESPACE //Environment variable to allow tooling full control of file selectors @@ -360,6 +356,7 @@ void QFileSelectorPrivate::updateSelectors() QStringList QFileSelectorPrivate::platformSelectors() { + // similar, but not identical to QSysInfo::osType QStringList ret; #if defined(Q_OS_WIN) ret << QStringLiteral("windows"); @@ -385,9 +382,7 @@ QStringList QFileSelectorPrivate::platformSelectors() ret << QStringLiteral("osx"); # endif # else - struct utsname u; - if (uname(&u) != -1) - ret << QString::fromLatin1(u.sysname).toLower(); + ret << QSysInfo::osType(); # endif #endif return ret; |