feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Set history completer only once

Browse Source 
Avoid setting it many times for one
path chooser, since it raises soft assert
inside FancyLineEdit.

Change-Id: Ie70224b9be577fc38d32f036a67a9b9a1bc3ac56
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Jarek Kobus
2016-08-08 14:05:09 +02:00
committed by Jarek Kobus
parent f56ec53fa1
commit 6490ae0416
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmakeprojectmanager/addlibrarywizard.cpp
View File

@@ -189,7 +189,10 @@ DetailsPage::DetailsPage(AddLibraryWizard *parent)
{ {
m_libraryDetailsWidget = new Ui::LibraryDetailsWidget(); m_libraryDetailsWidget = new Ui::LibraryDetailsWidget();
m_libraryDetailsWidget->setupUi(this); m_libraryDetailsWidget->setupUi(this);
Utils::PathChooser * const libPathChooser = m_libraryDetailsWidget->libraryPathChooser; Utils::PathChooser * const libPathChooser = m_libraryDetailsWidget->libraryPathChooser;
libPathChooser->setHistoryCompleter("Qmake.LibDir.History");
const auto pathValidator = [libPathChooser](Utils::FancyLineEdit *edit, QString *errorMessage) { const auto pathValidator = [libPathChooser](Utils::FancyLineEdit *edit, QString *errorMessage) {
return libPathChooser->defaultValidationFunction()(edit, errorMessage) return libPathChooser->defaultValidationFunction()(edit, errorMessage)
&& validateLibraryPath(libPathChooser->fileName().toString(), libPathChooser, && validateLibraryPath(libPathChooser->fileName().toString(), libPathChooser,

3
src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
View File

@@ -612,9 +612,6 @@ NonInternalLibraryDetailsController::NonInternalLibraryDetailsController(
setLibraryComboBoxVisible(false); setLibraryComboBoxVisible(false);
setLibraryPathChooserVisible(true); setLibraryPathChooserVisible(true);
libraryDetailsWidget()->libraryPathChooser
->setHistoryCompleter(QLatin1String("Qmake.LibDir.History"));
if (creatorPlatform() == CreatorWindows) { if (creatorPlatform() == CreatorWindows) {
libraryDetailsWidget()->libraryPathChooser->setPromptDialogFilter( libraryDetailsWidget()->libraryPathChooser->setPromptDialogFilter(
QLatin1String("Library file (*.lib lib*.a)")); QLatin1String("Library file (*.lib lib*.a)"));