diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-05-26 05:16:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-05-26 05:16:51 (GMT) |
| commit | 3449d4594f312728926ac83ae8453bba40434bbd (patch) | |
| tree | d8eea1b22ed4e577c9a0d8248dd2f173b298c8c6 /tools/qml/qmlruntime.cpp | |
| parent | e9a25332df933227c6b71a1654260d8421f56415 (diff) | |
| parent | ef2bc487ab9b66e052920b671e947abc4a6d8ef4 (diff) | |
| download | Qt-3449d4594f312728926ac83ae8453bba40434bbd.zip Qt-3449d4594f312728926ac83ae8453bba40434bbd.tar.gz Qt-3449d4594f312728926ac83ae8453bba40434bbd.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qml/qmlruntime.cpp')
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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())); + } } } } |