Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	src/s60main/newallocator_hook.cpp
	tools/runonphone/serenum_unix.cpp

1 files changed, 4 insertions, 1 deletions

diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index d994b9b59d..2604f1fddf 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;