From dc08c8bc7aba55ff4762d70b193a053ad210fb60 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Wed, 26 May 2010 14:31:08 +1000
Subject: Fix for qml reloaded in qml viewer not being maximized properly on a
 device

Task-number:
Reviewed-by: Martin Jones
---
 tools/qml/qmlruntime.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 5308e98..fe323c1 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -808,7 +808,9 @@ void QDeclarativeViewer::statusChanged()
         initialSize = canvas->sizeHint();
         if (canvas->resizeMode() == QDeclarativeView::SizeRootObjectToView) {
             updateSizeHints();
-            resize(QSize(initialSize.width(), initialSize.height()+menuBarHeight()));
+            if (!isFullScreen() && !isMaximized()) {
+                resize(QSize(initialSize.width(), initialSize.height()+menuBarHeight()));
+            }
         }
     }
 }
-- 
cgit v0.12