summaryrefslogtreecommitdiffstats
path: root/src/controls/ComboBox.qml
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-19 22:05:59 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-19 22:06:05 +0200
commit1bc05eceb7823b38ddec1d8e874f371fb8b2045f (patch)
tree445a440f88ff0fd7f6f9439029291a878eedb87c /src/controls/ComboBox.qml
parent61463e781f1892f11a45f9c924aa9b5dbbb359fc (diff)
parent33e316e1465fe20bc57ef24436f77b880a1fbadc (diff)
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/controls/ComboBox.qml')
0 files changed, 0 insertions, 0 deletions