QmlProfiler: Unify local and tcp connection mechanism

Use the URL scheme to distinguish between them, check that in
QmlProfilerClientManager and test all possible combinations of URL
parts.

Change-Id: I6583e5bf18eda0344a299a279c12578c4ebc7ffe
Reviewed-by: hjk <hjk@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/plugins/qmlprofiler/qmlprofilerclientmanager.h b/src/plugins/qmlprofiler/qmlprofilerclientmanager.h
index 61a9d17800..c64429abc7 100644
--- a/src/plugins/qmlprofiler/qmlprofilerclientmanager.h
+++ b/src/plugins/qmlprofiler/qmlprofilerclientmanager.h
@@ -47,7 +47,7 @@ public:
     ~QmlProfilerClientManager();
 
     void setProfilerStateManager(QmlProfilerStateManager *profilerState);
-    void setServerUrl(const QUrl &server);
+    void connectToServer(const QUrl &server);
     void clearConnection();
 
     void clearBufferedData();
@@ -58,8 +58,6 @@ public:
 
     void setRetryParams(int interval, int maxAttempts);
     void retryConnect();
-    void connectToTcpServer();
-    void startLocalServer();
 
     void stopRecording();
 
@@ -69,6 +67,9 @@ signals:
     void connectionClosed();
 
 private:
+    void connectToTcpServer();
+    void startLocalServer();
+
     QPointer<QmlProfilerStateManager> m_profilerState;
     QPointer<QmlProfilerModelManager> m_modelManager;
     QScopedPointer<QmlDebug::QmlDebugConnection> m_connection;