diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-23 23:00:13 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-23 23:00:13 (GMT) |
| commit | 8ff74f9008b8846624a9da299beb23949af7c249 (patch) | |
| tree | 18be776689556fadb56a81fd4910b40ff76c9496 /src/gui/styles | |
| parent | 8565d6d123227615312a791ae7acc5b252db264a (diff) | |
| parent | 08f963176b24c4c20a96717ddb2241ba1410b0a1 (diff) | |
| download | Qt-8ff74f9008b8846624a9da299beb23949af7c249.zip Qt-8ff74f9008b8846624a9da299beb23949af7c249.tar.gz Qt-8ff74f9008b8846624a9da299beb23949af7c249.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qcommonstyle.cpp | 5 | ||||
| -rw-r--r-- | src/gui/styles/qwindowsstyle.cpp | 5 |
2 files changed, 7 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 720dd6d..32a6d8d 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -130,6 +130,7 @@ QWindowsStylePrivate::QWindowsStylePrivate() pSHGetStockIconInfo = (PtrSHGetStockIconInfo)shellLib.resolve("SHGetStockIconInfo"); } #endif + startTime.start(); } // Returns true if the toplevel parent of \a widget has seen the Alt-key @@ -2396,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; |