summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add a method for checking if context was successfully createdMiikka Heikkinen2015-12-3019-9/+138
| | | | | | | | | | Now it is possible to check after graph construction if the graph is actually usable in environments where the OpenGL support might not be sufficient. Task-number: QTRD-3748 Change-Id: Ia68b4e51386859f6d0c7b09cb44e50a74730ca55 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Fix build with -Werror=old-style-castSimon Hausmann2015-12-171-1/+1
| | | | | | | It appears to be enabled in developer builds in Qt 5.7 Change-Id: Ib96cc866b511d8b947323d27f172dc3dd5f3e46f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix debug-and-release buildFrederik Gladhorn2015-11-061-10/+0
| | | | | | | | | | | | | | | Datavis is part of the Qt release and there is no need to do magic hacks to install the qmldir file. This was supposed to help running examples separately, but we assume that the lib is shipped with Qt proper. The problem was that the qmldir file would be simultaneously copied into the same location twice which will fail on Windows. Change-Id: I1879fc5ff6303104392a66e54d5c278752a12655 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Fix the leaking framebuffer on graph resizeMiikka Heikkinen2015-10-292-0/+3
| | | | | Change-Id: I97e32b56a81afe22aa237055ff6d7db2399b70d3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* OpenGL warning fixTomi Korpipää2015-10-271-1/+1
| | | | | Change-Id: I296a28c2dd105fdd7df6c9fe1ccf30186541e64d Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix issues with COIN buildsMiikka Heikkinen2015-10-22267-212/+477
| | | | | | | | | | | | -Fix miscellaneous compile errors -Move manual tests to manual folder and enable export of autotests -Added widgets requirement -Fixed autotests -Fixed renderer and controller synchronization in QML case -Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL Change-Id: If6619733725d079e339bef16262e5ea1450ab20f Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Update license headersMiikka Heikkinen2015-10-20468-5148/+6552
| | | | | Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Fixed OpenGL 3.x crashTomi Korpipää2015-10-191-0/+2
| | | | | | Change-Id: I43bd6f8d2f565a989e4d48d68a8c610240ed35fb Task-number: QTRD-3492 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Follow Qt 5.6 branchJędrzej Nowacki2015-10-191-2/+2
| | | | | Change-Id: I7847f592cb5d69b8b6ddf03f11a285d64dbce00c Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Fix compilation with namespaced Qt.Friedemann Kleint2015-09-219-6/+12
| | | | | | Task-number: QTRD-3655 Change-Id: Id68e9cec8d1093fe1557b07a148ae04a27656284 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix compile warnings about shadowMiikka Heikkinen2015-09-146-13/+13
| | | | | | | | Renamed some function parameters so that they do not trigger shadow warnings. Change-Id: Iea6561d26d3f77d075fc7f30b047bfa4d34cb2e7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Correct file version, description, and product nameMiikka Heikkinen2015-09-112-0/+10
| | | | | Change-Id: Ic90d3b04434d07e12c313c56d7217d7bf550cdb3 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Version numbers and change file update for 1.2.2Miikka Heikkinen2015-09-115-9/+15
| | | | | Change-Id: I2933c3fd121d6c20bf2e5585aed63351046318ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Data member initialization removed from header.Mika Salmela2015-07-032-7/+9
| | | | | Change-Id: I12ff4abfe54a54831f833a5e23a8367dd5792210 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix building against 5.6Miikka Heikkinen2015-06-1781-109/+109
| | | | | | | | Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS macros instead of 'signals' and 'slots' in headers. Change-Id: I4140b1fff4386d74bb371176919234366965e887 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Add dist file for 1.2.1 and change version numbersMiikka Heikkinen2015-04-145-9/+18
| | | | | Change-Id: Ia6bd240a8737fe9dbb6bf2d019cb032c7b60a874 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Copyright header changesMika Salmela2015-04-14471-1410/+1410
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* qmlscatter example: Give a default size to the view itemCaroline Chao2015-03-111-0/+2
| | | | | | | | | On OS X the content item of the view must have a valid width or height. Change-Id: I6903671a9bd39511a4d0d649819b68930597260d Task-number: QTRD-3469 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Qt 5.5 fixesTomi Korpipää2015-02-234-0/+1
| | | | | Change-Id: I01260f9849340ea5cce2b5c00aa6c2c50192720c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Dust and H2 to galaxyMika Salmela2014-12-124-6/+158
| | | | | Change-Id: I3bd3357fe73fbed68498311e0fd2a969980369a3 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Write fps to file.Mika Salmela2014-12-083-5/+39
| | | | | Change-Id: I303c243b25da0003ca86e5085b913f54a14dc86f Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fixes to galaxy.Mika Salmela2014-12-083-28/+58
| | | | | Change-Id: I41a666177526db8563eee5799dee57e9994800dc Signed-off-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Improve button width setting on perf tester.Mika Salmela2014-12-041-4/+4
| | | | | Change-Id: I1106cfbfca839d6af09a6cc505e2630ab2b9dc49 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Galaxy improvement.Mika Salmela2014-12-043-51/+48
| | | | | Change-Id: I87ed53c41929e13e8d77236726b30dc5d89df077 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Initial version of Galaxy.Mika Salmela2014-12-048-0/+907
| | | | | Change-Id: I29898bed342022290c8c8a6c4459969ffba3df56 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Once more crash fix on texture adding.Mika Salmela2014-11-211-5/+13
| | | | | | | B2Qt device called uvs creation before array creation. Change-Id: Ia0cac175a3e0769f2571a0eadc7c764ae4092cc2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix crash when adding a texture on QMLMika Salmela2014-11-211-5/+7
| | | | | | | | When texture was attached on the qmlsurface example, the smoothUVs was called before the actual model mesh was created. Change-Id: I5a62b06291232df54ce08d586d8794b332a4eece Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Minor tweaks to texturesurface example.Miikka Heikkinen2014-11-212-1/+2
| | | | | | | | | Change the color of untextured surface so it isn't included in the gradient. Also make it clear the gradient is for highlight only. Change-Id: I822c59b905559da10a987e4a7d616d01dccdedba Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix flickering in android on some examples when zooming.Miikka Heikkinen2014-11-211-0/+5
| | | | | Change-Id: I3c9de6801430dc74c97fb6563ded6114befc6968 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix invalid enum error in OpenGL ES2 builds.Miikka Heikkinen2014-11-212-10/+4
| | | | | Change-Id: Ib4587a608a7b79d863d51e1a9ecd150996245fa7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make customitems example actually show some custom items.Miikka Heikkinen2014-11-212-0/+5
| | | | | Change-Id: I056b71fc913e5fd68b895d6bf4b5676cbe7c6db0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix incorrect shader initialization for static optimized es2Miikka Heikkinen2014-11-211-2/+2
| | | | | | Change-Id: I8fdacfde272ace4c25c74c316de514cd4275da74 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix WinRT issues.Miikka Heikkinen2014-11-1915-28/+28
| | | | | | | | | | Primary fix is to not use shared context in qml with WinRT, as that causes black screen. Also removed widget apps from build in WinRT. Change-Id: Id65ce90dbeb80442194ab838952e8cadc91135a6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Support larger custom meshes.Miikka Heikkinen2014-11-1814-126/+23
| | | | | | | | | | Vertex index was limited to unsigned short, meaning even slightly complex meshes couldn't be used. Changed to unsigned int. Also removed unused vertex indexer methods. Change-Id: Iebe62bd3a501dc79ee2857cca28ac0d05bd4a55e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Some doc updatesMiikka Heikkinen2014-11-182-1/+3
| | | | | Change-Id: Ib4bb651877db4aa0dfd13cb8f1c08e786960a221 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Remove cpp autotests from android builds.Miikka Heikkinen2014-11-171-1/+1
| | | | | Change-Id: I1b80c618af7739ec42cac3cccdfc948e979c52d9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix the required creator versionMiikka Heikkinen2014-11-141-1/+1
| | | | | Change-Id: I14c8a065bf89b471c31f1cdad2550f35e02ef233 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* renaming toolTip to tooltipThomas Hartmann2014-11-143-40/+40
| | | | | | | | This was changed in Qt Creator 3.3 for consistency reasons. Change-Id: I164b5bff88b2cc3091aaf48e57fb12ef60e2a6aa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Fix typo in docsMiikka Heikkinen2014-11-131-1/+1
| | | | | Change-Id: Iad4d07765b9f1310baf3b43d5307906c9887bca6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Change copyright headers.Miikka Heikkinen2014-11-07462-3233/+3233
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fixed Valgrind reported issues in cpp testsMiikka Heikkinen2014-11-069-87/+116
| | | | | Change-Id: I284832fc697e0ac6ef1ba1bb857892a10cbcd8fd Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added flags to software renderer test Tomi Korpipää2014-11-052-0/+4
| | | | | | Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Change-Id: I0667a0e53fd07fe9c6ce7b2d63887eda1692bf3b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fixed font size jumping in ES2 Tomi Korpipää2014-11-051-1/+1
| | | | | | | | Task-number: QTRD-3412 Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4 Change-Id: I7f19ee34ccdde3a227033e3a88994e157b0092c4 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Force software renderer to using ES2 Tomi Korpipää2014-11-054-11/+59
| | | | | | | Task-number: QTRD-3410 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Qml perf data generation on cppMika Salmela2014-11-036-30/+104
| | | | | Change-Id: If770c96ff84e49a747c4355e56bff002556cd659 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix compiler warning on 64bit linuxMiikka Heikkinen2014-11-032-3/+3
| | | | | Change-Id: I4ab8d595ac9f8b069057178079ad7714eaf6e13c Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix qmloscilloscope linking issue on some envsMiikka Heikkinen2014-11-031-1/+1
| | | | | Change-Id: Iab45f95e8ff0faacc5cf50fdf052bf2c69d7988a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fixed surface slice problemTomi Korpipää2014-10-311-1/+1
| | | | | | Task-number: QTRD-3402 Change-Id: I70ef641fc7249b144d6e98971f1fb74f2935d706 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Allow small delay in scene test for viewport resizeMiikka Heikkinen2014-10-311-1/+1
| | | | | | | | | | On linux, there seems to be some asynchronous activity related to window resizing, since calling processEvents() is not enough to ensure viewport size gets updated in subViews test. Use QTRY_COMPARE to allow for small delay. Change-Id: Idae04ff9436c819ef150caa57f6fa988e4011746 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Use QOffscreenSurface instead of QWindow for dummy surfaces.Miikka Heikkinen2014-10-303-9/+7
| | | | | | | | | Android doesn't like creating extra QWindows, so changed dummy surfaces used to do static initialization and cleanup to use QOffscreenSurface. Change-Id: Ia42e288a05ef49524252c457f3a3494677e3fc63 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>