aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 10:28:10 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-27 10:28:10 +0100
commitbe8e722b492ec8c9c6480d68827b6ec0e83cc2d2 (patch)
tree6dc56e5555653ca204d86de88f166598fdb3b07b
parent15b2059e73df2f103c7206dd8d8a14a1fa3ca7b6 (diff)
parent5e920ecff160ddf7374023802918385ad699d786 (diff)
Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2
Conflicts: .qmake.conf Change-Id: If787a0065756fffad8f30209a08f3708d1acda33
0 files changed, 0 insertions, 0 deletions