diff options
author | hjk <hjk@qt.io> | 2017-06-13 11:43:04 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2017-06-16 12:19:16 +0000 |
commit | 25a75d3fa38e6c61097f4578fddb24a1445eec58 (patch) | |
tree | e024067db767df320b200f7b514e170cf5830f72 /src/plugins/android | |
parent | bb4edc33fd237315aa0c1229b887bf05047dd699 (diff) | |
download | qt-creator-25a75d3fa38e6c61097f4578fddb24a1445eec58.tar.gz |
Debugger, QmlProfiler et al: Replace AnalyzerStartParameter
... and QmlProfilerRunner::Configuaration by PE::UrlConnection,
and call it 'serverUrl' on the user side.
That's the only variant we ever had and avoids "translations"
between three structures that are essential the same.
Change-Id: I33386b2b8d2a7985ff934f6f8f840de0831bf9c1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/android')
-rw-r--r-- | src/plugins/android/androidanalyzesupport.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/plugins/android/androidanalyzesupport.cpp b/src/plugins/android/androidanalyzesupport.cpp index 60074d318b..38d84d4863 100644 --- a/src/plugins/android/androidanalyzesupport.cpp +++ b/src/plugins/android/androidanalyzesupport.cpp @@ -29,7 +29,6 @@ #include "androidmanager.h" #include <debugger/analyzer/analyzermanager.h> -#include <debugger/analyzer/analyzerstartparameters.h> #include <projectexplorer/project.h> #include <projectexplorer/runconfiguration.h> @@ -37,9 +36,6 @@ #include <qtsupport/qtkitinformation.h> -#include <QDir> -#include <QTcpServer> - using namespace Debugger; using namespace ProjectExplorer; @@ -51,16 +47,9 @@ AndroidAnalyzeSupport::AndroidAnalyzeSupport(RunControl *runControl) { setDisplayName("AndroidAnalyzeSupport"); - AnalyzerConnection connection; - if (runMode() == ProjectExplorer::Constants::QML_PROFILER_RUN_MODE) { - QTcpServer server; - QTC_ASSERT(server.listen(QHostAddress::LocalHost) - || server.listen(QHostAddress::LocalHostIPv6), return); - connection.analyzerHost = server.serverAddress().toString(); - } RunConfiguration *runConfig = runControl->runConfiguration(); runControl->setDisplayName(AndroidManager::packageName(runConfig->target())); - runControl->setConnection(connection); + runControl->setConnection(UrlConnection::localHostWithoutPort()); auto runner = new AndroidRunner(runControl); |