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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: I60fca091b2eac67259580acba5ae934c16d74a83
This commit is contained in:
Orgad Shaneh
2017-11-11 19:54:32 +02:00
parent cb14d74e47 5ca90a4a5e
commit d9cb19b229
51 changed files with 1930 additions and 1642 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.cpp
View File

@@ -64,9 +64,4 @@ QmlProjectEnvironmentAspect::QmlProjectEnvironmentAspect(ProjectExplorer::RunCon
ProjectExplorer::EnvironmentAspect(rc)
{ }
QmlProjectEnvironmentAspect *QmlProjectEnvironmentAspect::create(ProjectExplorer::RunConfiguration *parent) const
{
return new QmlProjectEnvironmentAspect(parent);
}
} // namespace QmlProjectManager

7
src/plugins/qmlprojectmanager/qmlprojectenvironmentaspect.h
View File

@@ -35,11 +35,10 @@ class QmlProjectEnvironmentAspect : public ProjectExplorer::EnvironmentAspect
public:
QmlProjectEnvironmentAspect(ProjectExplorer::RunConfiguration *rc);
QmlProjectEnvironmentAspect *create(ProjectExplorer::RunConfiguration *parent) const;
QList<int> possibleBaseEnvironments() const;
QString baseEnvironmentDisplayName(int base) const;
Utils::Environment baseEnvironment() const;
QList<int> possibleBaseEnvironments() const override;
QString baseEnvironmentDisplayName(int base) const override;
Utils::Environment baseEnvironment() const override;
private:
enum BaseEnvironmentBase {

11
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
View File

@@ -79,17 +79,6 @@ void QmlProjectRunConfiguration::initialize(Id id)
updateEnabledState();
}
void QmlProjectRunConfiguration::copyFrom(const QmlProjectRunConfiguration *source)
{
RunConfiguration::copyFrom(source);
m_currentFileFilename = source->m_currentFileFilename;
m_mainScriptFilename = source->m_mainScriptFilename;
m_scriptFile = source->m_scriptFile;
m_qmlViewerArgs = source->m_qmlViewerArgs;
updateEnabledState();
}
Runnable QmlProjectRunConfiguration::runnable() const
{
StandardRunnable r;

3
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.h
View File

@@ -78,8 +78,7 @@ signals:
private:
void initialize(Core::Id id);
void copyFrom(const QmlProjectRunConfiguration *source);
virtual bool fromMap(const QVariantMap &map) override;
bool fromMap(const QVariantMap &map) override;
void changeCurrentFile(Core::IEditor* = 0);
void updateEnabledState() final;