Merge remote-tracking branch 'origin/4.5'

 Conflicts:
	src/plugins/cpptools/clangcompileroptionsbuilder.cpp
	src/plugins/cpptools/clangcompileroptionsbuilder.h
	src/plugins/cpptools/compileroptionsbuilder.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.h
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.h
	src/shared/qbs

Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010

1 files changed, 15 insertions, 4 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
index a7566fd2c0..f64e3c9978 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
@@ -691,9 +691,8 @@ QmlProfilerModelManager::State QmlProfilerModelManager::state() const
     return d->state;
 }
 
-void QmlProfilerModelManager::clear()
+void QmlProfilerModelManager::doClearEvents()
 {
-    setState(ClearingData);
     d->numLoadedEvents = 0;
     d->numFinishedFinalizers = 0;
     d->file.remove();
@@ -702,13 +701,25 @@ void QmlProfilerModelManager::clear()
         d->eventStream.setDevice(&d->file);
     else
         emit error(tr("Cannot open temporary trace file to store events."));
-    d->eventTypes.clear();
-    d->detailsRewriter->clear();
     d->traceTime->clear();
     d->notesModel->clear();
     setVisibleFeatures(0);
     setRecordedFeatures(0);
+}
 
+void QmlProfilerModelManager::clearEvents()
+{
+    setState(ClearingData);
+    doClearEvents();
+    setState(Empty);
+}
+
+void QmlProfilerModelManager::clear()
+{
+    setState(ClearingData);
+    doClearEvents();
+    d->eventTypes.clear();
+    d->detailsRewriter->clear();
     setState(Empty);
 }