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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'origin/5.5' into dev	Simon Hausmann	2015-06-04	1	-5/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/qml/jsruntime/qv4engine_p.h src/quick/items/qquickitemsmodule.cpp src/quick/items/qquicktext.cpp src/quick/util/qquickpixmapcache.cpp tests/auto/quick/qquickwindow/tst_qquickwindow.cpp Change-Id: I90ecaad6a4bfaa4f36149a7463f4d7141f4a516a
\| *	qmllint: Fix parsing js files with .import directives	Sérgio Martins	2015-05-09	1	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For .pragmas we removed them explicitly but the correct fix is to not use "qmlMode" when setting code in the lexer. Change-Id: I6ffc0ca9e7ebab09fbf91e647d292ff0a3a1fd7d Task-number: QTBUG-45916 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* \|	Get rid of qv4value_inl_p.h and replace it by qv4typedvalue_p.h	Lars Knoll	2015-04-24	1	-1/+1
\|/ \| \| \| \| \| \| \|	This is a cleaner separation and further reduces include dependencies in the definitions of our basic data structured. Change-Id: I18aa86cdea0c0dfbc16075d4d617af97e638811e Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
*	Update copyright headers	Jani Heikkinen	2015-02-12	1	-6/+6
\| \| \| \| \| \| \| \| \|	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	1	-18/+10
\| \| \| \| \| \| \| \| \|	- 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>
*	Introducing qmllint tool.	Sérgio Martins	2014-08-05	2	-0/+120
	A command line program that returns 0 if a .qml file is syntactically correct. Ideal to integrate into continuous integration systems. [ChangeLog][QtQml] Added QML linter tool. Change-Id: Id420159298e9d2390acd870fee9cf1c3d08e2dec Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>