Pluginize the platform styles

This enforces decoupling and in the case of QMacStyle, isolates
QtWidgets and therefore end user applications, from Carbon/HITheme.

Windows and Fusion are platform independent, so they remain built-in
(but mostly because the Windows style is tightly coupled to other styles
like QStylesheetStyle).

Task-number: QTBUG-59428
Change-Id: Id6519fe0c5269c1bce5b5921f9db06257032a1c9
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>

1 files changed, 0 insertions, 46 deletions

diff --git a/src/widgets/styles/qstylefactory.cpp b/src/widgets/styles/qstylefactory.cpp
index e29794aeb1..c959994d2c 100644
--- a/src/widgets/styles/qstylefactory.cpp
+++ b/src/widgets/styles/qstylefactory.cpp
@@ -46,16 +46,6 @@
 #include "qwindowsstyle_p.h"
 #if QT_CONFIG(style_fusion)
 #include "qfusionstyle_p.h"
-#if QT_CONFIG(style_android)
-#include "qandroidstyle_p.h"
-#endif
-#endif
-#if QT_CONFIG(style_windowsvista)
-#include "qwindowsvistastyle_p.h"
-#endif
-
-#if QT_CONFIG(style_mac)
-#  include "qmacstyle_mac_p.h"
 #endif
 
 QT_BEGIN_NAMESPACE
@@ -105,30 +95,11 @@ QStyle *QStyleFactory::create(const QString& key)
         ret = new QWindowsStyle;
     else
 #endif
-#if QT_CONFIG(style_windowsvista)
-    if (style == QLatin1String("windowsvista"))
-        ret = new QWindowsVistaStyle;
-    else
-#endif
 #if QT_CONFIG(style_fusion)
     if (style == QLatin1String("fusion"))
         ret = new QFusionStyle;
     else
 #endif
-#if QT_CONFIG(style_android)
-    if (style == QLatin1String("android"))
-        ret = new QAndroidStyle;
-    else
-#endif
-#if QT_CONFIG(style_mac)
-    if (style.startsWith(QLatin1String("macintosh"))) {
-        ret = new QMacStyle;
-#  if 0 // Used to be included in Qt4 for Q_WS_MAC
-        if (style == QLatin1String("macintosh"))
-            style += QLatin1String(" (aqua)");
-#  endif
-    } else
-#endif
     { } // Keep these here - they make the #ifdefery above work
     if (!ret)
         ret = qLoadPlugin<QStyle, QStylePlugin>(loader(), style);
@@ -156,27 +127,10 @@ QStringList QStyleFactory::keys()
     if (!list.contains(QLatin1String("Windows")))
         list << QLatin1String("Windows");
 #endif
-#if QT_CONFIG(style_windowsvista)
-    if (!list.contains(QLatin1String("WindowsVista")) &&
-        (QSysInfo::WindowsVersion >= QSysInfo::WV_VISTA && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)))
-        list << QLatin1String("WindowsVista");
-#endif
-#if QT_CONFIG(style_android)
-    if (!list.contains(QLatin1String("Android")))
-        list << QLatin1String("Android");
-#endif
 #if QT_CONFIG(style_fusion)
     if (!list.contains(QLatin1String("Fusion")))
         list << QLatin1String("Fusion");
 #endif
-#if QT_CONFIG(style_mac)
-    QString mstyle = QLatin1String("Macintosh");
-# if 0 // Used to be included in Qt4 for Q_WS_MAC
-    mstyle += QLatin1String(" (aqua)");
-# endif
-    if (!list.contains(mstyle))
-        list << mstyle;
-#endif
     return list;
 }