From ffe4ddf0b252fe708a45302ff3ab6d736b609cd3 Mon Sep 17 00:00:00 2001
From: Christiaan Janssen <christiaan.janssen@nokia.com>
Date: Fri, 17 Feb 2012 18:13:50 +0100
Subject: [PATCH] QmlProfiler: fixed error in 1322a73efdc caused by rebasing
 585e651310

Change-Id: I6874eeed4d173d566998419b8349bcfc69b14bdb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
---
 src/plugins/qmlprofiler/tracewindow.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/qmlprofiler/tracewindow.h b/src/plugins/qmlprofiler/tracewindow.h
index 85acd2ad687..2959720db64 100644
--- a/src/plugins/qmlprofiler/tracewindow.h
+++ b/src/plugins/qmlprofiler/tracewindow.h
@@ -112,6 +112,7 @@ public:
 public slots:
     void clearDisplay();
     void selectNextEvent(int eventId);
+    void applicationDied();
 
 private slots:
     void updateCursorPosition();
@@ -133,7 +134,6 @@ private slots:
     void eventListStateChanged();
     void manageTraceStart(qint64 traceStart);
     void firstDataReceived();
-    void applicationDied();
     void correctTimer();
 
 signals:
-- 
GitLab