From 74eb8db29f2108518a8c9ced5174deed06908ca0 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 22 Jan 2016 12:44:54 +0100 Subject: [PATCH] Fix crash in ShortcutSettingsWidget. Setting the validation function on a FancyLineEdit immediately validates now, so everything accessed by the validation function has to be set up when setting it. Change-Id: I07900058d7047d61d1b153bdfbfe44acf3164174 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/dialogs/shortcutsettings.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp index c767ad7f0f8..037650c14ed 100644 --- a/src/plugins/coreplugin/dialogs/shortcutsettings.cpp +++ b/src/plugins/coreplugin/dialogs/shortcutsettings.cpp @@ -227,9 +227,6 @@ ShortcutSettingsWidget::ShortcutSettingsWidget(QWidget *parent) m_shortcutEdit = new Utils::FancyLineEdit(m_shortcutBox); m_shortcutEdit->setFiltering(true); m_shortcutEdit->setPlaceholderText(tr("Enter key sequence as text")); - m_shortcutEdit->setValidationFunction([this](Utils::FancyLineEdit *, QString *) { - return validateShortcutEdit(); - }); auto shortcutLabel = new QLabel(tr("Key sequence:")); shortcutLabel->setToolTip(Utils::HostOsInfo::isMacHost() ? QLatin1String("") @@ -274,6 +271,10 @@ ShortcutSettingsWidget::ShortcutSettingsWidget(QWidget *parent) layout()->addWidget(m_shortcutBox); initialize(); + + m_shortcutEdit->setValidationFunction([this](Utils::FancyLineEdit *, QString *) { + return validateShortcutEdit(); + }); } ShortcutSettingsWidget::~ShortcutSettingsWidget()