forked from qt-creator/qt-creator
Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
125 lines
4.7 KiB
C++
125 lines
4.7 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2015 The Qt Company Ltd.
|
|
** Contact: http://www.qt.io/licensing
|
|
**
|
|
** This file is part of Qt Creator.
|
|
**
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms and
|
|
** conditions see http://www.qt.io/terms-conditions. For further information
|
|
** use the contact form at http://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** In addition, as a special exception, The Qt Company gives you certain additional
|
|
** rights. These rights are described in The Qt Company LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include "androidanalyzesupport.h"
|
|
|
|
#include "androidrunner.h"
|
|
#include "androidmanager.h"
|
|
|
|
#include <analyzerbase/ianalyzertool.h>
|
|
#include <analyzerbase/analyzermanager.h>
|
|
#include <analyzerbase/analyzerruncontrol.h>
|
|
#include <analyzerbase/analyzerstartparameters.h>
|
|
|
|
#include <projectexplorer/target.h>
|
|
#include <projectexplorer/project.h>
|
|
#include <qtsupport/qtkitinformation.h>
|
|
|
|
#include <QDir>
|
|
#include <QTcpServer>
|
|
|
|
using namespace Analyzer;
|
|
using namespace ProjectExplorer;
|
|
|
|
namespace Android {
|
|
namespace Internal {
|
|
|
|
RunControl *AndroidAnalyzeSupport::createAnalyzeRunControl(AndroidRunConfiguration *runConfig,
|
|
RunMode runMode)
|
|
{
|
|
Target *target = runConfig->target();
|
|
AnalyzerStartParameters params;
|
|
params.runMode = runMode;
|
|
params.displayName = AndroidManager::packageName(target);
|
|
params.sysroot = SysRootKitInformation::sysRoot(target->kit()).toString();
|
|
// TODO: Not sure if these are the right paths.
|
|
params.workingDirectory = target->project()->projectDirectory().toString();
|
|
if (runMode == QmlProfilerRunMode) {
|
|
QTcpServer server;
|
|
QTC_ASSERT(server.listen(QHostAddress::LocalHost)
|
|
|| server.listen(QHostAddress::LocalHostIPv6), return 0);
|
|
params.analyzerHost = server.serverAddress().toString();
|
|
params.startMode = StartLocal;
|
|
}
|
|
|
|
AnalyzerRunControl *analyzerRunControl = AnalyzerManager::createRunControl(params, runConfig);
|
|
(void) new AndroidAnalyzeSupport(runConfig, analyzerRunControl);
|
|
return analyzerRunControl;
|
|
}
|
|
|
|
AndroidAnalyzeSupport::AndroidAnalyzeSupport(AndroidRunConfiguration *runConfig,
|
|
AnalyzerRunControl *runControl)
|
|
: QObject(runControl),
|
|
m_qmlPort(0)
|
|
{
|
|
QTC_ASSERT(runControl, return);
|
|
|
|
auto runner = new AndroidRunner(this, runConfig, runControl->runMode());
|
|
|
|
connect(runControl, &AnalyzerRunControl::finished,
|
|
[runner]() { runner->stop(); });
|
|
|
|
connect(runControl, &AnalyzerRunControl::starting,
|
|
[runner]() { runner->start(); });
|
|
|
|
connect(&m_outputParser, &QmlDebug::QmlOutputParser::waitingForConnectionOnPort,
|
|
[this, runControl](quint16) {
|
|
runControl->notifyRemoteSetupDone(m_qmlPort);
|
|
});
|
|
|
|
connect(runner, &AndroidRunner::remoteProcessStarted,
|
|
[this](int, int qmlPort) {
|
|
m_qmlPort = qmlPort;
|
|
});
|
|
|
|
connect(runner, &AndroidRunner::remoteProcessFinished,
|
|
[this, runControl](const QString &errorMsg) {
|
|
runControl->notifyRemoteFinished();
|
|
runControl->appendMessage(errorMsg, Utils::NormalMessageFormat);
|
|
});
|
|
|
|
connect(runner, &AndroidRunner::remoteErrorOutput,
|
|
[this, runControl](const QByteArray &output) {
|
|
const QString msg = QString::fromUtf8(output);
|
|
runControl->logApplicationMessage(msg, Utils::StdErrFormatSameLine);
|
|
m_outputParser.processOutput(msg);
|
|
});
|
|
|
|
connect(runner, &AndroidRunner::remoteOutput,
|
|
[this, runControl](const QByteArray &output) {
|
|
const QString msg = QString::fromUtf8(output);
|
|
runControl->logApplicationMessage(msg, Utils::StdOutFormatSameLine);
|
|
m_outputParser.processOutput(msg);
|
|
});
|
|
}
|
|
|
|
} // namespace Internal
|
|
} // namespace Android
|