diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-06-27 16:45:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-18 17:10:13 +0000 |
| commit | 98ddf9262e356178ddcf26b72e375c99cec16b79 (patch) | |
| tree | 250e11c9d67fb9f57eb3b95676d69b660f2cf2db /src/widgets | |
| parent | 27b03be893be0b50e031cc3588caed081030a977 (diff) | |
Revamp configure system for widget styles
Add [-no]-style-foo command line options for all widget styles, bringing
this closer in line with configure.exe. Add proper platform dependencies
and a configure test for the required uxtheme.h header on Windows. Clean
up and simplify styles.pri. Don't let configure.exe define QT_NO_STYLE_*
any more, as styles.pri does that locally anyway.
Change-Id: I81341f887a65b4e45e77380974eb79743acfad77
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/styles/styles.pri | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri index 1805e4a8af..7b9497172c 100644 --- a/src/widgets/styles/styles.pri +++ b/src/widgets/styles/styles.pri @@ -35,12 +35,6 @@ SOURCES += \ RESOURCES += styles/qstyle.qrc -contains( styles, all ) { - styles = fusion mac windows windowsxp windowsvista -} - -!macx:styles -= mac - contains( styles, mac ) { HEADERS += \ styles/qmacstyle_mac_p.h \ @@ -55,10 +49,6 @@ contains( styles, windowsvista ) { HEADERS += styles/qwindowsvistastyle_p.h HEADERS += styles/qwindowsvistastyle_p_p.h SOURCES += styles/qwindowsvistastyle.cpp - !contains( styles, windowsxp ) { - message( windowsvista requires windowsxp ) - styles += windowsxp - } } else { DEFINES += QT_NO_STYLE_WINDOWSVISTA } @@ -67,10 +57,6 @@ contains( styles, windowsxp ) { HEADERS += styles/qwindowsxpstyle_p.h HEADERS += styles/qwindowsxpstyle_p_p.h SOURCES += styles/qwindowsxpstyle.cpp - !contains( styles, windows ) { - message( windowsxp requires windows ) - styles += windows - } } else { DEFINES += QT_NO_STYLE_WINDOWSXP } |