diff options
author | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
---|---|---|
committer | Darrell Anderson <[email protected]> | 2012-08-03 08:49:35 -0500 |
commit | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch) | |
tree | 3de07468347367bdef8e6c0d765bdb209585a189 /src/styles | |
parent | da067173fd2ab6bca5943294a439c4992323227a (diff) | |
parent | ebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff) | |
download | qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/styles')
-rw-r--r-- | src/styles/qcommonstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp index faf3649..6e89845 100644 --- a/src/styles/qcommonstyle.cpp +++ b/src/styles/qcommonstyle.cpp @@ -1019,7 +1019,7 @@ void QCommonStyle::drawControl( ControlElement element, if (! toolbutton->isEnabled()) mode = QIconSet::Disabled; else if (flags & (Style_Down | Style_On) || - (flags & Style_Raised) && (flags & Style_AutoRaise)) + ((flags & Style_Raised) && (flags & Style_AutoRaise))) mode = QIconSet::Active; else mode = QIconSet::Normal; |