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,656 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
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
bin Updated license headers 2016-01-19 14:53:18 +00:00
dist Mention license change in 5.7.0 changelog. 2016-06-08 11:29:55 +00:00
examples Doc: minor spelling issue 2016-07-19 08:38:43 +00:00
src Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-01 13:14:04 +02:00
tests Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-01 13:14:04 +02:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-01 13:14:04 +02:00
.gitattributes Update the git-archive export options 2012-09-10 14:24:05 +02:00
.gitignore Add files generated by tests to gitignore 2014-12-20 20:24:25 +01:00
.gitmodules Update Ecmascript testsuite submodule 2015-03-17 11:38:42 +00:00
.qmake.conf Bump version 2016-07-28 13:50:41 +02:00
.tag Update the git-archive export options 2012-09-10 14:24:05 +02:00
LGPL_EXCEPTION.txt Update copyright headers 2015-02-12 10:28:11 +00:00
LICENSE.FDL Add license files mandated by (L)GPL. 2013-02-15 00:03:10 +01:00
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 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-16 13:42:07 +00:00
LICENSE.LGPL3 Updated license headers 2016-01-19 14:53:18 +00:00
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
qtdeclarative.pro Fix error message when Python could not be found 2016-03-09 16:17:59 +00:00
sync.profile Move QQmlDebugClient into separate static library 2015-10-30 19:05:07 +00:00