diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp index de619bc953d9af143b4e36c2232abc0087c4c6da..83bf95ec54e89d2ead2e3c547dd86ed9916d4c43 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.cpp +++ b/src/plugins/qmlprojectmanager/qmlproject.cpp @@ -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; } diff --git a/src/plugins/qmlprojectmanager/qmlproject.h b/src/plugins/qmlprojectmanager/qmlproject.h index f53611af209a08cdce26f1572af1c87905e6fc5c..0456fb8c39bd412479eed8a0fa23e487289d6a2b 100644 --- a/src/plugins/qmlprojectmanager/qmlproject.h +++ b/src/plugins/qmlprojectmanager/qmlproject.h @@ -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