aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/textureprovider/etcprovider.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-201-2/+2
|\ | | | | | | | | | | | | | | Conflicts: src/qml/jit/qv4targetplatform_p.h src/quick/accessible/qaccessiblequickitem_p.h Change-Id: Ic95075a5fad81ec997a61561bd65979dfa3b9d4d
| * Fix build of textureprovider example with -opengl dynamicKai Koehne2016-06-131-2/+2
| | | | | | | | | | | | | | | | Do not link to OpenGL calls directly. Instead, use QOpenGLFunctions. Task-number: QTBUG-53841 Change-Id: Ic87bb78fede1ee9f75b81247406ad858b2bf7342 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-01-201-16/+33
|/ | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header instead of LGPL21 one (in those files which will be under BSD) Change-Id: I09ba19590e9425d5116a6c27cbc183debb485dde Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-121-7/+7
| | | | | | | | | 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 licensesJani Heikkinen2014-08-251-19/+11
| | | | | | | | | - 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>
* Fix incorrect merge in textureprovider example.Michael Brasser2013-04-021-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 Brasser2013-04-021-0/+6
| | | | | Change-Id: Idb047bc7bf2c9f1c62c4749cb416bdf267e66e17 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Ensure EtcTexture always provides a valid textureId.Michael Brasser2013-02-151-1/+2
| | | | | Change-Id: I1e7e8095593838f0fc1d78d1cb5a146787f748a7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-071-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 Brasser2013-02-021-0/+80
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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-19 02:04:48 +0000