From 4f3249f32dbe5c20aabbfd9b4f9c558aaf449e48 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 27 Feb 2017 18:39:44 -0800 Subject: 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 Reviewed-by: Gabriel de Dietrich --- src/widgets/styles/styles.pri | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'src/widgets/styles/styles.pri') diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri index 4c13311ebc..0c0f8b7bc7 100644 --- a/src/widgets/styles/styles.pri +++ b/src/widgets/styles/styles.pri @@ -37,22 +37,6 @@ RESOURCES += styles/qstyle.qrc include($$OUT_PWD/qtwidgets-config.pri) -qtConfig(style-mac) { - HEADERS += \ - styles/qmacstyle_mac_p.h \ - styles/qmacstyle_mac_p_p.h - OBJECTIVE_SOURCES += styles/qmacstyle_mac.mm - LIBS_PRIVATE += -framework Carbon -} - -qtConfig(style-windowsvista) { - HEADERS += styles/qwindowsvistastyle_p.h styles/qwindowsvistastyle_p_p.h - SOURCES += styles/qwindowsvistastyle.cpp - - HEADERS += styles/qwindowsxpstyle_p.h styles/qwindowsxpstyle_p_p.h - SOURCES += styles/qwindowsxpstyle.cpp -} - qtConfig(style-windows) { HEADERS += styles/qwindowsstyle_p.h styles/qwindowsstyle_p_p.h SOURCES += styles/qwindowsstyle.cpp @@ -62,8 +46,3 @@ qtConfig(style-fusion) { HEADERS += styles/qfusionstyle_p.h styles/qfusionstyle_p_p.h SOURCES += styles/qfusionstyle.cpp } - -qtConfig(style-android) { - HEADERS += styles/qandroidstyle_p.h - SOURCES += styles/qandroidstyle.cpp -} -- cgit v1.2.3