diff options
author | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2010-12-22 16:13:30 (GMT) |
---|---|---|
committer | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2010-12-22 16:16:38 (GMT) |
commit | 8a3c4c8283e4762744a29262ce507713565c1c0c (patch) | |
tree | 58dd4f6b14aa353f038032b3c645f4a48704dc33 /src/gui/styles | |
parent | a5110b5d40b70fb44ed98aa8861b676df1e78385 (diff) | |
download | Qt-8a3c4c8283e4762744a29262ce507713565c1c0c.zip Qt-8a3c4c8283e4762744a29262ce507713565c1c0c.tar.gz Qt-8a3c4c8283e4762744a29262ce507713565c1c0c.tar.bz2 |
Fix crash in indeterminate progressbars on windows
Note that this is a surgical fix for 4.7 only.
In 4.8 we will add these checks at the top
of the styling functions or in the widgets instead.
Task-number:QTBUG-15227
Reviewed-by:gabi
Diffstat (limited to 'src/gui/styles')
-rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 5 | ||||
-rw-r--r-- | src/gui/styles/qwindowsstyle.cpp | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index 039a6da..1d7c838 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -1403,8 +1403,9 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, } break; case CE_ProgressBarGroove: - qDrawShadePanel(p, opt->rect, opt->palette, true, 1, - &opt->palette.brush(QPalette::Window)); + if (opt->rect.isValid()) + qDrawShadePanel(p, opt->rect, opt->palette, true, 1, + &opt->palette.brush(QPalette::Window)); break; case CE_ProgressBarLabel: if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) { diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index 654be3c..32a6d8d 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -2397,8 +2397,10 @@ void QWindowsStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPai #ifndef QT_NO_PROGRESSBAR case CE_ProgressBarContents: if (const QStyleOptionProgressBar *pb = qstyleoption_cast<const QStyleOptionProgressBar *>(opt)) { - QRect rect = pb->rect; + if (!rect.isValid()) + return; + bool vertical = false; bool inverted = false; |