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

QmlProject: Use new RunConfiguration::setRunnableModifier

Browse Source 
Change-Id: Idb729996b979effc96d97bfe7220668dfb904bb2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-04-13 12:44:42 +02:00
parent 27b4383b31
commit 09d24face0
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -69,15 +69,14 @@ class QmlProjectRunConfiguration final : public RunConfiguration
Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectRunConfiguration) Q_DECLARE_TR_FUNCTIONS(QmlProjectManager::QmlProjectRunConfiguration)
public: public:
QmlProjectRunConfiguration(Target *target, Utils::Id id); QmlProjectRunConfiguration(Target *target, Id id);
private: private:
Runnable runnable() const final;
QString disabledReason() const final; QString disabledReason() const final;
bool isEnabled() const final; bool isEnabled() const final;
QString mainScript() const; QString mainScript() const;
Utils::FilePath qmlScenePath() const; FilePath qmlScenePath() const;
QString commandLineArguments() const; QString commandLineArguments() const;
StringAspect *m_qmlViewerAspect = nullptr; StringAspect *m_qmlViewerAspect = nullptr;
@@ -137,20 +136,15 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(Target *target, Id id)
return envModifier(environment); return envModifier(environment);
}); });
setRunnableModifier([this](Runnable &r) {
const QmlBuildSystem *bs = static_cast<QmlBuildSystem *>(activeBuildSystem());
r.workingDirectory = bs->targetDirectory().toString();
});
setDisplayName(tr("QML Scene", "QMLRunConfiguration display name.")); setDisplayName(tr("QML Scene", "QMLRunConfiguration display name."));
update(); update();
} }
Runnable QmlProjectRunConfiguration::runnable() const
{
Runnable r;
r.setCommandLine(commandLine());
r.environment = aspect<EnvironmentAspect>()->environment();
const QmlBuildSystem *bs = static_cast<QmlBuildSystem *>(activeBuildSystem());
r.workingDirectory = bs->targetDirectory().toString();
return r;
}
QString QmlProjectRunConfiguration::disabledReason() const QString QmlProjectRunConfiguration::disabledReason() const
{ {
if (mainScript().isEmpty()) if (mainScript().isEmpty())