diff options
author | Tobias Hunger <tobias.hunger@digia.com> | 2014-02-07 14:33:53 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@digia.com> | 2014-02-10 10:25:52 +0100 |
commit | 97895e9026fa6586cdd8c541e481a1fada189bb2 (patch) | |
tree | d2977bff4ac97a2fe747bbecb1126caf7df18e58 | |
parent | 5559e64c7e473d698a5039130e79868bbef3a5c8 (diff) | |
download | qt-creator-97895e9026fa6586cdd8c541e481a1fada189bb2.tar.gz |
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: Eike Ziller <eike.ziller@digia.com>
7 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 03299edbb6..e8b4fee8a6 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -250,7 +250,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration * m_workingDirectoryEdit->setExpectedKind(Utils::PathChooser::Directory); m_workingDirectoryEdit->setBaseDirectory(m_cmakeRunConfiguration->target()->project()->projectDirectory()); m_workingDirectoryEdit->setPath(m_cmakeRunConfiguration->baseWorkingDirectory()); - m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("WorkingDir.History")); + m_workingDirectoryEdit->setHistoryCompleter(QLatin1String("CMake.WorkingDir.History")); ProjectExplorer::EnvironmentAspect *aspect = m_cmakeRunConfiguration->extraAspect<ProjectExplorer::EnvironmentAspect>(); if (aspect) { diff --git a/src/plugins/projectexplorer/importwidget.cpp b/src/plugins/projectexplorer/importwidget.cpp index eb7e34ee2e..3d4a527f35 100644 --- a/src/plugins/projectexplorer/importwidget.cpp +++ b/src/plugins/projectexplorer/importwidget.cpp @@ -59,7 +59,7 @@ ImportWidget::ImportWidget(QWidget *parent) : layout->addWidget(m_pathChooser); 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); layout->addWidget(importButton); diff --git a/src/plugins/projectexplorer/targetsetupwidget.cpp b/src/plugins/projectexplorer/targetsetupwidget.cpp index 8e070965b3..d8e1cfef99 100644 --- a/src/plugins/projectexplorer/targetsetupwidget.cpp +++ b/src/plugins/projectexplorer/targetsetupwidget.cpp @@ -180,7 +180,7 @@ void TargetSetupWidget::addBuildInfo(BuildInfo *info, bool isImport) pathChooser->setExpectedKind(Utils::PathChooser::Directory); pathChooser->setFileName(info->buildDirectory); pathChooser->setEnabled(info->supportsShadowBuild); - pathChooser->setHistoryCompleter(QLatin1String("BuildDir.History")); + pathChooser->setHistoryCompleter(QLatin1String("TargetSetup.BuildDir.History")); pathChooser->setReadOnly(!info->supportsShadowBuild || isImport); m_newBuildsLayout->addWidget(pathChooser, pos * 2, 1); diff --git a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp index 522e375cf3..fb76ced77f 100644 --- a/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp +++ b/src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp @@ -366,7 +366,7 @@ QbsRunConfigurationWidget::QbsRunConfigurationWidget(QbsRunConfiguration *rc, QW toplayout->addRow(argumentsLabel, m_argumentsLineEdit); 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); ProjectExplorer::EnvironmentAspect *aspect = m_rc->extraAspect<ProjectExplorer::EnvironmentAspect>(); diff --git a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp index e08cf7ff22..76dbd393eb 100644 --- a/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp +++ b/src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp @@ -218,7 +218,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm m_workingDirectoryEdit = new PathChooser(this); 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->setBaseDirectory(m_qmakeRunConfiguration->target()->project()->projectDirectory()); EnvironmentAspect *aspect = qmakeRunConfiguration->extraAspect<EnvironmentAspect>(); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp index aaaba78778..24373da5e1 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectconfigwidget.cpp @@ -67,7 +67,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc) m_ui->shadowBuildDirEdit->setPromptDialogTitle(tr("Shadow Build Directory")); 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->setBaseDirectory(bc->target()->project()->projectDirectory()); bool isShadowBuild = bc->isShadowBuild(); diff --git a/src/plugins/qtsupport/customexecutableconfigurationwidget.cpp b/src/plugins/qtsupport/customexecutableconfigurationwidget.cpp index 6437902e5f..049b4e91f4 100644 --- a/src/plugins/qtsupport/customexecutableconfigurationwidget.cpp +++ b/src/plugins/qtsupport/customexecutableconfigurationwidget.cpp @@ -64,7 +64,7 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE layout->addRow(tr("Arguments:"), m_commandLineArgumentsLineEdit); 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->setBaseDirectory(rc->target()->project()->projectDirectory()); |