diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-23 20:49:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-23 20:49:30 (GMT) |
| commit | 91c85d3ec760e443e103c0df6732f5862b53c4de (patch) | |
| tree | ce1ef3c96d84aed0b972882c2d912cef2499071d /src/gui/styles | |
| parent | e3999a4f91194b7508dbd1d3e6f595f729022ed7 (diff) | |
| parent | 4e3d2f716e89879ce62376450218f7418eccd0aa (diff) | |
| download | Qt-91c85d3ec760e443e103c0df6732f5862b53c4de.zip Qt-91c85d3ec760e443e103c0df6732f5862b53c4de.tar.gz Qt-91c85d3ec760e443e103c0df6732f5862b53c4de.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix warnings in the declarative module
compile fix for mingw (also removes some warnings)
Sort indicators displayed incorrectly in GTK style
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qgtkstyle.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index e2de43a..0d8a589 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -769,9 +769,9 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element, GtkArrowType type = GTK_ARROW_UP; QRect r = header->rect; QImage arrow; - if (header->sortIndicator & QStyleOptionHeader::SortUp) + if (header->sortIndicator & QStyleOptionHeader::SortDown) type = GTK_ARROW_UP; - else if (header->sortIndicator & QStyleOptionHeader::SortDown) + else if (header->sortIndicator & QStyleOptionHeader::SortUp) type = GTK_ARROW_DOWN; gtkPainter.paintArrow(gtkTreeHeader, "button", option->rect.adjusted(1, 1, -1, -1), type, state, |