diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-27 00:25:04 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-05-27 00:25:04 (GMT) |
| commit | fb5d338236976690312660bc017a8fe1e199326f (patch) | |
| tree | f126ea5dfb367fc5212a62652162b84e86513aa4 /tools | |
| parent | 487c05895751985a695f117fd984d1ecfe7b1252 (diff) | |
| parent | 84f35321b867894470391d4997b5d58e34bce0ed (diff) | |
| download | Qt-fb5d338236976690312660bc017a8fe1e199326f.zip Qt-fb5d338236976690312660bc017a8fe1e199326f.tar.gz Qt-fb5d338236976690312660bc017a8fe1e199326f.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
doc/src/declarative/advtutorial.qdoc
Diffstat (limited to 'tools')
| -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())); + } } } } |