aboutsummaryrefslogtreecommitdiffstats
path: root/src/quicktemplates2/qquickcombobox.cpp
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-31 03:02:37 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-31 03:02:44 +0200
commit8701410f8c0e179c9cca51b08fcc6491a288ee84 (patch)
tree411cd939754121a98a0d581051812e5acb64433e /src/quicktemplates2/qquickcombobox.cpp
parent95383bf86c0a49fea8ec47d1400067ead53749a9 (diff)
parent3fcb661468e613b17369b84366b259aa7e7a6420 (diff)
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'src/quicktemplates2/qquickcombobox.cpp')
0 files changed, 0 insertions, 0 deletions