summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2016-02-16 19:20:37 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2016-02-16 19:20:37 +0000
commite19fc4324b9c4dd7ef5519894f8eedb3703cb39d (patch)
tree9a9753bf620ea61e41d824f9358ba07e08817efe /src
parentbfb47b39f6f72bf61b457ed54e8c259fb472fa99 (diff)
parent0d239d1d92f7c4e759a18885c599e742fc71ef21 (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/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));
}
};
}