summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix examples install path for Qt CreatorLeena Miettinen2016-06-021-1/+1
| | | | | | | | | Without this fix, Qt Creator does not find the example files for opening them and tags the examples as "broken". Task-number: QTBUG-53752 Change-Id: I8bc88c79626d1a0f2f6319b3283c9541d6ddd965 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Prospective fix for documentation buildSimon Hausmann2016-05-101-1/+1
| | | | | | | | Make the generated qhp file name match what qdoc expects later for qch generation. Change-Id: I85996c350d89f8d2638b08ba285fee0eba9b5b6f Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Renamed qdocconfTomi Korpipää2016-04-222-3/+2
| | | | | | Task-number: QTBUG-52750 Change-Id: I964f62c8f748022797d604214b0355a807e16b12 Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0833-98/+98
|\ | | | | | | | | | | | | Conflicts: src/datavisualization/utils/qutils.h Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
| * Add explicit and make public headers compile with ↵Marc Mutz2016-03-0333-98/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Change-Id: I579e8714f94884dc555b673c9f85508f17cdc99d Task-number: QTBUG-45291 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * qutils.h: pass the headerclean checkMarc Mutz2016-03-031-1/+1
| | | | | | | | | | | | | | C-style casts aren't allowed in public headers. Change-Id: I1c1d6efb534b767d2ac06ecfae782b7a34bf37eb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Doc: Use a standard documentation config for a Qt modulev5.7.0-alpha1Topi Reinio2016-02-032-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | - Rename index.html to qtdatavisualization-index.html - Use the qt-module-defaults global doc template - Convert 'indexes' into 'depends' - Remove custom buildversion string - Use a namespace consistent with the rest of Qt modules - Update examplesinstallpath to the changes introduced in Qt 5.6 packaging. Change-Id: I0a2db65861181c967ff4ac8ec50949bea8f03101 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | remove debug messageOswald Buddenhagen2016-02-011-2/+0
| | | | | | | | | | | | Change-Id: I3dcad671fe30c7c4d771137a3aa61d33994d2590 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | Only use OpenGL ES2 for Mesa on WindowsJonathan Liu2016-01-192-2/+8
| | | | | | | | | | | | | | | | | | Mesa is used on Linux desktops for open source graphics drivers which support more than OpenGL ES2. This fixes the volumetric example not rendering correctly when using the open source ATI graphics driver. Change-Id: Ibf4df6cc84881a15464653b65d1221b20c853b19 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Make the library name conform to rest of the QtMiikka Heikkinen2016-01-151-7/+2
| | | | | | | | | | | | Change-Id: I5baf9dfc2e560ced991a958de5f8c8734737f3e0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Update version numberMiikka Heikkinen2016-01-152-7/+7
| | | | | | | | | | | | Change-Id: I62c147fce40705f5c5c9ff83651602472bb7be0a Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 04:29:48 +0000