qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Qt Declarative (Quick 2)
11,816 Commits 82 Branches 267 Tags 291 MiB
C++ 60.5%
QML 26.7%
JavaScript 9.1%
CMake 2.2%
Objective-C++ 0.4%
Other 1%
Go to file
Laszlo Agocs 9ff09fb283 Merge remote-tracking branch 'origin/dev' into wip/scenegraphng 
Conflicts:
	src/quick/items/qquickopenglshadereffectnode.cpp
	src/quick/items/qquickshadereffect.cpp
	src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h
	src/quick/scenegraph/qsgdefaultglyphnode_p.h

Change-Id: I3d6874b4e4231a89d2836c04fe8e7f2ef2d698c4
 		2016-05-24 11:33:42 +02:00
bin Updated license headers 2016-01-19 14:53:18 +00:00
config.tests/d3d12 Add the skeleton for a D3D12 backend 2016-02-19 14:51:37 +00:00
dist Added change log for 5.6.0 2016-02-26 09:34:34 +00:00
examples Merge remote-tracking branch 'origin/dev' into wip/scenegraphng 2016-05-24 11:33:42 +02:00
features Add the skeleton for a D3D12 backend 2016-02-19 14:51:37 +00:00
src Merge remote-tracking branch 'origin/dev' into wip/scenegraphng 2016-05-24 11:33:42 +02:00
tests Merge remote-tracking branch 'origin/dev' into wip/scenegraphng 2016-05-24 11:33:42 +02:00
tools Merge remote-tracking branch 'origin/dev' into wip/scenegraphng 2016-05-24 11:33:42 +02:00
.gitattributes
…
.gitignore D3D12: Basic image support 2016-03-07 16:13:06 +00:00
.gitmodules
…
.qmake.conf Bump version 2016-02-24 12:50:26 +01:00
.tag
…
LGPL_EXCEPTION.txt
…
LICENSE.FDL
…
LICENSE.GPL2 Updated license headers 2016-01-19 14:53:18 +00:00
LICENSE.GPL3 Updated license headers 2016-01-19 14:53:18 +00:00
LICENSE.GPL3-EXCEPT Updated license headers 2016-01-20 11:46:25 +00:00
LICENSE.GPLv3 Add the GPLv3 license text 2015-08-13 15:04:27 +02:00
LICENSE.LGPL3 Updated license headers 2016-01-19 14:53:18 +00:00
LICENSE.LGPLv3 Add the GPLv3 license text 2015-08-13 15:04:27 +02:00
LICENSE.LGPLv21
…
qtdeclarative.pro Merge remote-tracking branch 'origin/dev' into wip/scenegraphng 2016-04-13 09:19:18 +02:00
sync.profile Move QQmlDebugClient into separate static library 2015-10-30 19:05:07 +00:00