qtdeclarative/tests/auto/quick/qquickframebufferobject
Liang Qi 45f79dc7e5 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp
	src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h

Change-Id: I1e6a9424e7f87d9e4ac1ea387ec70e151106f1c7
2016-08-05 09:02:17 +02:00
..
data Updated license headers 2016-01-20 11:46:25 +00:00
qquickframebufferobject.pro Remove CONFIG += parallel_test. 2015-09-05 10:18:50 +00:00
tst_qquickframebufferobject.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-05 09:02:17 +02:00