diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-06-17 13:27:56 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-19 20:02:59 +0200 |
| commit | 60a5a56359670c276aa6810a1b595c42e9e81a73 (patch) | |
| tree | 76cd5cc42f3cc85b4a0533e242db20af540088ae /src/widgets | |
| parent | d4f89b5115a0a9dcaf9d0d9973ea8562c2e41f91 (diff) | |
fix auto-enabling of windows style
it needs to come after the vista and xp style blocks.
Change-Id: I66b5c1eff41b19a76802a77b6926552d7343b29c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/styles/styles.pri | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/styles/styles.pri b/src/widgets/styles/styles.pri index 6a5565a8eb..3707090c4c 100644 --- a/src/widgets/styles/styles.pri +++ b/src/widgets/styles/styles.pri @@ -58,14 +58,6 @@ contains( styles, mac ) { DEFINES += QT_NO_STYLE_MAC } -contains( styles, windows ) { - HEADERS += styles/qwindowsstyle_p.h - HEADERS += styles/qwindowsstyle_p_p.h - SOURCES += styles/qwindowsstyle.cpp -} else { - DEFINES += QT_NO_STYLE_WINDOWS -} - contains( styles, windowsvista ) { HEADERS += styles/qwindowsvistastyle_p.h HEADERS += styles/qwindowsvistastyle_p_p.h @@ -90,6 +82,14 @@ contains( styles, windowsxp ) { DEFINES += QT_NO_STYLE_WINDOWSXP } +contains( styles, windows ) { + HEADERS += styles/qwindowsstyle_p.h + HEADERS += styles/qwindowsstyle_p_p.h + SOURCES += styles/qwindowsstyle.cpp +} else { + DEFINES += QT_NO_STYLE_WINDOWS +} + contains( styles, gtk ) { HEADERS += styles/qgtkglobal_p.h HEADERS += styles/qgtkstyle_p.h |