summaryrefslogtreecommitdiffstats
path: root/tools/qmlviewer/qmlviewer.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-11-04 08:57:40 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-11-04 08:57:40 (GMT)
commit5a68fd66f875b994f5a1fcb71334631139ffdddb (patch)
tree453bde8c3dbd3eab8dfe6f36f553a6790b55ea74 /tools/qmlviewer/qmlviewer.cpp
parent9cfd793625e6582d2fe3eaff7d5dfac3a3fcdff6 (diff)
parentd50d1f9e8e8e4e75699baf21a27c03350ab49e27 (diff)
downloadQt-5a68fd66f875b994f5a1fcb71334631139ffdddb.zip
Qt-5a68fd66f875b994f5a1fcb71334631139ffdddb.tar.gz
Qt-5a68fd66f875b994f5a1fcb71334631139ffdddb.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'tools/qmlviewer/qmlviewer.cpp')
-rw-r--r--tools/qmlviewer/qmlviewer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp
index b9f3e67..b6a3627 100644
--- a/tools/qmlviewer/qmlviewer.cpp
+++ b/tools/qmlviewer/qmlviewer.cpp
@@ -366,7 +366,7 @@ QmlViewer::QmlViewer(QWidget *parent, Qt::WindowFlags flags)
void QmlViewer::adjustSizeSlot()
{
- adjustSize();
+ resize(sizeHint());
}
QMenuBar *QmlViewer::menuBar() const
@@ -722,7 +722,7 @@ void QmlViewer::openQml(const QString& file_or_url)
canvas->updateGeometry();
if (mb)
mb->updateGeometry();
- adjustSize();
+ resize(sizeHint());
} else {
if (scaleSkin)
canvas->resize(canvas->sizeHint());