Qt Declarative (Quick 2)
Go to file
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
config.tests/d3d12 D3D12: Support translucent windows via DirectComposition 2016-07-14 13:05:13 +00:00
dist Add changes file for 5.8.0 2016-12-09 12:14:10 +00:00
examples Merge remote-tracking branch 'origin/5.9' into HEAD 2017-03-23 14:43:46 +01:00
features
src Merge remote-tracking branch 'origin/5.9' into HEAD 2017-03-23 14:43:46 +01:00
tests Merge remote-tracking branch 'origin/5.9' into HEAD 2017-03-23 14:43:46 +01:00
tools Merge remote-tracking branch 'origin/5.9' into HEAD 2017-03-23 14:43:46 +01:00
.gitattributes
.gitignore Merge remote-tracking branch 'origin/5.7' into dev 2016-08-19 21:22:10 +02:00
.gitmodules
.qmake.conf Bump version 2017-02-02 15:30:41 +01:00
.tag
LGPL_EXCEPTION.txt
LICENSE.FDL
LICENSE.GPL2
LICENSE.GPL3
LICENSE.GPL3-EXCEPT
LICENSE.GPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-16 13:42:07 +00:00
LICENSE.LGPL3
LICENSE.LGPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-16 13:42:07 +00:00
LICENSE.LGPLv21 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-16 13:42:07 +00:00
configure.json Convert qtdeclarative over to use the new configure system 2016-10-10 14:11:39 +00:00
qtdeclarative.pro Convert qtdeclarative over to use the new configure system 2016-10-10 14:11:39 +00:00
sync.profile Merge remote-tracking branch 'origin/5.6' into 5.7 2016-11-15 10:57:49 +01:00