diff options
author | Alex Blasche <alexander.blasche@digia.com> | 2014-09-19 17:38:48 +0200 |
---|---|---|
committer | Alex Blasche <alexander.blasche@digia.com> | 2014-09-21 02:24:53 +0200 |
commit | 23a03ebcd17be328508e749afeb2cd962296be3b (patch) | |
tree | 0f5b85e7f5e1d48def1b3672b5608c41b6a6287b | |
parent | b53f6fdd313f71f05b99093966736a8f7442ded8 (diff) |
Fix crash in QCombobox when resetting model during currentIndexChanged()
Task-number: QTBUG-20415
Change-Id: Idffc0f29cc55d834c2736ce7562dd7cfe912d327
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index b4f9d25331..2b064c3184 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -1280,8 +1280,8 @@ void QComboBoxPrivate::_q_emitHighlighted(const QModelIndex &index) void QComboBoxPrivate::_q_emitCurrentIndexChanged(const QModelIndex &index) { Q_Q(QComboBox); - emit q->currentIndexChanged(index.row()); const QString text = itemText(index); + emit q->currentIndexChanged(index.row()); emit q->currentIndexChanged(text); // signal lineEdit.textChanged already connected to signal currentTextChanged, so don't emit double here if (!lineEdit) |