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

QmlProjectRunConfiguration: Derive from LocalApplicationRunConfiguration

Browse Source 
Change-Id: I4a7c29f2f679e62bae6fa3d01983851207e532c8
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Aurindam Jana
2013-10-11 11:20:11 +02:00
committed by hjk
parent a15fec9b9e
commit fc0da55e1f
6 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,7 @@ namespace QmlProjectManager {
const char M_CURRENT_FILE[] = "CurrentFile";
QmlProjectRunConfiguration::QmlProjectRunConfiguration(ProjectExplorer::Target *parent, Id id) :
ProjectExplorer::RunConfiguration(parent, id),
ProjectExplorer::LocalApplicationRunConfiguration(parent, id),
m_scriptFile(QLatin1String(M_CURRENT_FILE)),
m_isEnabled(false)
{
@@ -63,7 +63,7 @@ QmlProjectRunConfiguration::QmlProjectRunConfiguration(ProjectExplorer::Target *
QmlProjectRunConfiguration::QmlProjectRunConfiguration(ProjectExplorer::Target *parent,
QmlProjectRunConfiguration *source) :
ProjectExplorer::RunConfiguration(parent, source),
ProjectExplorer::LocalApplicationRunConfiguration(parent, source),
m_scriptFile(source->m_scriptFile),
m_qmlViewerArgs(source->m_qmlViewerArgs),
m_isEnabled(source->m_isEnabled)
@@ -100,7 +100,7 @@ void QmlProjectRunConfiguration::ctor()
addExtraAspect(new QmlProjectEnvironmentAspect(this));
}
QString QmlProjectRunConfiguration::viewerPath() const
QString QmlProjectRunConfiguration::executable() const
{
QtSupport::BaseQtVersion *version = qtVersion();
if (!version)
@@ -108,25 +108,18 @@ QString QmlProjectRunConfiguration::viewerPath() const
if (id() == Constants::QML_SCENE_RC_ID)
return version->qmlsceneCommand();
else
if (!version->needsQmlDebuggingLibrary())
return version->qmlviewerCommand();
return version->qmlObserverTool();
}
QString QmlProjectRunConfiguration::observerPath() const
ProjectExplorer::LocalApplicationRunConfiguration::RunMode QmlProjectRunConfiguration::runMode() const
{
QtSupport::BaseQtVersion *version = qtVersion();
if (!version) {
return QString();
} else {
if (id() == Constants::QML_SCENE_RC_ID)
return version->qmlsceneCommand();
if (!version->needsQmlDebuggingLibrary())
return version->qmlviewerCommand();
return version->qmlObserverTool();
}
return Gui;
}
QString QmlProjectRunConfiguration::viewerArguments() const
QString QmlProjectRunConfiguration::commandLineArguments() const
{
// arguments in .user file
QString args = m_qmlViewerArgs;
@@ -146,6 +139,16 @@ QString QmlProjectRunConfiguration::viewerArguments() const
return args;
}
QString QmlProjectRunConfiguration::dumperLibrary() const
{
return QString();
}
QStringList QmlProjectRunConfiguration::dumperLibraryLocations() const
{
return QStringList();
}
QString QmlProjectRunConfiguration::workingDirectory() const
{
QFileInfo projectFile(target()->project()->projectFilePath());
@@ -303,8 +306,7 @@ void QmlProjectRunConfiguration::updateEnabled()
qmlFileFound = !mainScript().isEmpty();
}
bool newValue = (QFileInfo(viewerPath()).exists()
|| QFileInfo(observerPath()).exists()) && qmlFileFound;
bool newValue = QFileInfo(executable()).exists() && qmlFileFound;
// Always emit change signal to force reevaluation of run/debug buttons