Commit 97895e90 authored by Tobias Hunger's avatar Tobias Hunger
Browse files

HistoryCompleter: Do not use a generic ids for history entries



Do not use BuildDir.History, SourceDir.History or WorkingDir.History.

Change-Id: I0df95b88680efdc2ecaec68625ab476499ee1fb8
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 5559e64c
...@@ -250,7 +250,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration * ...@@ -250,7 +250,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory); m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
m_workingDirectoryEdit->setBaseDirectory(m_cmakeRunConfiguration->target()->project()->projectDirectory()); m_workingDirectoryEdit->setBaseDirectory(m_cmakeRunConfiguration->target()->project()->projectDirectory());
m_workingDirectoryEdit->setPath(m_cmakeRunConfiguration->baseWorkingDirectory()); m_workingDirectoryEdit->setPath(m_cmakeRunConfiguration->baseWorkingDirectory());
m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("WorkingDir.History")); m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("CMake.WorkingDir.History"));
ProjectExplorer::EnvironmentAspect *aspect ProjectExplorer::EnvironmentAspect *aspect
= m_cmakeRunConfiguration->extraAspect<ProjectExplorer::EnvironmentAspect>(); = m_cmakeRunConfiguration->extraAspect<ProjectExplorer::EnvironmentAspect>();
if (aspect) { if (aspect) {
......
...@@ -59,7 +59,7 @@ ImportWidget::ImportWidget(QWidget *parent) : ...@@ -59,7 +59,7 @@ ImportWidget::ImportWidget(QWidget *parent) :
layout->addWidget(m_pathChooser); layout->addWidget(m_pathChooser);
m_pathChooser->setExpectedKind(Utils::PathChooser::ExistingDirectory); m_pathChooser->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_pathChooser->setHistoryCompleter(QLatin1String("SourceDir.History")); m_pathChooser->setHistoryCompleter(QLatin1String("Import.SourceDir.History"));
QPushButton *importButton = new QPushButton(tr("Import"), widget); QPushButton *importButton = new QPushButton(tr("Import"), widget);
layout->addWidget(importButton); layout->addWidget(importButton);
......
...@@ -180,7 +180,7 @@ void TargetSetupWidget::addBuildInfo(BuildInfo *info, bool isImport) ...@@ -180,7 +180,7 @@ void TargetSetupWidget::addBuildInfo(BuildInfo *info, bool isImport)
pathChooser->setExpectedKind(Utils::PathChooser::Directory); pathChooser->setExpectedKind(Utils::PathChooser::Directory);
pathChooser->setFileName(info->buildDirectory); pathChooser->setFileName(info->buildDirectory);
pathChooser->setEnabled(info->supportsShadowBuild); pathChooser->setEnabled(info->supportsShadowBuild);
pathChooser->setHistoryCompleter(QLatin1String("BuildDir.History")); pathChooser->setHistoryCompleter(QLatin1String("TargetSetup.BuildDir.History"));
pathChooser->setReadOnly(!info->supportsShadowBuild || isImport); pathChooser->setReadOnly(!info->supportsShadowBuild || isImport);
m_newBuildsLayout->addWidget(pathChooser, pos * 2, 1); m_newBuildsLayout->addWidget(pathChooser, pos * 2, 1);
......
...@@ -366,7 +366,7 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc, QW ...@@ -366,7 +366,7 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc, QW
toplayout->addRow(argumentsLabel, m_argumentsLineEdit); toplayout->addRow(argumentsLabel, m_argumentsLineEdit);
m_workingDirectoryEdit = new Utils::PathChooser(this); m_workingDirectoryEdit = new Utils::PathChooser(this);
m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("WorkingDir.History")); m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("Qbs.WorkingDir.History"));
m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory); m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory);
ProjectExplorer::EnvironmentAspect *aspect ProjectExplorer::EnvironmentAspect *aspect
= m_rc->extraAspect<ProjectExplorer::EnvironmentAspect>(); = m_rc->extraAspect<ProjectExplorer::EnvironmentAspect>();
......
...@@ -218,7 +218,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm ...@@ -218,7 +218,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
m_workingDirectoryEdit = new PathChooser(this); m_workingDirectoryEdit = new PathChooser(this);
m_workingDirectoryEdit->setExpectedKind(PathChooser::Directory); m_workingDirectoryEdit->setExpectedKind(PathChooser::Directory);
m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("WorkingDir.History")); m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("Qmake.WorkingDir.History"));
m_workingDirectoryEdit->setPath(m_qmakeRunConfiguration->baseWorkingDirectory()); m_workingDirectoryEdit->setPath(m_qmakeRunConfiguration->baseWorkingDirectory());
m_workingDirectoryEdit->setBaseDirectory(m_qmakeRunConfiguration->target()->project()->projectDirectory()); m_workingDirectoryEdit->setBaseDirectory(m_qmakeRunConfiguration->target()->project()->projectDirectory());
EnvironmentAspect *aspect = qmakeRunConfiguration->extraAspect<EnvironmentAspect>(); EnvironmentAspect *aspect = qmakeRunConfiguration->extraAspect<EnvironmentAspect>();
......
...@@ -67,7 +67,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc) ...@@ -67,7 +67,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
m_ui->shadowBuildDirEdit->setPromptDialogTitle(tr("Shadow Build Directory")); m_ui->shadowBuildDirEdit->setPromptDialogTitle(tr("Shadow Build Directory"));
m_ui->shadowBuildDirEdit->setExpectedKind(Utils::PathChooser::ExistingDirectory); m_ui->shadowBuildDirEdit->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_ui->shadowBuildDirEdit->setHistoryCompleter(QLatin1String("BuildDir.History")); m_ui->shadowBuildDirEdit->setHistoryCompleter(QLatin1String("Qmake.BuildDir.History"));
m_ui->shadowBuildDirEdit->setEnvironment(bc->environment()); m_ui->shadowBuildDirEdit->setEnvironment(bc->environment());
m_ui->shadowBuildDirEdit->setBaseDirectory(bc->target()->project()->projectDirectory()); m_ui->shadowBuildDirEdit->setBaseDirectory(bc->target()->project()->projectDirectory());
bool isShadowBuild = bc->isShadowBuild(); bool isShadowBuild = bc->isShadowBuild();
......
...@@ -64,7 +64,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE ...@@ -64,7 +64,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
layout->addRow(tr("Arguments:"), m_commandLineArgumentsLineEdit); layout->addRow(tr("Arguments:"), m_commandLineArgumentsLineEdit);
m_workingDirectory = new Utils::PathChooser(this); m_workingDirectory = new Utils::PathChooser(this);
m_workingDirectory->setHistoryCompleter(QLatin1String("WorkingDir.History")); m_workingDirectory->setHistoryCompleter(QLatin1String("Qt.WorkingDir.History"));
m_workingDirectory->setExpectedKind(Utils::PathChooser::Directory); m_workingDirectory->setExpectedKind(Utils::PathChooser::Directory);
m_workingDirectory->setBaseDirectory(rc->target()->project()->projectDirectory()); m_workingDirectory->setBaseDirectory(rc->target()->project()->projectDirectory());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment