Widgets/Stylesheets: compile without FEATURE_style_stylesheet
Make sure to not compile the stylesheet sources when FEATURE_style_stylesheet is disabled, also don't include the relevant headers in this case. Fixes: QTBUG-136341 Change-Id: I4fc2de2fcba004b93140809ef79374401209f14a Reviewed-by: Axel Spoerl <axel.spoerl@qt.io> (cherry picked from commit e57fff63419867d59b6067fc1a5a3495678708dc) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
e7247e9acd
commit
0f88982f08
@ -43,8 +43,6 @@ qt_internal_add_module(Widgets
|
||||
styles/qstyleoption.cpp styles/qstyleoption.h
|
||||
styles/qstylepainter.cpp styles/qstylepainter.h
|
||||
styles/qstyleplugin.cpp styles/qstyleplugin.h
|
||||
styles/qstylesheetstyle.cpp styles/qstylesheetstyle_p.h
|
||||
styles/qstylesheetstyle_default.cpp
|
||||
util/qcolormap.cpp util/qcolormap.h
|
||||
util/qsystemtrayicon.cpp util/qsystemtrayicon.h util/qsystemtrayicon_p.h
|
||||
widgets/qabstractscrollarea.cpp widgets/qabstractscrollarea.h widgets/qabstractscrollarea_p.h
|
||||
@ -425,6 +423,12 @@ qt_internal_extend_target(Widgets CONDITION QT_FEATURE_animation
|
||||
styles/qstyleanimation.cpp styles/qstyleanimation_p.h
|
||||
)
|
||||
|
||||
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_stylesheet
|
||||
SOURCES
|
||||
styles/qstylesheetstyle.cpp styles/qstylesheetstyle_p.h
|
||||
styles/qstylesheetstyle_default.cpp
|
||||
)
|
||||
|
||||
qt_internal_extend_target(Widgets CONDITION QT_FEATURE_style_windows
|
||||
SOURCES
|
||||
styles/qwindowsstyle.cpp styles/qwindowsstyle_p.h
|
||||
|
@ -33,7 +33,9 @@
|
||||
#include "private/qguiapplication_p.h"
|
||||
#include "qcolormap.h"
|
||||
#include "qdebug.h"
|
||||
#if QT_CONFIG(style_stylesheet)
|
||||
#include "private/qstylesheetstyle_p.h"
|
||||
#endif
|
||||
#include "private/qstyle_p.h"
|
||||
#if QT_CONFIG(messagebox)
|
||||
#include "qmessagebox.h"
|
||||
|
@ -16,7 +16,9 @@
|
||||
#include <qdebug.h>
|
||||
#include <qpa/qplatformscreen.h>
|
||||
#include <qpa/qplatformcursor.h>
|
||||
#if QT_CONFIG(style_stylesheet)
|
||||
#include <private/qstylesheetstyle_p.h>
|
||||
#endif
|
||||
|
||||
#include <qlabel.h>
|
||||
#include <QtWidgets/private/qlabel_p.h>
|
||||
|
@ -36,7 +36,9 @@
|
||||
#include "qwhatsthis.h"
|
||||
#endif
|
||||
#include "qdebug.h"
|
||||
#if QT_CONFIG(style_stylesheet)
|
||||
#include "private/qstylesheetstyle_p.h"
|
||||
#endif
|
||||
#include "private/qstyle_p.h"
|
||||
#include "qfileinfo.h"
|
||||
#include "qscopeguard.h"
|
||||
|
@ -17,7 +17,6 @@
|
||||
#include <qdebug.h>
|
||||
|
||||
#include <private/qwidgetresizehandler_p.h>
|
||||
#include <private/qstylesheetstyle_p.h>
|
||||
#include <qpa/qplatformtheme.h>
|
||||
|
||||
#include <private/qhighdpiscaling_p.h>
|
||||
|
@ -8,9 +8,11 @@
|
||||
#include "qstyleoption.h"
|
||||
#include "qlabel_p.h"
|
||||
#include "private/qhexstring_p.h"
|
||||
#include "private/qstylesheetstyle_p.h"
|
||||
#include <qmath.h>
|
||||
|
||||
#if QT_CONFIG(style_stylesheet)
|
||||
#include "private/qstylesheetstyle_p.h"
|
||||
#endif
|
||||
#if QT_CONFIG(abstractbutton)
|
||||
#include "qabstractbutton.h"
|
||||
#endif
|
||||
|
@ -41,8 +41,9 @@
|
||||
#if QT_CONFIG(itemviews)
|
||||
#include "qabstractitemview.h"
|
||||
#endif
|
||||
#if QT_CONFIG(style_stylesheet)
|
||||
#include "private/qstylesheetstyle_p.h"
|
||||
|
||||
#endif
|
||||
#if QT_CONFIG(shortcut)
|
||||
#include "private/qapplication_p.h"
|
||||
#include "private/qshortcutmap_p.h"
|
||||
|
Loading…
x
Reference in New Issue
Block a user