summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qcombobox.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-11-15 01:00:11 +0100
committerEdward Welbourne <edward.welbourne@qt.io>2019-11-15 16:30:51 +0100
commit5abb976f23ef0f3cbb7b720e523c08d768c76c0e (patch)
tree55fece450d39fdaf2fb2e213fc321fcf936a18cb /src/widgets/widgets/qcombobox.h
parent76a0f94a6d7d85f352e3d4a00c192bfc377cc776 (diff)
parentadc7bbe910a4b89a579ffa93da5a937cfc1379f4 (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/widgets/widgets/qcombobox.h')
0 files changed, 0 insertions, 0 deletions