Liang Qi dc37318684 Merge remote-tracking branch 'origin/5.13' into dev ... Conflicts: src/gui/util/qshaderformat.cpp src/gui/util/qshaderformat_p.h src/widgets/graphicsview/qgraphicsitem_p.h Change-Id: Idafd88eb9a0a15b4af29f6143d009c1ec8ceecca		2019-04-24 09:52:30 +02:00
..
qurl-generateTLDs	Merge remote-tracking branch 'origin/5.13' into dev	2019-04-24 09:52:30 +02:00