diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-24 07:40:21 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-03-24 07:40:21 +0100 |
| commit | 9790d8aa00eba082d82b19a90f8ecd1ebb757a9f (patch) | |
| tree | 8a3fe9b910d12f6a7724f384b2d1d4d960e76ffc /src/plugins/qmlprofiler/qmlprofilertraceview.h | |
| parent | 674b798350868bf0ed7dae18aa5a84398dd6ef80 (diff) | |
| parent | 044eeacde5ee1add8b06a8a53b86fd5c6991d488 (diff) | |
Merge remote-tracking branch 'origin/3.4'
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofilertraceview.h')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertraceview.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.h b/src/plugins/qmlprofiler/qmlprofilertraceview.h index 978095a4d42..d71bdcbed34 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: void changeEvent(QEvent *e) Q_DECL_OVERRIDE; |