From f4b4994f4b9a84afcc0906505c8c515a6d6cb27b Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@digia.com>
Date: Fri, 10 Jan 2014 11:54:29 +0100
Subject: [PATCH] QmlProfiler: Remove some dead code and make sizing more
consistent.
Change-Id: Iaff416c1af61e20e47309b7ec34bf4ab0d3f4267
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
index 15734d2b594..164e91c6d63 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
@@ -117,6 +117,7 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, Analyzer::IAnalyzerT
d->m_mainView = new QQuickView();
d->m_mainView->setResizeMode(QQuickView::SizeRootObjectToView);
QWidget *mainViewContainer = QWidget::createWindowContainer(d->m_mainView);
+ mainViewContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QHBoxLayout *toolsLayout = new QHBoxLayout;
@@ -130,7 +131,7 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, Analyzer::IAnalyzerT
d->m_overview->setResizeMode(QQuickView::SizeRootObjectToView);
QWidget *overviewContainer = QWidget::createWindowContainer(d->m_overview);
overviewContainer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
- overviewContainer->setMaximumHeight(50);
+ overviewContainer->setFixedHeight(50);
toolsLayout->addWidget(createToolbar());
toolsLayout->addWidget(timeBarContainer);
@@ -400,12 +401,6 @@ void QmlProfilerTraceView::updateToolTip(const QString &text)
void QmlProfilerTraceView::resizeEvent(QResizeEvent *event)
{
QWidget::resizeEvent(event);
- QQuickItem *rootObject = d->m_mainView->rootObject();
- if (rootObject) {
- rootObject->setProperty("width", QVariant(event->size().width()));
- int newHeight = event->size().height() - d->m_timebar->height() - d->m_overview->height();
- rootObject->setProperty("candidateHeight", QVariant(newHeight));
- }
emit resized();
}
--
GitLab