Commit 2dc7b288 authored by Tobias Hunger's avatar Tobias Hunger

Qbs: Add QbsRunConfiguration

Change-Id: Ibb5791e10ee2e08ef824fb0bad3d3f4769ee2adb
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 9cfa79a1
......@@ -55,6 +55,15 @@ static Core::Id genericQbsDeployConfigurationId()
// QbsDeployConfiguration:
// --------------------------------------------------------------------
QbsInstallStep *QbsDeployConfiguration::qbsInstallStep() const
{
foreach (ProjectExplorer::BuildStep *bs, stepList()->steps()) {
if (QbsInstallStep *install = qobject_cast<QbsInstallStep *>(bs))
return install;
}
return 0;
}
QbsDeployConfiguration::QbsDeployConfiguration(ProjectExplorer::Target *target, const Core::Id id) :
ProjectExplorer::DeployConfiguration(target, id)
{ }
......
......@@ -33,14 +33,20 @@
#include <projectexplorer/deployconfiguration.h>
namespace QbsProjectManager {
namespace Internal {
class QbsDeployConfigurationFactory;
class QbsInstallStep;
class QbsDeployConfiguration : public ProjectExplorer::DeployConfiguration
{
Q_OBJECT
public:
QbsInstallStep *qbsInstallStep() const;
private:
QbsDeployConfiguration(ProjectExplorer::Target *target, const Core::Id id);
QbsDeployConfiguration(ProjectExplorer::Target *target,
......
......@@ -270,6 +270,9 @@ void QbsProject::handleQbsParsingDone(bool success)
updateCppCodeModel(m_rootProjectNode->projectData());
updateQmlJsCodeModel(m_rootProjectNode->projectData());
foreach (ProjectExplorer::Target *t, targets())
t->updateDefaultRunConfigurations();
emit projectParsingDone(success);
}
......
......@@ -29,6 +29,7 @@ HEADERS = \
qbsprojectmanager_global.h \
qbsprojectmanagerconstants.h \
qbsprojectmanagerplugin.h \
qbsrunconfiguration.h \
qbsstep.h
SOURCES = \
......@@ -45,6 +46,7 @@ SOURCES = \
qbsprojectfile.cpp \
qbsprojectmanager.cpp \
qbsprojectmanagerplugin.cpp \
qbsrunconfiguration.cpp \
qbsstep.cpp
FORMS = \
......
......@@ -80,6 +80,8 @@ QtcPlugin {
"qbsprojectmanagerconstants.h",
"qbsprojectmanagerplugin.cpp",
"qbsprojectmanagerplugin.h",
"qbsrunconfiguration.cpp",
"qbsrunconfiguration.h",
"qbsstep.cpp",
"qbsstep.h",
"qbsstepconfigwidget.ui"
......
......@@ -37,6 +37,7 @@
#include "qbsproject.h"
#include "qbsprojectmanager.h"
#include "qbsprojectmanagerconstants.h"
#include "qbsrunconfiguration.h"
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/actionmanager.h>
......@@ -85,6 +86,7 @@ bool QbsProjectManagerPlugin::initialize(const QStringList &arguments, QString *
addAutoReleasedObject(new QbsCleanStepFactory);
addAutoReleasedObject(new QbsInstallStepFactory);
addAutoReleasedObject(new QbsDeployConfigurationFactory);
addAutoReleasedObject(new QbsRunConfigurationFactory);
//menus
// Build Menu:
......
This diff is collapsed.
/****************************************************************************
**
** 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 QBSRUNCONFIGURATION_H
#define QBSRUNCONFIGURATION_H
#include <projectexplorer/localapplicationrunconfiguration.h>
#include <QStringList>
#include <QLabel>
#include <QWidget>
QT_BEGIN_NAMESPACE
class QCheckBox;
class QLineEdit;
class QRadioButton;
class QComboBox;
QT_END_NAMESPACE
namespace Utils {
class PathChooser;
class DetailsWidget;
}
namespace ProjectExplorer { class BuildStepList; }
namespace QbsProjectManager {
class QbsProject;
namespace Internal {
class QbsInstallStep;
class QbsRunConfigurationFactory;
class QbsRunConfiguration : public ProjectExplorer::LocalApplicationRunConfiguration
{
Q_OBJECT
// to change the display name and arguments and set the userenvironmentchanges
friend class QbsRunConfigurationWidget;
friend class QbsRunConfigurationFactory;
public:
QbsRunConfiguration(ProjectExplorer::Target *parent, Core::Id id);
bool isEnabled() const;
QString disabledReason() const;
QWidget *createConfigurationWidget();
QString executable() const;
RunMode runMode() const;
bool forcedGuiMode() const;
QString workingDirectory() const;
QString commandLineArguments() const;
QString dumperLibrary() const;
QStringList dumperLibraryLocations() const;
QVariantMap toMap() const;
Utils::OutputFormatter *createOutputFormatter() const;
void setRunMode(RunMode runMode);
void addToBaseEnvironment(Utils::Environment &env) const;
signals:
void commandLineArgumentsChanged(const QString&);
void baseWorkingDirectoryChanged(const QString&);
void runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode);
void targetInformationChanged();
void usingDyldImageSuffixChanged(bool);
protected:
QbsRunConfiguration(ProjectExplorer::Target *parent, QbsRunConfiguration *source);
bool fromMap(const QVariantMap &map);
private slots:
void installStepChanged();
private:
void setBaseWorkingDirectory(const QString &workingDirectory);
QString baseWorkingDirectory() const;
void setCommandLineArguments(const QString &argumentsString);
QString rawCommandLineArguments() const;
QString defaultDisplayName();
QString installRoot() const;
void ctor();
void updateTarget();
QString m_product;
QString m_commandLineArguments;
// Cached startup sub project information
ProjectExplorer::LocalApplicationRunConfiguration::RunMode m_runMode;
bool m_forcedGuiMode;
bool m_userSetName;
QString m_userWorkingDirectory;
QbsInstallStep *m_currentInstallStep;
ProjectExplorer::BuildStepList *m_currentBuildStepList;
};
class QbsRunConfigurationWidget : public QWidget
{
Q_OBJECT
public:
QbsRunConfigurationWidget(QbsRunConfiguration *rc, QWidget *parent);
private slots:
void runConfigurationEnabledChange();
void workDirectoryEdited();
void workingDirectoryReseted();
void argumentsEdited(const QString &arguments);
void environmentWasChanged();
void workingDirectoryChanged(const QString &workingDirectory);
void commandLineArgumentsChanged(const QString &args);
void runModeChanged(ProjectExplorer::LocalApplicationRunConfiguration::RunMode runMode);
void termToggled(bool);
private slots:
void targetInformationHasChanged();
private:
QbsRunConfiguration *m_rc;
bool m_ignoreChange;
QLabel *m_disabledIcon;
QLabel *m_disabledReason;
QLineEdit *m_executableLineEdit;
Utils::PathChooser *m_workingDirectoryEdit;
QLineEdit *m_argumentsLineEdit;
QCheckBox *m_useTerminalCheck;
QCheckBox *m_usingDyldImageSuffix;
QLineEdit *m_qmlDebugPort;
Utils::DetailsWidget *m_detailsContainer;
bool m_isShown;
};
class QbsRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory
{
Q_OBJECT
public:
explicit QbsRunConfigurationFactory(QObject *parent = 0);
~QbsRunConfigurationFactory();
bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const;
ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source);
QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
QString displayNameForId(const Core::Id id) const;
private:
bool canHandle(ProjectExplorer::Target *t) const;
ProjectExplorer::RunConfiguration *doCreate(ProjectExplorer::Target *parent, const Core::Id id);
ProjectExplorer::RunConfiguration *doRestore(ProjectExplorer::Target *parent,
const QVariantMap &map);
};
} // namespace Internal
} // namespace QbsProjectManager
#endif // QBSRUNCONFIGURATION_H
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment