Skip to content
Snippets Groups Projects
Commit cba6b3ca authored by Roberto Raggi's avatar Roberto Raggi
Browse files

Removed obsolete code.

parent 8a97b540
No related branches found
No related tags found
No related merge requests found
......@@ -238,17 +238,9 @@ ProjectExplorer::Environment QmlProject::environment(const QString &) const
return ProjectExplorer::Environment::systemEnvironment();
}
QString QmlProject::buildDirectory(const QString &buildConfiguration) const
QString QmlProject::buildDirectory(const QString &) const
{
QString buildDirectory = value(buildConfiguration, "buildDirectory").toString();
if (buildDirectory.isEmpty()) {
QFileInfo fileInfo(m_fileName);
buildDirectory = fileInfo.absolutePath();
}
return buildDirectory;
return QString();
}
ProjectExplorer::BuildStepConfigWidget *QmlProject::createConfigWidget()
......@@ -305,30 +297,16 @@ void QmlProject::saveSettingsImpl(ProjectExplorer::PersistentSettingsWriter &wri
QmlBuildSettingsWidget::QmlBuildSettingsWidget(QmlProject *project)
: m_project(project)
{
QFormLayout *fl = new QFormLayout(this);
// build directory
m_pathChooser = new Core::Utils::PathChooser(this);
m_pathChooser->setEnabled(true);
fl->addRow(tr("Build directory:"), m_pathChooser);
connect(m_pathChooser, SIGNAL(changed()), this, SLOT(buildDirectoryChanged()));
}
QmlBuildSettingsWidget::~QmlBuildSettingsWidget()
{ }
QString QmlBuildSettingsWidget::displayName() const
{ return tr("Qml Manager"); }
void QmlBuildSettingsWidget::init(const QString &buildConfiguration)
{
m_buildConfiguration = buildConfiguration;
m_pathChooser->setPath(m_project->buildDirectory(buildConfiguration));
}
{ return tr("QML Manager"); }
void QmlBuildSettingsWidget::buildDirectoryChanged()
void QmlBuildSettingsWidget::init(const QString &)
{
m_project->setValue(m_buildConfiguration, "buildDirectory", m_pathChooser->path());
}
////////////////////////////////////////////////////////////////////////////////////
......@@ -405,7 +383,7 @@ QString QmlApplicationRunConfiguration::type() const
QString QmlApplicationRunConfiguration::executable() const
{
QString executable("/Users/raggi/Projects/qt/kinetic/bin/qmlviewer.app");
QString executable("qmlviewer");
return executable;
}
......
......@@ -155,13 +155,8 @@ public:
virtual void init(const QString &buildConfiguration);
private Q_SLOTS:
void buildDirectoryChanged();
private:
QmlProject *m_project;
Core::Utils::PathChooser *m_pathChooser;
QString m_buildConfiguration;
};
class QmlApplicationRunConfiguration : public ProjectExplorer::ApplicationRunConfiguration
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment