From 9a189a096f134e80e0c11523db14c8580275b4ad Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 24 Jul 2020 11:45:50 +0200 Subject: 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 --- src/corelib/global/qglobal.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/corelib/global/qglobal.cpp') 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"); -- cgit v1.2.3