diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp new file mode 100644 index 00000000000..406e906e76a --- /dev/null +++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp @@ -0,0 +1,71 @@ +/**************************************************************************** +** +** 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 "qmlprojectenvironmentaspect.h" + +#include + +namespace QmlProjectManager { + +// -------------------------------------------------------------------- +// QmlProjectEnvironmentAspect: +// -------------------------------------------------------------------- + +QList QmlProjectEnvironmentAspect::possibleBaseEnvironments() const +{ + return QList() << static_cast(SystemEnvironmentBase); +} + +QString QmlProjectEnvironmentAspect::baseEnvironmentDisplayName(int base) const +{ + if (base == static_cast(SystemEnvironmentBase)) + return tr("System Environment"); + return QString(); +} + +Utils::Environment QmlProjectManager::QmlProjectEnvironmentAspect::baseEnvironment() const +{ + return Utils::Environment::systemEnvironment(); +} + +QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc) : + ProjectExplorer::EnvironmentAspect(rc) +{ } + +QmlProjectEnvironmentAspect *QmlProjectEnvironmentAspect::clone(ProjectExplorer::RunConfiguration *parent) const +{ + return new QmlProjectEnvironmentAspect(this, parent); +} + +QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(const QmlProjectManager::QmlProjectEnvironmentAspect *other, + ProjectExplorer::RunConfiguration *parent) : + ProjectExplorer::EnvironmentAspect(other, parent) +{ } + +} // namespace QmlProjectManager diff --git a/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h new file mode 100644 index 00000000000..a0f806ee033 --- /dev/null +++ b/src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** 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 QMLPROJECTENVIRONMENTASPECT_H +#define QMLPROJECTENVIRONMENTASPECT_H + +#include + +namespace QmlProjectManager { + +namespace Internal { class QmlProjectRunControlFactory; } + +class QmlProjectEnvironmentAspect : public ProjectExplorer::EnvironmentAspect +{ + Q_OBJECT + +public: + QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc); + QmlProjectEnvironmentAspect *clone(ProjectExplorer::RunConfiguration *parent) const; + + QList possibleBaseEnvironments() const; + QString baseEnvironmentDisplayName(int base) const; + Utils::Environment baseEnvironment() const; + +private: + enum BaseEnvironmentBase { + SystemEnvironmentBase = 0 + }; + + QmlProjectEnvironmentAspect(const QmlProjectEnvironmentAspect *other, ProjectExplorer::RunConfiguration *parent); +}; + +} // namespace QmlProjectManager + +#endif // QMLPROJECTENVIRONMENTASPECT_H diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro index 56f01001845..468f48f200a 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pro +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pro @@ -5,6 +5,7 @@ include(fileformat/fileformat.pri) DEFINES += QMLPROJECTMANAGER_LIBRARY HEADERS += qmlproject.h \ + qmlprojectenvironmentaspect.h \ qmlprojectplugin.h \ qmlprojectmanager.h \ qmlprojectconstants.h \ @@ -20,6 +21,7 @@ HEADERS += qmlproject.h \ qmlapplicationwizard.h SOURCES += qmlproject.cpp \ + qmlprojectenvironmentaspect.cpp \ qmlprojectplugin.cpp \ qmlprojectmanager.cpp \ qmlprojectnodes.cpp \ diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs index 06527a94628..3779a1cedd4 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs +++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.qbs @@ -28,6 +28,8 @@ QtcPlugin { "qmlproject.h", "qmlproject.qrc", "qmlprojectconstants.h", + "qmlprojectenvironmentaspect.cpp", + "qmlprojectenvironmentaspect.h", "qmlprojectfile.cpp", "qmlprojectfile.h", "qmlprojectmanager.cpp", diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp index 18e92e8b10e..1e7bd342aa6 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp @@ -31,6 +31,7 @@ #include "qmlproject.h" #include "qmlprojectmanagerconstants.h" #include "qmlprojectrunconfigurationwidget.h" +#include "qmlprojectenvironmentaspect.h" #include #include #include @@ -101,10 +102,8 @@ void QmlProjectRunConfiguration::ctor() setDisplayName(tr("QML Scene", "QMLRunConfiguration display name.")); else setDisplayName(tr("QML Viewer", "QMLRunConfiguration display name.")); -} -QmlProjectRunConfiguration::~QmlProjectRunConfiguration() -{ + addExtraAspect(new QmlProjectEnvironmentAspect(this)); } QString QmlProjectRunConfiguration::viewerPath() const diff --git a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h index b237341b76b..2bc2e894c0b 100644 --- a/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h +++ b/src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h @@ -33,6 +33,7 @@ #include "qmlprojectmanager_global.h" #include +#include #include @@ -66,7 +67,6 @@ class QMLPROJECTMANAGER_EXPORT QmlProjectRunConfiguration : public ProjectExplor public: QmlProjectRunConfiguration(ProjectExplorer::Target *parent, Core::Id id); - virtual ~QmlProjectRunConfiguration(); QString viewerPath() const; QString observerPath() const;