diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:37:26 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-20 11:58:32 +0200 |
| commit | 01bc69f99f189b03d0b9cad77cc300798937cad1 (patch) | |
| tree | 730f3b691cfc1830ec617b3c2ad8df16180de724 /src/widgets/styles/qfusionstyle.cpp | |
| parent | c23c4a921d0e9e2d18a62af82d38ca27eac7bcb3 (diff) | |
| parent | 6d699d08200b1fe3a616dfbc275d46c98b77fcbd (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/styles/mac/qmacstyle_mac.mm
src/widgets/util/qcompleter.cpp
src/widgets/widgets/qmainwindowlayout.cpp
src/widgets/widgets/qmdisubwindow.cpp
Change-Id: If0e96981af07ce36ac68f2e69211bc2120f93973
Diffstat (limited to 'src/widgets/styles/qfusionstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qfusionstyle.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/widgets/styles/qfusionstyle.cpp b/src/widgets/styles/qfusionstyle.cpp index f20ffb0f92..074aa3ecec 100644 --- a/src/widgets/styles/qfusionstyle.cpp +++ b/src/widgets/styles/qfusionstyle.cpp @@ -55,7 +55,9 @@ #include <qdir.h> #include <qstyleoption.h> #include <qapplication.h> +#if QT_CONFIG(mainwindow) #include <qmainwindow.h> +#endif #include <qfont.h> #if QT_CONFIG(groupbox) #include <qgroupbox.h> @@ -64,11 +66,15 @@ #if QT_CONFIG(scrollbar) #include <qscrollbar.h> #endif +#if QT_CONFIG(spinbox) #include <qspinbox.h> +#endif #if QT_CONFIG(abstractslider) #include <qabstractslider.h> #endif +#if QT_CONFIG(slider) #include <qslider.h> +#endif #if QT_CONFIG(splitter) #include <qsplitter.h> #endif |