Merge remote-tracking branch 'origin/3.4'

2015-03-24 07:40:21 +01:00
parent 674b798350 044eeacde5
commit 9790d8aa00
103 changed files with 1018 additions and 1167 deletions
--- 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;