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

Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

Browse Source
This commit is contained in:
Bea Lam
2010-01-12 10:53:20 +10:00
parent 5a1f825cff ee53ebbf08
commit 7fa633259b
3295 changed files with 318874 additions and 4822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmlprojectmanager/qmlproject.cpp
View File

@@ -44,7 +44,6 @@
#include <qmleditor/qmlmodelmanagerinterface.h>
#include <utils/synchronousprocess.h>
#include <utils/pathchooser.h>
#include <QtCore/QtDebug>
#include <QtCore/QDir>
@@ -166,7 +165,7 @@ QStringList QmlProject::convertToAbsoluteFiles(const QStringList &paths) const
QStringList QmlProject::files() const
{ return m_files; }
QString QmlProject::name() const
QString QmlProject::displayName() const
{
return m_projectName;
}
@@ -305,10 +304,9 @@ void QmlProjectFile::modified(ReloadBehavior *)
QmlRunConfiguration::QmlRunConfiguration(QmlProject *pro)
: ProjectExplorer::RunConfiguration(pro),
m_project(pro),
m_type(Constants::QMLRUNCONFIGURATION),
m_debugServerPort(3768)
{
setName(tr("QML Viewer"));
setDisplayName(tr("QML Viewer"));
// append creator/bin dir to search path (only useful for special creator-qml package)
const QString searchPath = QString(qgetenv("PATH"))
@@ -322,9 +320,9 @@ QmlRunConfiguration::~QmlRunConfiguration()
{
}
QString QmlRunConfiguration::type() const
QString QmlRunConfiguration::id() const
{
return m_type;
return QLatin1String(Constants::QMLRUNCONFIGURATION);
}
QString QmlRunConfiguration::viewerPath() const
@@ -476,7 +474,6 @@ void QmlRunConfiguration::restore(const ProjectExplorer::PersistentSettingsReade
}
QmlRunConfigurationFactory::QmlRunConfigurationFactory()
: m_type(Constants::QMLRUNCONFIGURATION)
{
}
@@ -484,22 +481,22 @@ QmlRunConfigurationFactory::~QmlRunConfigurationFactory()
{
}
bool QmlRunConfigurationFactory::canRestore(const QString &type) const
bool QmlRunConfigurationFactory::canRestore(const QString &id) const
{
if (type.startsWith(m_type))
if (id.startsWith(QLatin1String(Constants::QMLRUNCONFIGURATION)))
return true;
return false;
}
QStringList QmlRunConfigurationFactory::availableCreationTypes(ProjectExplorer::Project *) const
QStringList QmlRunConfigurationFactory::availableCreationIds(ProjectExplorer::Project *) const
{
return QStringList();
}
QString QmlRunConfigurationFactory::displayNameForType(const QString &type) const
QString QmlRunConfigurationFactory::displayNameForId(const QString &id) const
{
return type;
return id;
}
ProjectExplorer::RunConfiguration *QmlRunConfigurationFactory::create(ProjectExplorer::Project *project,
@@ -592,6 +589,7 @@ QmlRunControlFactory::~QmlRunControlFactory()
bool QmlRunControlFactory::canRun(RunConfiguration *runConfiguration, const QString &mode) const
{
Q_UNUSED(mode);
return (qobject_cast<QmlRunConfiguration*>(runConfiguration) != 0);
}