Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (105 commits)
  Fixed compile on Mac.
  Changelog update for 4.7.
  Fix license headers.
  Rename QStaticText::setUseBackendOptimizations to setPerformanceHint()
  doc: Update documentation for QStaticText
  Fixed a compile error on Mac/Leopard.
  Fix alpha check for OpenGL/ES in GL2 paint engine
  Compile fix for QStaticText - include declaration of QColor
  Support Qt::AutoTest in QStaticText::setTextFormat()
  Improved performance of path vs path intersection where one is a rect.
  Separate out textFormat property from setText() function and remove
  Update license doc and .pri file for libpng 1.4.0
  Our modifications to libpng
  Add libpng 1.4.0
  Delete libpng 1.2.40
  Fixes a behaviour for QDockWidget used without QMainWindow
  Replaced the numCopies()/setNumCopies() and actualNumCopies() API.
  Add API for rich text and getting actual size of QStaticText
  Remove fluxuating tests for QStaticText
  Make QStaticText public API again
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/widgets/qdockwidget.cpp b/src/gui/widgets/qdockwidget.cpp
index fdace46..54189de 100644
--- a/src/gui/widgets/qdockwidget.cpp
+++ b/src/gui/widgets/qdockwidget.cpp
@@ -1010,7 +1010,7 @@ void QDockWidgetPrivate::setWindowState(bool floating, bool unplug, const QRect
 
     if (!floating && parent) {
         QMainWindowLayout *mwlayout = qobject_cast<QMainWindowLayout *>(q->parentWidget()->layout());
-        if (!mwlayout || mwlayout->dockWidgetArea(q) == Qt::NoDockWidgetArea)
+        if (mwlayout && mwlayout->dockWidgetArea(q) == Qt::NoDockWidgetArea)
             return; // this dockwidget can't be redocked
     }