Merge master into api_changes

Conflicts:
	src/qml/debugger/qqmlenginedebugservice.cpp
	src/qml/qml/v8/qv8qobjectwrapper.cpp
	src/quick/util/qquickimageprovider.cpp
	tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp

Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb

1 files changed, 5 insertions, 4 deletions

diff --git a/tools/qmlprofiler/qmlprofilerapplication.h b/tools/qmlprofiler/qmlprofilerapplication.h
index 3937db7e5f..c7148880ad 100644
--- a/tools/qmlprofiler/qmlprofilerapplication.h
+++ b/tools/qmlprofiler/qmlprofilerapplication.h
@@ -46,7 +46,8 @@
 #include <QtCore/QProcess>
 #include <QtCore/QTimer>
 
-#include "profileclient.h"
+#include "qmlprofilerclient.h"
+#include "qmlprofilerdata.h"
 
 class QmlProfilerApplication : public QCoreApplication
 {
@@ -104,9 +105,9 @@ private:
     bool m_quitAfterSave;
 
     QQmlDebugConnection m_connection;
-    QmlProfileClient m_qmlProfilerClient;
-    V8ProfileClient m_v8profilerClient;
-    ProfileData m_profileData;
+    QmlProfilerClient m_qmlProfilerClient;
+    V8ProfilerClient m_v8profilerClient;
+    QmlProfilerData m_profilerData;
     QTimer m_connectTimer;
     uint m_connectionAttempts;