diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:04 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-23 11:24:07 +0100 |
commit | d34353a065c443aac20376cbd88323480d769183 (patch) | |
tree | da5d86b51c2cf7023356551c4c980849b35bab14 /src/corelib/global/qglobal.cpp | |
parent | 4e40b1952695f0b1086ef7b88e8514bd18cf96bf (diff) | |
parent | 571908f7fc8f5e4ef9a4dfd90102566f6f0fcad2 (diff) |
Merge dev into 5.5
Change-Id: Id6dbbbfc542c214fe695c6795c6aaf23aedc1cd1
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
-rw-r--r-- | src/corelib/global/qglobal.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 06f9e9080e..712e84185c 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2529,9 +2529,6 @@ QString QSysInfo::productType() #elif defined(Q_OS_DARWIN) return QStringLiteral("darwin"); -#elif defined(Q_OS_HAIKU) - return QStringLiteral("haiku"); - #elif defined(USE_ETC_OS_RELEASE) // Q_OS_UNIX QUnixOSVersion unixOsVersion; readEtcOsRelease(unixOsVersion); |