diff options
| author | Matthew Cattell <matthew.cattell@nokia.com> | 2011-09-09 14:53:01 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-09-09 15:03:21 +0200 |
| commit | a2e68623019cbbeca3c98ce7a6109b7f301ebddf (patch) | |
| tree | f797c4cc4ecb3c0894969441482e350b879320f5 /tools/qmlviewer | |
| parent | 4153ee1b391438d25d0860c5174039f8ad7b8fc5 (diff) | |
partial build fix of qtquick1 autotests
Change-Id: Ic2106ec80e1e5402f4f9bf71cc4cf23ec4657046
Reviewed-on: http://codereview.qt-project.org/4546
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tools/qmlviewer')
| -rw-r--r-- | tools/qmlviewer/qmlruntime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlviewer/qmlruntime.cpp b/tools/qmlviewer/qmlruntime.cpp index c5b94abac7..377dae38ee 100644 --- a/tools/qmlviewer/qmlruntime.cpp +++ b/tools/qmlviewer/qmlruntime.cpp @@ -1182,7 +1182,7 @@ void QDeclarativeViewer::sceneResized(QSize) void QDeclarativeViewer::initialSizeChanged(QSize size) { if (!isFullScreen() && !isMaximized()) { - canvas->setFixedSize(size); + canvas->setGeometry(0,0,size.width(),size.height()); layout()->setSizeConstraint(QLayout::SetFixedSize); layout()->activate(); } @@ -1532,7 +1532,7 @@ void QDeclarativeViewer::updateSizeHints(bool initial) QSize newWindowSize = initial ? initialSize : canvas->sizeHint(); //qWarning() << "USH:" << (initial ? "INIT:" : "V2R:") << "setting fixed size " << newWindowSize; if (!isFullScreen() && !isMaximized()) { - canvas->setFixedSize(newWindowSize); + canvas->setGeometry(0,0,newWindowSize.width(),newWindowSize.height()); resize(1, 1); layout()->setSizeConstraint(QLayout::SetFixedSize); layout()->activate(); |