diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-27 06:05:32 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-27 06:05:32 (GMT) |
commit | d53e4499f864719446abdb7fdeff433dbb3f7d98 (patch) | |
tree | c029e4805b6a9456562b1cc5c5f97e444a836aac | |
parent | e912fd855706aba438880214fe42737b85c21a4a (diff) | |
download | Qt-d53e4499f864719446abdb7fdeff433dbb3f7d98.zip Qt-d53e4499f864719446abdb7fdeff433dbb3f7d98.tar.gz Qt-d53e4499f864719446abdb7fdeff433dbb3f7d98.tar.bz2 |
Remove qmlviewer's sizeHint hack.
-rw-r--r-- | tools/qmlviewer/qmlviewer.cpp | 12 | ||||
-rw-r--r-- | tools/qmlviewer/qmlviewer.h | 1 |
2 files changed, 0 insertions, 13 deletions
diff --git a/tools/qmlviewer/qmlviewer.cpp b/tools/qmlviewer/qmlviewer.cpp index 2ef5616..75a8f1c 100644 --- a/tools/qmlviewer/qmlviewer.cpp +++ b/tools/qmlviewer/qmlviewer.cpp @@ -163,18 +163,6 @@ QMenuBar *QmlViewer::menuBar() const return mb; } -QSize QmlViewer::sizeHint() const -{ - if (skin) - return QWidget::sizeHint(); - else { - // Kludge to force QMainWindow to be EXACTLY the right size for the canvas. - QSize sh = canvas->sizeHint(); - sh.setHeight(sh.height()+menuBar()->sizeHint().height()); - return sh; - } -} - void QmlViewer::createMenu(QMenuBar *menu, QMenu *flatmenu) { QObject *parent = flatmenu ? (QObject*)flatmenu : (QObject*)menu; diff --git a/tools/qmlviewer/qmlviewer.h b/tools/qmlviewer/qmlviewer.h index 04d94cc..45ec446 100644 --- a/tools/qmlviewer/qmlviewer.h +++ b/tools/qmlviewer/qmlviewer.h @@ -44,7 +44,6 @@ public: void setCacheEnabled(bool); void addLibraryPath(const QString& lib); - QSize sizeHint() const; QMenuBar *menuBar() const; public slots: |