summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-15 19:04:05 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2016-02-15 19:04:06 +0100
commit0d239d1d92f7c4e759a18885c599e742fc71ef21 (patch)
tree65564adef6604172de165a301a3de7cc814f1000 /src
parentc689bcafd3196aad22372e8056fe0ccb13c15f35 (diff)
parentb5ea7a5f5c849329643112cba9b57ad047c0bc4b (diff)
Merge remote-tracking branch 'origin/5.5' into 5.6
Diffstat (limited to 'src')
-rw-r--r--src/widgets/widgets/qcombobox.cpp1
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));
}
};
}