Qnx: Add history completer to path choosers

Change-Id: I2828045d1ccd2621786b563f22cce6e5d14f37ee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

10 files changed, 19 insertions, 0 deletions

diff --git a/src/plugins/qnx/bardescriptoreditorentrypointwidget.cpp b/src/plugins/qnx/bardescriptoreditorentrypointwidget.cpp
index d857fec75b..ceab34e0b1 100644
--- a/src/plugins/qnx/bardescriptoreditorentrypointwidget.cpp
+++ b/src/plugins/qnx/bardescriptoreditorentrypointwidget.cpp
@@ -57,6 +57,7 @@ BarDescriptorEditorEntryPointWidget::BarDescriptorEditorEntryPointWidget(QWidget
     m_ui->setupUi(this);
 
     m_ui->iconFilePath->setExpectedKind(Utils::PathChooser::File);
+    m_ui->iconFilePath->setHistoryCompleter(QLatin1String("Qmake.Icon.History"));
     m_ui->iconFilePath->setPromptDialogFilter(tr("Images (*.jpg *.png)"));
 
     m_ui->iconWarningLabel->setVisible(false);
diff --git a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
index 50ef16ba88..a56a1c8576 100644
--- a/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
+++ b/src/plugins/qnx/blackberrydebugtokenrequestdialog.cpp
@@ -55,6 +55,7 @@ BlackBerryDebugTokenRequestDialog::BlackBerryDebugTokenRequestDialog(
     m_ui->progressBar->hide();
     m_ui->status->clear();
     m_ui->debugTokenPath->setExpectedKind(Utils::PathChooser::SaveFile);
+    m_ui->debugTokenPath->setHistoryCompleter(QLatin1String("BB.DebugToken.History"));
     m_ui->debugTokenPath->setPromptDialogTitle(tr("Request Debug Token"));
     m_ui->debugTokenPath->setPromptDialogFilter(tr("BAR Files (*.bar)"));
 
diff --git a/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp
index c235d22360..941fa63185 100644
--- a/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp
+++ b/src/plugins/qnx/blackberrydeployconfigurationwidget.cpp
@@ -56,10 +56,12 @@ BlackBerryDeployConfigurationWidget::BlackBerryDeployConfigurationWidget(BlackBe
 
     PathChooserDelegate *appDescriptorPathDelegate = new PathChooserDelegate(this);
     appDescriptorPathDelegate->setExpectedKind(Utils::PathChooser::File);
+    appDescriptorPathDelegate->setHistoryCompleter(QLatin1String("BB.BarXml.History"));
     appDescriptorPathDelegate->setPromptDialogFilter(QLatin1String("*.xml"));
 
     PathChooserDelegate *barPathDelegate = new PathChooserDelegate(this);
     barPathDelegate->setExpectedKind(Utils::PathChooser::File);
+    barPathDelegate->setHistoryCompleter(QLatin1String("BB.AppBar.History"));
     barPathDelegate->setPromptDialogFilter(QLatin1String("*.bar"));
 
     m_ui->deployPackagesView->setItemDelegateForColumn(1, appDescriptorPathDelegate);
diff --git a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
index a988e7a81d..386276f93b 100644
--- a/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
+++ b/src/plugins/qnx/blackberrydeviceconfigurationwidget.cpp
@@ -263,6 +263,7 @@ void BlackBerryDeviceConfigurationWidget::updateDeviceFromUi()
 void BlackBerryDeviceConfigurationWidget::initGui()
 {
     ui->keyFileLineEdit->setExpectedKind(Utils::PathChooser::File);
+    ui->keyFileLineEdit->setHistoryCompleter(QLatin1String("BB.Key.History"));
     ui->keyFileLineEdit->lineEdit()->setMinimumWidth(0);
 
     const QSsh::SshConnectionParameters &sshParams = deviceConfiguration()->sshParameters();
diff --git a/src/plugins/qnx/blackberryimportcertificatedialog.cpp b/src/plugins/qnx/blackberryimportcertificatedialog.cpp
index f947672faf..9816181ab1 100644
--- a/src/plugins/qnx/blackberryimportcertificatedialog.cpp
+++ b/src/plugins/qnx/blackberryimportcertificatedialog.cpp
@@ -49,6 +49,7 @@ BlackBerryImportCertificateDialog::BlackBerryImportCertificateDialog(
 {
     m_ui->setupUi(this);
     m_ui->certPath->setExpectedKind(Utils::PathChooser::File);
+    m_ui->certPath->setHistoryCompleter(QLatin1String("BB.Certificate.History"));
     m_ui->certPath->setPromptDialogTitle(tr("Import Certificate"));
     m_ui->certPath->setPromptDialogFilter(tr("PKCS 12 Archives (*.p12)"));
 
diff --git a/src/plugins/qnx/blackberryinstallwizardpages.cpp b/src/plugins/qnx/blackberryinstallwizardpages.cpp
index 29b1e26ec5..80f01d009a 100644
--- a/src/plugins/qnx/blackberryinstallwizardpages.cpp
+++ b/src/plugins/qnx/blackberryinstallwizardpages.cpp
@@ -63,6 +63,7 @@ NdkPathChooser::NdkPathChooser(Mode mode, QWidget *parent)
     : Utils::PathChooser(parent)
     , m_mode(mode)
 {
+    setHistoryCompleter(QLatin1String("Qnx.NdkPath.History"));
     if (m_mode == NdkPathChooser::InstallMode) {
         setExpectedKind(Utils::PathChooser::Directory);
     } else {
diff --git a/src/plugins/qnx/pathchooserdelegate.cpp b/src/plugins/qnx/pathchooserdelegate.cpp
index 3223ecaed9..9c34b02bb1 100644
--- a/src/plugins/qnx/pathchooserdelegate.cpp
+++ b/src/plugins/qnx/pathchooserdelegate.cpp
@@ -60,6 +60,7 @@ QWidget *PathChooserDelegate::createEditor(QWidget *parent, const QStyleOptionVi
 
     Utils::PathChooser *editor = new Utils::PathChooser(parent);
 
+    editor->setHistoryCompleter(m_historyKey);
     editor->setAutoFillBackground(true); // To hide the text beneath the editor widget
     editor->lineEdit()->setMinimumWidth(0);
 
@@ -97,6 +98,11 @@ void PathChooserDelegate::updateEditorGeometry(QWidget *editor, const QStyleOpti
     editor->setGeometry(option.rect);
 }
 
+void PathChooserDelegate::setHistoryCompleter(const QString &key)
+{
+    m_historyKey = key;
+}
+
 void PathChooserDelegate::emitCommitData()
 {
     emit commitData(qobject_cast<QWidget*>(sender()));
diff --git a/src/plugins/qnx/pathchooserdelegate.h b/src/plugins/qnx/pathchooserdelegate.h
index 054f6c1352..f3be37cc35 100644
--- a/src/plugins/qnx/pathchooserdelegate.h
+++ b/src/plugins/qnx/pathchooserdelegate.h
@@ -60,12 +60,15 @@ public:
     void updateEditorGeometry(QWidget *editor,
         const QStyleOptionViewItem &option, const QModelIndex &index) const;
 
+    void setHistoryCompleter(const QString &key);
+
 private slots:
     void emitCommitData();
 
 private:
     Utils::PathChooser::Kind m_kind;
     QString m_filter;
+    QString m_historyKey;
 };
 
 } // namespace Internal
diff --git a/src/plugins/qnx/qnxbaseqtconfigwidget.cpp b/src/plugins/qnx/qnxbaseqtconfigwidget.cpp
index ccf94b55f4..66099e3c14 100644
--- a/src/plugins/qnx/qnxbaseqtconfigwidget.cpp
+++ b/src/plugins/qnx/qnxbaseqtconfigwidget.cpp
@@ -52,6 +52,7 @@ QnxBaseQtConfigWidget::QnxBaseQtConfigWidget(QnxAbstractQtVersion *version)
     m_ui->sdkLabel->setText(version->sdkDescription());
 
     m_ui->sdkPath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
+    m_ui->sdkPath->setHistoryCompleter(QLatin1String("Qnx.Sdk.History"));
     m_ui->sdkPath->setPath(version->sdkPath());
 
     connect(m_ui->sdkPath, SIGNAL(changed(QString)), this, SLOT(updateSdkPath(QString)));
diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp
index d145d47b2e..4c0ab1f6f9 100644
--- a/src/plugins/qnx/qnxtoolchain.cpp
+++ b/src/plugins/qnx/qnxtoolchain.cpp
@@ -210,10 +210,12 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
     , m_abiWidget(new AbiWidget)
 {
     m_compilerCommand->setExpectedKind(Utils::PathChooser::ExistingCommand);
+    m_compilerCommand->setHistoryCompleter(QLatin1String("Qnx.ToolChain.History"));
     m_compilerCommand->setFileName(tc->compilerCommand());
     m_compilerCommand->setEnabled(!tc->isAutoDetected());
 
     m_ndkPath->setExpectedKind(Utils::PathChooser::ExistingDirectory);
+    m_ndkPath->setHistoryCompleter(QLatin1String("Qnx.Ndk.History"));
     m_ndkPath->setPath(tc->ndkPath());
     m_ndkPath->setEnabled(!tc->isAutoDetected());