summaryrefslogtreecommitdiffstats
path: root/header.LGPL21
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-10-27 10:22:56 +0200
committerLiang Qi <liang.qi@qt.io>2016-10-27 10:23:39 +0200
commitaf0d0b9c06c18850626e5454b39b45255c3e36cb (patch)
tree31768765e1195781fba5350ad99e93e926dd083c /header.LGPL21
parent8daa050ed2bc3502f19ae38e2c3060941a19a5a6 (diff)
parent4e196159077a820e99bc8bd306d31d0ccaa17c57 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts: src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h src/plugins/platforms/ios/qiosintegration.h src/widgets/widgets/qcombobox.cpp tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45
Diffstat (limited to 'header.LGPL21')
0 files changed, 0 insertions, 0 deletions