whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Oswald Buddenhagen 2013-06-17 13:27:56 +02:00 committed by The Qt Project
parent d4f89b5115
commit 60a5a56359
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/widgets/styles/styles.pri
View File

@ -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