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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix incorrect merge in textureprovider example.	Michael Brasser	2013-04-02	1	-1/+0
\| \| \| \| \| \|	Change-Id: I5a76ab1ef77c43aecd2a03cc7d614a198290f427 Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
*	Update EtcProvider example to support configurable base url.	Michael Brasser	2013-04-02	3	-4/+22
\| \| \| \| \|	Change-Id: Idb047bc7bf2c9f1c62c4749cb416bdf267e66e17 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
*	Ensure EtcTexture always provides a valid textureId.	Michael Brasser	2013-02-15	2	-4/+14
\| \| \| \| \|	Change-Id: I1e7e8095593838f0fc1d78d1cb5a146787f748a7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
*	Merge remote-tracking branch 'origin/stable' into dev	Frederik Gladhorn	2013-02-07	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|	Conflicts: examples/quick/textureprovider/etcprovider.h src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf tests/auto/quick/qquickflickable/tst_qquickflickable.cpp Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
*	Add ETC1 texture provider example.	Michael Brasser	2013-02-02	9	-0/+464
	This code was removed as a labs import in commit 732a86a11dbc20079e33c289af72762ce0125ced. Bring it back as an example. Change-Id: I057d721117dc75256c4a7229c4f8fad8dc9ac6b2 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>