qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/auto/qml/qqmlpropertymap
History
Liang Qi 6839f03051 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
	tests/auto/quick/qquickitem/tst_qquickitem.cpp

Change-Id: If261f8eea84dfa5944bb55de999d1f70aba528fd
 		2016-08-01 13:14:04 +02:00
..
qqmlpropertymap.pro Remove CONFIG += parallel_test. 2015-09-05 10:18:50 +00:00
tst_qqmlpropertymap.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-01 13:14:04 +02:00