qt/qtdeclarative.git - Qt Declarative (Quick 2)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix outdated BSD license header	Kai Koehne	2017-10-17	2	-4/+24
\| \| \| \| \|	Change-Id: Icc08925454445fc9497fb3bfd2c26efe90605983 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
*	Merge remote-tracking branch 'origin/5.6' into 5.7	Edward Welbourne	2016-07-15	2	-0/+137
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/quick/demos/photoviewer/deployment.pri One side made it redundant; the other removed part of it; remove it all ! src/quick/scenegraph/util/qsgatlastexture.cpp One side changed a preprocessor condition, the other a code condition, on adjacent lines; keep both changes. tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp One side changed a condition, the other the content of its block; keep both. Change-Id: Idb8937f92a7edb28212449dfe0c5cfdb8e6de986
\| *	Fix crash in QQuickShaderEffect::updatePaintNode	Albert Astals Cid	2016-07-05	2	-0/+137
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When having a ShaderEffect and an Image sharing the texture via supportsAtlasTextures This used to work fine in 5.4 but 38cab579a0c5398b7621221fd8609bc43cf1f3c5 removed the check for the provider not being null Change-Id: I18cb969dbf8011ea01543cc079214e8ecbb66623 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* \|	Updated license headers	Jani Heikkinen	2016-01-20	2	-34/+24
\|/ \| \| \| \| \| \| \| \| \| \| \|	From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) Change-Id: I04760a0801837cfc516d1c7c02d4f503f6bb70b6 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
*	Update copyright headers	Jani Heikkinen	2015-02-12	2	-14/+14
\| \| \| \| \| \| \| \| \|	Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I61120571787870c0ed17066afb31779b1e6e30e9 Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com>
*	Update license headers and add new licenses	Jani Heikkinen	2014-08-25	2	-38/+22
\| \| \| \| \| \| \| \| \|	- Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: I84a565e2e0caa3b76bf291a7d188a57a4b00e1b0 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
*	Update copyright year in Digia's license headers	Sergio Ahumada	2013-01-10	2	-2/+2
\| \| \| \| \| \|	Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
*	Change copyrights from Nokia to Digia	Iikka Eklund	2012-09-23	2	-48/+48
\| \| \| \| \| \| \|	Change copyrights and license headers from Nokia to Digia Change-Id: Ie7f5d49ed8235d7a7845ab68f99ad1c220e64d5c Reviewed-by: Lars Knoll <lars.knoll@digia.com>
*	Extra tests for ShaderEffect and CustomParticle	Alan Alpert	2012-04-13	3	-0/+149
	Change-Id: Ieafa97f1f11337c8beac89a05fc5b5706ba6c215 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>