Qt Declarative (Quick 2)
Go to file
Liang Qi da374438be Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/quick/items/qquickimagebase.cpp
	src/imports/layouts/plugin.cpp

Change-Id: I5f48474df4034a1347ec74795c85d369a55b6b21
2016-04-27 08:47:35 +02:00
bin Updated license headers 2016-01-19 14:53:18 +00:00
dist Added change log for 5.6.0 2016-02-26 09:34:34 +00:00
examples Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-27 08:47:35 +02:00
src Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-27 08:47:35 +02:00
tests Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-27 08:47:35 +02:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-08 13:03:25 +02:00
.gitattributes
.gitignore
.gitmodules
.qmake.conf Bump version 2016-02-08 14:55:56 +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 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