diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index b77339b40f9..631bc3f59ee 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -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 diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index db88c85990e..c01ae29c680 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -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" diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 263af37b1a8..12ba8ae545b 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -16,7 +16,9 @@ #include #include #include +#if QT_CONFIG(style_stylesheet) #include +#endif #include #include diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 3d05dca4629..f36d7f094dd 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -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" diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 4387b7626a7..33e9c8f3e88 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index d243a671da5..a71faa77782 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -8,9 +8,11 @@ #include "qstyleoption.h" #include "qlabel_p.h" #include "private/qhexstring_p.h" -#include "private/qstylesheetstyle_p.h" #include +#if QT_CONFIG(style_stylesheet) +#include "private/qstylesheetstyle_p.h" +#endif #if QT_CONFIG(abstractbutton) #include "qabstractbutton.h" #endif diff --git a/src/widgets/widgets/qlineedit.cpp b/src/widgets/widgets/qlineedit.cpp index 5b483301688..2f68ad5d4d5 100644 --- a/src/widgets/widgets/qlineedit.cpp +++ b/src/widgets/widgets/qlineedit.cpp @@ -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"