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:
  QPainter not restored correctly in Graphics View.
  Setting QGraphicsItem::ItemClipsChildrenToShape forces ItemClipsToShape
  Fix compilation
  Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.
  Fix warning on MSVC
  QThread: make sure start works even if called after exit
  Revert "Fixed painter path drawing on FBO without stencil buffer."
  Fix a crash with D&d on mingw
  Revert "Keep other text format with QTextOption::SuppressColors tag on"
  Fixed stencil buffer on FBOs with OpenGL ES.
  Keep other text format with QTextOption::SuppressColors tag on
  QTreeView: do not scroll to top if last item is removed

2 files changed, 4 insertions, 0 deletions

diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 2824e15..a7601b6 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -514,6 +514,8 @@ void QThread::start(Priority priority)
     d->running = true;
     d->finished = false;
     d->terminated = false;
+    d->returnCode = 0;
+    d->exited = false;
 
     pthread_attr_t attr;
     pthread_attr_init(&attr);
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 37d5b87..f0cbe8d 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -405,6 +405,8 @@ void QThread::start(Priority priority)
     d->running = true;
     d->finished = false;
     d->terminated = false;
+    d->exited = false;
+    d->returnCode = 0;
 
     /*
       NOTE: we create the thread in the suspended state, set the