diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 19:04:05 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 19:04:06 +0100 |
commit | 0d239d1d92f7c4e759a18885c599e742fc71ef21 (patch) | |
tree | 65564adef6604172de165a301a3de7cc814f1000 /src/widgets | |
parent | c689bcafd3196aad22372e8056fe0ccb13c15f35 (diff) | |
parent | b5ea7a5f5c849329643112cba9b57ad047c0bc4b (diff) |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ic011149c50dcbff3468d8fbdd3069a51ecd8f21c
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/widgets/qcombobox.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/widgets/widgets/qcombobox.cpp b/src/widgets/widgets/qcombobox.cpp index 4a5ae6578a..ce30ca18c3 100644 --- a/src/widgets/widgets/qcombobox.cpp +++ b/src/widgets/widgets/qcombobox.cpp @@ -2436,6 +2436,7 @@ struct IndexSetter { { cb->setCurrentIndex(index); emit cb->activated(index); + emit cb->activated(cb->itemText(index)); } }; } |