diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 11:45:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 13:10:57 +0200 |
| commit | 9a189a096f134e80e0c11523db14c8580275b4ad (patch) | |
| tree | 154a408d7607a9aa9cf10f66ed552dfbcfe18292 /src/corelib/global/qglobal.cpp | |
| parent | 999f62531a784b8f0f1f6d3cb7aaaa5455485d17 (diff) | |
Remove non-Qt6 compile time switches from QtCore
We already manage to compile without this code, and none of it are full
classes or separate functions suitable for qt5compat.
Change-Id: I47facac7ec621cfc4b0b26214b7de37897443519
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 5724ecd627..5655f77d3c 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -2621,12 +2621,7 @@ QString QSysInfo::productType() #elif defined(Q_OS_WATCHOS) return QStringLiteral("watchos"); #elif defined(Q_OS_MACOS) - // ### Qt6: remove fallback -# if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) return QStringLiteral("macos"); -# else - return QStringLiteral("osx"); -# endif #elif defined(Q_OS_DARWIN) return QStringLiteral("darwin"); |