feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProjectManager: Remove dependency on Debugger

Browse Source 
Change-Id: Ic6e4c66ba2921de7d77e48e62e4d87bd820d9859
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Aurindam Jana
2013-10-15 15:54:34 +02:00
committed by hjk
parent 0cf3ef5926
commit 612528a9f8
5 changed files with 0 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmlprojectmanager/qmlprojectmanager.pro
View File

@@ -11,7 +11,6 @@ HEADERS += qmlproject.h \
qmlprojectconstants.h \ qmlprojectconstants.h \
qmlprojectnodes.h \ qmlprojectnodes.h \
qmlprojectfile.h \ qmlprojectfile.h \
qmlprojectruncontrol.h \
qmlprojectrunconfiguration.h \ qmlprojectrunconfiguration.h \
qmlprojectrunconfigurationfactory.h \ qmlprojectrunconfigurationfactory.h \
qmlprojectmanager_global.h \ qmlprojectmanager_global.h \
@@ -26,7 +25,6 @@ SOURCES += qmlproject.cpp \
qmlprojectmanager.cpp \ qmlprojectmanager.cpp \
qmlprojectnodes.cpp \ qmlprojectnodes.cpp \
qmlprojectfile.cpp \ qmlprojectfile.cpp \
qmlprojectruncontrol.cpp \
qmlprojectrunconfiguration.cpp \ qmlprojectrunconfiguration.cpp \
qmlprojectrunconfigurationfactory.cpp \ qmlprojectrunconfigurationfactory.cpp \
qmlprojectrunconfigurationwidget.cpp \ qmlprojectrunconfigurationwidget.cpp \

1
src/plugins/qmlprojectmanager/qmlprojectmanager_dependencies.pri
View File

@@ -3,5 +3,4 @@ QTC_PLUGIN_DEPENDS += \
coreplugin \ coreplugin \
projectexplorer \ projectexplorer \
qmljstools \ qmljstools \
debugger \
qtsupport qtsupport

2
src/plugins/qmlprojectmanager/qmlprojectplugin.cpp
View File

@@ -31,7 +31,6 @@
#include "qmlprojectmanager.h" #include "qmlprojectmanager.h"
#include "qmlproject.h" #include "qmlproject.h"
#include "qmlprojectrunconfigurationfactory.h" #include "qmlprojectrunconfigurationfactory.h"
#include "qmlprojectruncontrol.h"
#include "qmlapplicationwizard.h" #include "qmlapplicationwizard.h"
#include "fileformat/qmlprojectfileformat.h" #include "fileformat/qmlprojectfileformat.h"
@@ -67,7 +66,6 @@ bool QmlProjectPlugin::initialize(const QStringList &, QString *errorMessage)
addAutoReleasedObject(new Internal::Manager); addAutoReleasedObject(new Internal::Manager);
addAutoReleasedObject(new Internal::QmlProjectRunConfigurationFactory); addAutoReleasedObject(new Internal::QmlProjectRunConfigurationFactory);
addAutoReleasedObject(new Internal::QmlProjectRunControlFactory);
Internal::QmlApplicationWizard::createInstances(this); Internal::QmlApplicationWizard::createInstances(this);

251
src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
View File

@@ -1,251 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/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 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#include "qmlprojectruncontrol.h"
#include "qmlprojectrunconfiguration.h"
#include <debugger/debuggerrunconfigurationaspect.h>
#include <projectexplorer/environmentaspect.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/target.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <utils/qtcprocess.h>
#include <debugger/debuggerrunner.h>
#include <debugger/debuggerplugin.h>
#include <debugger/debuggerstartparameters.h>
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qmlobservertool.h>
#include <qmlprojectmanager/qmlprojectplugin.h>
#include <QTcpServer>
using namespace ProjectExplorer;
namespace QmlProjectManager {
namespace Internal {
QmlProjectRunControl::QmlProjectRunControl(QmlProjectRunConfiguration *runConfiguration, RunMode mode)
: RunControl(runConfiguration, mode)
{
EnvironmentAspect *environment = runConfiguration->extraAspect<EnvironmentAspect>();
if (environment)
m_applicationLauncher.setEnvironment(environment->environment());
m_applicationLauncher.setWorkingDirectory(runConfiguration->workingDirectory());
m_executable = runConfiguration->executable();
m_commandLineArguments = runConfiguration->commandLineArguments();
m_mainQmlFile = runConfiguration->mainScript();
connect(&m_applicationLauncher, SIGNAL(appendMessage(QString,Utils::OutputFormat)),
this, SLOT(slotAppendMessage(QString,Utils::OutputFormat)));
connect(&m_applicationLauncher, SIGNAL(processExited(int,QProcess::ExitStatus)),
this, SLOT(processExited(int,QProcess::ExitStatus)));
connect(&m_applicationLauncher, SIGNAL(bringToForegroundRequested(qint64)),
this, SLOT(slotBringApplicationToForeground(qint64)));
}
QmlProjectRunControl::~QmlProjectRunControl()
{
stop();
}
void QmlProjectRunControl::start()
{
m_applicationLauncher.start(ApplicationLauncher::Gui, m_executable,
m_commandLineArguments);
setApplicationProcessHandle(ProcessHandle(m_applicationLauncher.applicationPID()));
emit started();
QString msg = tr("Starting %1 %2\n")
.arg(QDir::toNativeSeparators(m_executable), m_commandLineArguments);
appendMessage(msg, Utils::NormalMessageFormat);
}
RunControl::StopResult QmlProjectRunControl::stop()
{
m_applicationLauncher.stop();
return StoppedSynchronously;
}
bool QmlProjectRunControl::isRunning() const
{
return m_applicationLauncher.isRunning();
}
QIcon QmlProjectRunControl::icon() const
{
return QIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL));
}
void QmlProjectRunControl::slotBringApplicationToForeground(qint64 pid)
{
bringApplicationToForeground(pid);
}
void QmlProjectRunControl::slotAppendMessage(const QString &line, Utils::OutputFormat format)
{
appendMessage(line, format);
}
void QmlProjectRunControl::processExited(int exitCode,QProcess::ExitStatus status)
{
QString msg;
if (status == QProcess::CrashExit)
msg = tr("%1 crashed\n") .arg(QDir::toNativeSeparators(m_executable));
else
msg = tr("%1 exited with code %2\n")
.arg(QDir::toNativeSeparators(m_executable)).arg(exitCode);
appendMessage(msg, exitCode ? Utils::ErrorMessageFormat : Utils::NormalMessageFormat);
emit finished();
}
QString QmlProjectRunControl::mainQmlFile() const
{
return m_mainQmlFile;
}
QmlProjectRunControlFactory::QmlProjectRunControlFactory(QObject *parent)
: IRunControlFactory(parent)
{
}
QmlProjectRunControlFactory::~QmlProjectRunControlFactory()
{
}
bool QmlProjectRunControlFactory::canRun(RunConfiguration *runConfiguration,
RunMode mode) const
{
QmlProjectRunConfiguration *config =
qobject_cast<QmlProjectRunConfiguration*>(runConfiguration);
if (!config)
return false;
if (mode == NormalRunMode)
return !config->executable().isEmpty();
if (mode != DebugRunMode)
return false;
if (!config->executable().isEmpty())
return true;
if (!config->qtVersion())
return false;
if (!config->qtVersion()->needsQmlDebuggingLibrary())
return true;
if (QtSupport::QmlObserverTool::canBuild(config->qtVersion()))
return true;
return false;
}
RunControl *QmlProjectRunControlFactory::create(RunConfiguration *runConfiguration,
RunMode mode, QString *errorMessage)
{
QTC_ASSERT(canRun(runConfiguration, mode), return 0);
QmlProjectRunConfiguration *config = qobject_cast<QmlProjectRunConfiguration *>(runConfiguration);
QList<ProjectExplorer::RunControl *> runcontrols =
ProjectExplorer::ProjectExplorerPlugin::instance()->runControls();
foreach (ProjectExplorer::RunControl *rc, runcontrols) {
if (QmlProjectRunControl *qrc = qobject_cast<QmlProjectRunControl *>(rc)) {
if (qrc->mainQmlFile() == config->mainScript())
// Asking the user defeats the purpose
// Making it configureable might be worth it
qrc->stop();
}
}
RunControl *runControl = 0;
if (mode == NormalRunMode)
runControl = new QmlProjectRunControl(config, mode);
else if (mode == DebugRunMode)
runControl = createDebugRunControl(config, errorMessage);
return runControl;
}
RunControl *QmlProjectRunControlFactory::createDebugRunControl(QmlProjectRunConfiguration *runConfig, QString *errorMessage)
{
Debugger::DebuggerStartParameters params;
Debugger::DebuggerRunConfigurationAspect *debugger
= runConfig->extraAspect<Debugger::DebuggerRunConfigurationAspect>();
QTC_ASSERT(debugger, return 0);
EnvironmentAspect *environment = runConfig->extraAspect<EnvironmentAspect>();
params.startMode = Debugger::StartInternal;
params.executable = runConfig->executable();
params.processArgs = runConfig->commandLineArguments();
params.workingDirectory = runConfig->workingDirectory();
if (environment)
params.environment = environment->environment();
params.displayName = runConfig->displayName();
params.projectSourceDirectory = runConfig->target()->project()->projectDirectory();
params.projectSourceFiles = runConfig->target()->project()->files(Project::ExcludeGeneratedFiles);
if (debugger->useQmlDebugger()) {
const ProjectExplorer::IDevice::ConstPtr device =
DeviceKitInformation::device(runConfig->target()->kit());
QTC_ASSERT(device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE, return 0);
QTcpServer server;
const bool canListen = server.listen(QHostAddress::LocalHost)
|| server.listen(QHostAddress::LocalHostIPv6);
if (!canListen) {
if (errorMessage)
*errorMessage = tr("Not enough free ports for QML debugging. ");
return 0;
}
params.qmlServerAddress = server.serverAddress().toString();
params.qmlServerPort = server.serverPort();
params.languages |= Debugger::QmlLanguage;
// Makes sure that all bindings go through the JavaScript engine, so that
// breakpoints are actually hit!
const QString optimizerKey = QLatin1String("QML_DISABLE_OPTIMIZER");
if (!params.environment.hasKey(optimizerKey))
params.environment.set(optimizerKey, QLatin1String("1"));
Utils::QtcProcess::addArg(&params.processArgs,
QString::fromLatin1("-qmljsdebugger=port:%1,block").arg(
params.qmlServerPort));
}
if (debugger->useCppDebugger())
params.languages |= Debugger::CppLanguage;
if (params.executable.isEmpty()) {
QmlProjectPlugin::showQmlObserverToolWarning();
errorMessage->clear(); // hack, we already showed a error message
return 0;
}
return Debugger::DebuggerPlugin::createDebugger(params, runConfig, errorMessage);
}
} // namespace Internal
} // namespace QmlProjectManager

88
src/plugins/qmlprojectmanager/qmlprojectruncontrol.h
View File

@@ -1,88 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** 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 Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/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 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
****************************************************************************/
#ifndef QMLPROJECTRUNCONTROL_H
#define QMLPROJECTRUNCONTROL_H
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/applicationlauncher.h>
namespace QmlProjectManager {
class QmlProjectRunConfiguration;
namespace Internal {
class QmlProjectRunControl : public ProjectExplorer::RunControl
{
Q_OBJECT
public:
QmlProjectRunControl(QmlProjectRunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode);
virtual ~QmlProjectRunControl ();
// RunControl
virtual void start();
virtual StopResult stop();
virtual bool isRunning() const;
virtual QIcon icon() const;
QString mainQmlFile() const;
private slots:
void processExited(int exitCode, QProcess::ExitStatus status);
void slotBringApplicationToForeground(qint64 pid);
void slotAppendMessage(const QString &line, Utils::OutputFormat);
private:
ProjectExplorer::ApplicationLauncher m_applicationLauncher;
QString m_executable;
QString m_commandLineArguments;
QString m_mainQmlFile;
};
class QmlProjectRunControlFactory : public ProjectExplorer::IRunControlFactory {
Q_OBJECT
public:
explicit QmlProjectRunControlFactory(QObject *parent = 0);
virtual ~QmlProjectRunControlFactory();
// IRunControlFactory
virtual bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const;
virtual ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
ProjectExplorer::RunMode mode, QString *errorMessage);
private:
ProjectExplorer::RunControl *createDebugRunControl(QmlProjectRunConfiguration *runConfig, QString *errorMessage);
};
} // namespace Internal
} // namespace QmlProjectManager
#endif // QMLPROJECTRUNCONTROL_H