diff options
author | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:30:10 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-08-15 16:31:48 +0200 |
commit | 106d3b9bf93325ea93c678270290b2c3dda9b764 (patch) | |
tree | 26c56932d60964c83e81d9c33d6f37ebc36d6c56 /src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h | |
parent | 79f679da9483c12979500dd48bc096d33af9ca6f (diff) | |
parent | 8bebded9ab02b8eec67c44bfddf802d6bf9cda3c (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/plugins/platforms/cocoa/qcocoamenu.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/widgets/styles/qstylehelper_p.h
Change-Id: I54247c98dd79d2b3826fc062b8b11048c9c7d9bb
Diffstat (limited to 'src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h')
-rw-r--r-- | src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h b/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h index 14af2c6bbc..a6744ff915 100644 --- a/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h +++ b/src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h @@ -67,14 +67,20 @@ #include <qradiobutton.h> #include <qlineedit.h> #include <qgroupbox.h> +#if QT_CONFIG(toolbutton) #include <qtoolbutton.h> +#endif #include <qspinbox.h> #include <qtoolbar.h> #if QT_CONFIG(combobox) #include <qcombobox.h> #endif +#if QT_CONFIG(scrollbar) #include <qscrollbar.h> +#endif +#if QT_CONFIG(progressbar) #include <qprogressbar.h> +#endif #if QT_CONFIG(dockwidget) #include <qdockwidget.h> #endif |