summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Copyright file update to GPLMiikka Heikkinen2016-01-12226-2034/+3842
| | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Add a method for checking if context was successfully createdMiikka Heikkinen2015-12-306-8/+46
| | | | | | | | | | 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-291-0/+2
| | | | | 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-2217-26/+109
| | | | | | | | | | | | -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-20226-2486/+3164
| | | | | 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>
* 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-112-7/+7
| | | | | Change-Id: I2933c3fd121d6c20bf2e5585aed63351046318ed Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Fix building against 5.6Miikka Heikkinen2015-06-1757-71/+71
| | | | | | | | 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-142-7/+7
| | | | | Change-Id: Ia6bd240a8737fe9dbb6bf2d019cb032c7b60a874 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Copyright header changesMika Salmela2015-04-14227-682/+682
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
* 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>
* 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-191-1/+1
| | | | | | | | | | 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-1813-126/+22
| | | | | | | | | | 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>
* 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>
* Change copyright headers.Miikka Heikkinen2014-11-07227-1588/+1588
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.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-053-10/+57
| | | | | | | Task-number: QTRD-3410 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Change-Id: I86b240b6548ec4c94f6be0dc352ed112965926f3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix compiler warning on 64bit linuxMiikka Heikkinen2014-11-032-3/+3
| | | | | Change-Id: I4ab8d595ac9f8b069057178079ad7714eaf6e13c 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>
* 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>
* Fix another crash at app shutdown.Miikka Heikkinen2014-10-301-3/+2
| | | | | | | Context doesn't exist on all envs at shutdown. Change-Id: I6c0398203f0ab3ceaa38f64936cdf375c43e9f55 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix crash on application shutdown.Miikka Heikkinen2014-10-301-1/+1
| | | | | | | | Label items should not try to delete their textures at destructor if they are already deleted. Change-Id: I8131301bec47a0a2617b4a923d7cce430d35e18b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Designer plugin bug fix Tomi Korpipää2014-10-302-2/+2
| | | | | | | | Radiallabeloffset needs 2 decimals, as step size is 0.01 Change-Id: I7766613737beb217f6dd68b5a9aca666b15c7fab Change-Id: I7766613737beb217f6dd68b5a9aca666b15c7fab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix crash when initializing QCustom3DLabel out of context.Miikka Heikkinen2014-10-292-32/+40
| | | | | | Task-number: QTRD-3391 Change-Id: I5c2f2b674e50e7d39bc9355ebc9bcf05f22d5a39 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Add missing includes to utils.cpp.Miikka Heikkinen2014-10-291-0/+2
| | | | | Change-Id: I46db1f02575b8d140890708bf04633fa23f28a15 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Support for dynamic opengl builds.Miikka Heikkinen2014-10-2926-988/+927
| | | | | | Task-number: QTRD-3392 Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Squeeze labels on ES2Mika Salmela2014-10-283-10/+28
| | | | | | | | | | If the label text with slightly smaller font would fit into smaller texture, force to use the smaller one. Task-number: QTRD-3395 Change-Id: Ib70f6722ea8403e4aa25ed190b21c059d9d0e062 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Added v1.2 properties to designer pluginTomi Korpipää2014-10-283-0/+228
| | | | | | | | Also added missing properties from v1.1. Task-number: QTRD-3396 Change-Id: Ic001e726dbe09238ab51b1fdfb2a58d99b5e29e2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Mac touchpad support addedTomi Korpipää2014-10-274-1/+30
| | | | | | Task-number: QTRD-2286 Change-Id: Ibe211caedab231e908af900af65d4075b926a875 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Make build check for existence of quick module.Miikka Heikkinen2014-10-241-2/+3
| | | | | Change-Id: Icd04b72bb7bdbf34c73e6f27c90674fda4fc4cc2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Release housekeepingMiikka Heikkinen2014-10-248-72/+305
| | | | | | | | | - Changed the version number to 1.2 where relevant. - Regenerated plugins.qmltypes - Updated known issues Change-Id: I5f737a970d0ac7fc14dbd2d30a8684ecced45ac0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Surface shadow improvementMika Salmela2014-10-227-13/+80
| | | | | | | | | Not allowing bias go below 0.001 prevents the shadow acne. Faulty formula for lighning direction. Task-number: QTRD-3382 Change-Id: Ided8bf423a961744ace8bef32ae18d6fa2c443ef Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added C++ autotests for seriesTomi Korpipää2014-10-211-0/+3
| | | | | | | | | Also fixed a bug found in testing, and added tests for optional constructors for already tested classes. Task-number: QTRD-3368 Change-Id: I2214f28e2c5069ecab422fc6817acb2f0c0b192b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix shadows when viewing directly from above.Miikka Heikkinen2014-10-211-8/+21
| | | | | | | | | | | Fudge the camera y-angle so that it's never looking directly from above or below. The actual problem is that eye vector is paraller to up vector if viewing directly from above, which results in invalid view matrix. Task-number: QTRD-2789 Change-Id: Ia79b8bb4b8317c6aaf6ac4c70a6bb70c24b5309e Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Document the issue with large surfaces and static scatters.Miikka Heikkinen2014-10-203-8/+30
| | | | | | | | | | OpenGL ES2 and/or 32bit environments can have relatively low maximum supported vertex counts per draw call, so large surfaces and static scatters may not get rendered. Task-number: QTRD-3364 Change-Id: I7fd024b0428548ac7e2ca043a06d01d2442dd226 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Qt 5.4 qml type fix Tomi Korpipää2014-10-171-1/+1
| | | | | | | | Fixes missing QML Types in assistant. Change-Id: Id79c3f281ec4fcc9bd9816ec731ff654e61b3e04 Change-Id: Id79c3f281ec4fcc9bd9816ec731ff654e61b3e04 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Added invalid value tests for QML autotestsTomi Korpipää2014-10-172-2/+3
| | | | | | | | | Plus fixed a QML documentation bug, and added a missing inheritance to docs. Task-number: QTRD-3383 Change-Id: I1f7c56c49b829fee2cfd0731bbcc7e248a06a0c0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Test for QML proxiesTomi Korpipää2014-10-161-8/+8
| | | | | | | | Also added missing default values to some docs. Task-number: QTRD-3368 Change-Id: I98940a80d6edfe60801c6b2606307b3ec3ab8c39 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>