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

QmlProject: Support both qmlscene and qmlviewer in run configuration

Browse Source 
Provide both qmlviewer and qmlscene as run configurations if the active
Qt version is 5.0.0.

Change-Id: Iaff1361921bdd2d6b2256c4c4cb51e96802c2519
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2012-08-23 14:53:03 +02:00
parent 4dd31391a2
commit 6a92ea63e8
4 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,8 +57,9 @@ namespace QmlProjectManager {
const char * const M_CURRENT_FILE = "CurrentFile";
QmlProjectRunConfiguration::QmlProjectRunConfiguration(ProjectExplorer::Target *parent) :
ProjectExplorer::RunConfiguration(parent, Core::Id(Constants::QML_RC_ID)),
QmlProjectRunConfiguration::QmlProjectRunConfiguration(ProjectExplorer::Target *parent,
Core::Id id) :
ProjectExplorer::RunConfiguration(parent, id),
m_scriptFile(M_CURRENT_FILE),
m_isEnabled(false)
{
@@ -84,7 +85,7 @@ bool QmlProjectRunConfiguration::isEnabled() const
QString QmlProjectRunConfiguration::disabledReason() const
{
if (!m_isEnabled)
return tr("No qmlviewer or qmlobserver found.");
return tr("No qmlviewer or qmlscene found.");
return QString();
}
@@ -101,7 +102,10 @@ void QmlProjectRunConfiguration::ctor()
connect(target(), SIGNAL(profileChanged()),
this, SLOT(updateEnabled()));
setDisplayName(tr("QML Viewer", "QMLRunConfiguration display name."));
if (id() == Constants::QML_SCENE_RC_ID)
setDisplayName(tr("QML Scene", "QMLRunConfiguration display name."));
else
setDisplayName(tr("QML Viewer", "QMLRunConfiguration display name."));
}
QmlProjectRunConfiguration::~QmlProjectRunConfiguration()
@@ -113,6 +117,9 @@ QString QmlProjectRunConfiguration::viewerPath() const
QtSupport::BaseQtVersion *version = qtVersion();
if (!version)
return QString();
if (id() == Constants::QML_SCENE_RC_ID)
return version->qmlsceneCommand();
else
return version->qmlviewerCommand();
}
@@ -123,6 +130,8 @@ QString QmlProjectRunConfiguration::observerPath() const
if (!version) {
return QString();
} else {
if (id() == Constants::QML_SCENE_RC_ID)
return version->qmlsceneCommand();
if (!version->needsQmlDebuggingLibrary())
return version->qmlviewerCommand();
return version->qmlObserverTool();