diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:23:03 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-28 09:28:31 +0200 |
| commit | b48a13fd6843e12b5725aa3ff0d010007e7c43b4 (patch) | |
| tree | 316cfe36fc67906efcd92ff806c7c0da56ed4f8e /src/widgets/styles | |
| parent | 3398d9d40cb0dae2dc2a1a4f7dc3b4b9cceae903 (diff) | |
| parent | 15fe60cfdada84ea519f08e905d59cc3fb6d20cd (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
examples/examples.pro
tests/auto/corelib/tools/qchar/tst_qchar.cpp
tests/auto/other/qaccessibility/accessiblewidgets.h
Change-Id: I426696c40ab57d14dc295b8103152cede79f244c
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 2b9f042862..260a660bf9 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -77,7 +77,9 @@ #include <qmainwindow.h> #include <qdockwidget.h> #include <qmdisubwindow.h> +#if QT_CONFIG(dialog) #include <qdialog.h> +#endif #include <private/qwidget_p.h> #include <QAbstractSpinBox> #if QT_CONFIG(label) @@ -2820,7 +2822,10 @@ void QStyleSheetStyle::polish(QWidget *w) #ifndef QT_NO_MENUBAR || qobject_cast<QMenuBar *>(w) #endif - || qobject_cast<QDialog *>(w)) { +#if QT_CONFIG(dialog) + || qobject_cast<QDialog *>(w) +#endif + ) { w->setAttribute(Qt::WA_StyledBackground, true); } QWidget *ew = embeddedWidget(w); |