qtdeclarative/tests/auto/quick/rendernode
Liang Qi f5da1a9261 Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
	src/quick/items/qquickitemsmodule.cpp
	tests/auto/quick/rendernode/tst_rendernode.cpp

Change-Id: I90582df69feb95a4e4aafb0b9793c23714654f19
2016-10-20 08:28:16 +02:00
..
data Updated license headers 2016-01-20 11:46:25 +00:00
rendernode.pro Remove CONFIG += parallel_test. 2015-09-05 10:18:50 +00:00
tst_rendernode.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-10-20 08:28:16 +02:00