From 6490ae04163dd1a681114a3650757a4fda36f205 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 8 Aug 2016 14:05:09 +0200 Subject: [PATCH] Set history completer only once Avoid setting it many times for one path chooser, since it raises soft assert inside FancyLineEdit. Change-Id: Ie70224b9be577fc38d32f036a67a9b9a1bc3ac56 Reviewed-by: Eike Ziller --- src/plugins/qmakeprojectmanager/addlibrarywizard.cpp | 3 +++ src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp b/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp index 1fca6d2bdba..402b3e7ecb9 100644 --- a/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp +++ b/src/plugins/qmakeprojectmanager/addlibrarywizard.cpp @@ -189,7 +189,10 @@ DetailsPage::DetailsPage(AddLibraryWizard *parent) { m_libraryDetailsWidget = new Ui::LibraryDetailsWidget(); m_libraryDetailsWidget->setupUi(this); + Utils::PathChooser * const libPathChooser = m_libraryDetailsWidget->libraryPathChooser; + libPathChooser->setHistoryCompleter("Qmake.LibDir.History"); + const auto pathValidator = [libPathChooser](Utils::FancyLineEdit *edit, QString *errorMessage) { return libPathChooser->defaultValidationFunction()(edit, errorMessage) && validateLibraryPath(libPathChooser->fileName().toString(), libPathChooser, diff --git a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp index 695195eafeb..9692e5e0e02 100644 --- a/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp +++ b/src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp @@ -612,9 +612,6 @@ NonInternalLibraryDetailsController::NonInternalLibraryDetailsController( setLibraryComboBoxVisible(false); setLibraryPathChooserVisible(true); - libraryDetailsWidget()->libraryPathChooser - ->setHistoryCompleter(QLatin1String("Qmake.LibDir.History")); - if (creatorPlatform() == CreatorWindows) { libraryDetailsWidget()->libraryPathChooser->setPromptDialogFilter( QLatin1String("Library file (*.lib lib*.a)"));