qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tools
History
Simon Hausmann 24d0266ee4 Merge remote-tracking branch 'origin/5.9' into HEAD 
Conflicts:
	src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp
	src/qml/jit/qv4assembler.cpp
	src/qml/jit/qv4assembler_p.h
	src/qml/jit/qv4isel_masm.cpp
	src/qml/jsruntime/qv4context.cpp
	src/qml/jsruntime/qv4context_p.h
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4vme_moth.cpp
	src/qml/memory/qv4mmdefs_p.h

Change-Id: I9966750b7cd9106b78e4c4779f12b95a481cca40
 		2017-03-23 14:43:46 +01:00
..
qml Merge remote-tracking branch 'origin/5.9' into HEAD 2017-03-23 14:43:46 +01:00
qmlcachegen QHash: use the public functions to set the global hash seed 2017-03-16 05:47:54 +00:00
qmleasing Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-24 11:48:14 +01:00
qmlimportscanner Merge remote-tracking branch 'origin/5.9' into dev 2017-03-02 09:05:12 +01:00
qmljs Merge remote-tracking branch 'origin/5.9' into HEAD 2017-03-23 14:43:46 +01:00
qmllint Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-24 11:48:14 +01:00
qmlmin Merge remote-tracking branch 'origin/5.9' into dev 2017-03-02 09:05:12 +01:00
qmlplugindump Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-24 11:48:14 +01:00
qmlprofiler QRegExp include cleanup 2017-03-17 08:00:17 +00:00
qmlscene QRegExp include cleanup 2017-03-17 08:00:17 +00:00
qmltestrunner Tools: Add product name, version and description to the .pro files 2017-01-31 08:44:36 +00:00
qmltime Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-24 11:48:14 +01:00
tools.pro Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-13 07:29:03 +01:00