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

QmlProject: Disable debug action if qmlobserver cannot be built

Browse Source 
QmlObserver right now requires 4.7.1 minimum. There's no gain in
telling the user that he needs qmlobserver to debug, if it can't be
build with 4.7.0 anyway.

Reviewed-by: Christiaan Janssen
This commit is contained in:
Kai Koehne
2010-10-05 10:54:05 +02:00
parent 1e19803e6e
commit 6267671858
3 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,26 +114,22 @@ Internal::QmlProjectTarget *QmlProjectRunConfiguration::qmlTarget() const
QString QmlProjectRunConfiguration::viewerPath() const
{
if (m_qtVersionId == -1)
Qt4ProjectManager::QtVersion *version = qtVersion();
if (!version) {
return QString();
Qt4ProjectManager::QtVersionManager *versionManager = Qt4ProjectManager::QtVersionManager::instance();
Qt4ProjectManager::QtVersion *version = versionManager->version(m_qtVersionId);
QTC_ASSERT(version, return QString());
return version->qmlviewerCommand();
} else {
return version->qmlviewerCommand();
}
}
QString QmlProjectRunConfiguration::observerPath() const
{
if (m_qtVersionId == -1)
Qt4ProjectManager::QtVersion *version = qtVersion();
if (!version) {
return QString();
Qt4ProjectManager::QtVersionManager *versionManager = Qt4ProjectManager::QtVersionManager::instance();
Qt4ProjectManager::QtVersion *version = versionManager->version(m_qtVersionId);
QTC_ASSERT(version, return QString());
return version->qmlObserverTool();
} else {
return version->qmlObserverTool();
}
}
QStringList QmlProjectRunConfiguration::viewerArguments() const
@@ -162,6 +158,18 @@ QString QmlProjectRunConfiguration::workingDirectory() const
return projectFile.absolutePath();
}
Qt4ProjectManager::QtVersion *QmlProjectRunConfiguration::qtVersion() const
{
if (m_qtVersionId == -1)
return 0;
Qt4ProjectManager::QtVersionManager *versionManager = Qt4ProjectManager::QtVersionManager::instance();
Qt4ProjectManager::QtVersion *version = versionManager->version(m_qtVersionId);
QTC_ASSERT(version, return 0);
return version;
}
static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
{
return s1.toLower() < s2.toLower();
@@ -381,10 +389,10 @@ void QmlProjectRunConfiguration::updateEnabled()
bool newValue = (QFileInfo(viewerPath()).exists()
|| QFileInfo(observerPath()).exists()) && qmlFileFound;
if (m_isEnabled != newValue) {
m_isEnabled = newValue;
emit isEnabledChanged(m_isEnabled);
}
// Always emit change signal to force reevaluation of run/debug buttons
m_isEnabled = newValue;
emit isEnabledChanged(m_isEnabled);
}
void QmlProjectRunConfiguration::updateQtVersions()