From ce04aeb2dcd878f1f7c08b4c58b8904fa020d5fd Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Mon, 23 Feb 2015 11:31:03 +0100 Subject: [PATCH] QmlProfiler: Don't hide/show trace view when loading and saving This was a workaround to compensate for the fact that windows in window containers don't follow the stacking order and thus the state widget wasn't shown. With QQuickWidget we don't need to do this anymore. Change-Id: I2c1e57d891bee6284ef9f033b8747df4b153271b Task-number: QTCREATORBUG-11833 Reviewed-by: Joerg Bornemann --- .../qmlprofiler/qmlprofilertraceview.cpp | 23 +------------------ .../qmlprofiler/qmlprofilertraceview.h | 4 +--- .../qmlprofiler/qmlprofilerviewmanager.cpp | 3 +-- 3 files changed, 3 insertions(+), 27 deletions(-) diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index 4e65b3f2d51..94d71028bcc 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -76,7 +76,6 @@ public: QmlProfilerTraceViewPrivate(QmlProfilerTraceView *qq) : q(qq) {} QmlProfilerTraceView *q; - QmlProfilerStateManager *m_profilerState; QmlProfilerTool *m_profilerTool; QmlProfilerViewManager *m_viewContainer; @@ -90,7 +89,7 @@ public: Timeline::TimelineZoomControl *m_zoomControl; }; -QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *profilerTool, QmlProfilerViewManager *container, QmlProfilerModelManager *modelManager, QmlProfilerStateManager *profilerState) +QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *profilerTool, QmlProfilerViewManager *container, QmlProfilerModelManager *modelManager) : QWidget(parent), d(new QmlProfilerTraceViewPrivate(this)) { setObjectName(QLatin1String("QML Profiler")); @@ -141,9 +140,6 @@ QmlProfilerTraceView::QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *pro // Connect this last so that it's executed after the models have updated their data. connect(modelManager->qmlModel(), SIGNAL(changed()), d->m_modelProxy, SIGNAL(stateChanged())); - connect(d->m_modelManager, SIGNAL(stateChanged()), this, SLOT(profilerDataModelStateChanged())); - - d->m_profilerState = profilerState; // Minimum height: 5 rows of 20 pixels + scrollbar of 50 pixels + 20 pixels margin setMinimumHeight(170); @@ -308,23 +304,6 @@ void QmlProfilerTraceView::showContextMenu(QPoint position) } //////////////////////////////////////////////////////////////// -// Profiler State -void QmlProfilerTraceView::profilerDataModelStateChanged() -{ - switch (d->m_modelManager->state()) { - case QmlProfilerDataState::Empty: break; - case QmlProfilerDataState::ClearingData: - d->m_mainView->hide(); - break; - case QmlProfilerDataState::AcquiringData: break; - case QmlProfilerDataState::ProcessingData: break; - case QmlProfilerDataState::Done: - d->m_mainView->show(); - break; - default: - break; - } -} } // namespace Internal } // namespace QmlProfiler diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.h b/src/plugins/qmlprofiler/qmlprofilertraceview.h index 41a5bbc2cc1..b70de78e947 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.h +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.h @@ -51,8 +51,7 @@ class QmlProfilerTraceView : public QWidget public: explicit QmlProfilerTraceView(QWidget *parent, QmlProfilerTool *profilerTool, QmlProfilerViewManager *container, - QmlProfilerModelManager *modelManager, - QmlProfilerStateManager *profilerState); + QmlProfilerModelManager *modelManager); ~QmlProfilerTraceView(); bool hasValidSelection() const; @@ -68,7 +67,6 @@ public slots: private slots: void updateCursorPosition(); - void profilerDataModelStateChanged(); protected: virtual void contextMenuEvent(QContextMenuEvent *event); diff --git a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp index 234e81e97f6..d5100209ed3 100644 --- a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp @@ -95,8 +95,7 @@ void QmlProfilerViewManager::createViews() d->traceView = new QmlProfilerTraceView(mw, d->profilerTool, this, - d->profilerModelManager, - d->profilerState); + d->profilerModelManager); d->traceView->setWindowTitle(tr("Timeline")); connect(d->traceView, SIGNAL(gotoSourceLocation(QString,int,int)), this, SIGNAL(gotoSourceLocation(QString,int,int)));