aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quick/scenegraph/textureinthread
Commit message (Collapse)AuthorAgeFilesLines
* use the override keyword consistently and correctly (clang-tidy)Shawn Rutledge2018-02-271-1/+1
| | | | | Change-Id: If9e28d143f8cba3df3c757476b4f2265e2eb8b2a Reviewed-by: Johan Helsing <johan.helsing@qt.io>
* use nullptr consistently (clang-tidy)Shawn Rutledge2018-02-261-8/+8
| | | | | | | | | | | | | From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-246-20/+70
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/qml/qml/qqmlimport.cpp src/qml/qml/qqmlimport_p.h src/qml/qml/qqmltypenamecache.cpp Done-with: Ulf Hermann<ulf.hermann@qt.io> Change-Id: I41ba7a592b2659ddf53da6952ea3b456a7bba319
| * Fix outdated FDL license headerKai Koehne2017-10-171-5/+5
| | | | | | | | | | Change-Id: I76dccf547de40b5e72fd7abaa062fa96cb2c118a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * Fix outdated BSD license headerKai Koehne2017-10-175-15/+65
| | | | | | | | | | Change-Id: Icc08925454445fc9497fb3bfd2c26efe90605983 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Be (somewhat more) consistent about the value of piEdward Welbourne2017-06-141-1/+1
|/ | | | | | | | | Use M_PI in C++ and Math.PI in JavaScript (including QML). Use qmath.h's value for M_PI where we can't avoid an explicit value. Task-number: QTBUG-58083 Change-Id: Iabe938aff62ceac27b939ec33c6ee5e854aac15e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* examples: replace 'foreach' with 'range for'Anton Kudryavtsev2016-09-031-1/+1
| | | | | | | | While touching the code, replace QStringLiteral with QL1S in QStringBuilder expression. Change-Id: I2519b254d82453e1c9bd5b834c0bd78e5c026f83 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Port examples to new connection syntax.Friedemann Kleint2015-07-221-5/+5
| | | | | Change-Id: I121c59ac0ad56acb4cd54b99ecd37567368385ce Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Fixed license headersJani Heikkinen2015-02-175-15/+15
| | | | | Change-Id: I4d5640ff95e1361ec7e65fb3e87d7726d8185ff5 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* Update copyright headersJani Heikkinen2015-02-126-31/+31
| | | | | | | | | 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>
* Add hint regarding alpha fbo's in the textureinthread example.Gunnar Sletta2014-11-171-0/+2
| | | | | | Change-Id: I92e6a7c2ca9e9f229b1fc463feea9f657ae18db9 Task-number: QTBUG-42486 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Mark custom node in textureinthread dirty after rendering textureTasuku Suzuki2014-08-261-0/+2
| | | | | Change-Id: I4401a6db18b1fcc69403062f3f4775d3b62dfd3e Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Avoid direct GL calls in Qt Quick examples and testsLaszlo Agocs2014-07-011-2/+2
| | | | | | Change-Id: I204a5513708aeff5cae00d06d4f0c27c20a13ace Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Make example work when QOffscreenSurface == QWindowGunnar Sletta2014-04-023-36/+47
| | | | | Change-Id: I7435d91b37a46c0bced301c5c9c82fdf499e0587 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Make example work on WindowsGunnar Sletta2013-10-222-23/+10
| | | | | Change-Id: I75a035939a390de8cdae03c11599efa0b7ed68df Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Disable textureinthread example when threaded gl is not available.Gunnar Sletta2013-05-224-3/+67
| | | | | | Task-number: QTBUG-30077 Change-Id: I8b6e4b8a33819fe84c843e85d863b582cfd69439 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Fix example path for Qt Quick scenegraph examplesTopi Reinio2013-04-291-1/+1
| | | | | | | | Base path (examples/quick) is now defined in qdocconf file, example docs need to adjust their paths for \example command. Change-Id: I18412c4adf73691903ee58c9a056b6a4998d4d6a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Create BG context and fake surface on GUI threadGunnar Sletta2013-04-233-22/+85
| | | | | | | | | | | This makes the example more messy and also makes it very hard to avoid the initial black frame, but it is not compliant with the limitations we experience on Windows. Task-number: QTBUG-30077 Change-Id: If5a6da16f8fc1269cd20d2aa1190588025203d4f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Added examples on how to use FBOs with scene graph.Gunnar Sletta2013-03-038-0/+567
I also cleaned up the naming of the other scene graph examples a bit, so that they sort together in the samples list and have a more obvious naming scheme. Task-number: QTBUG-29548 Change-Id: I455eacb02c06058a6d49e12e4f1813ec80b655f6 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>