summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Add \brief commands for property docs (QBar3DSeries)Leena Miettinen2017-02-171-17/+36
| | | | | | | Separate documentation for setSelectedBar() from the property docs. Change-Id: Iaf9e6b2cfeccd47cb5b3fee2fa8cd8baa43b8fcd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QBarDataProxy)Leena Miettinen2017-02-171-9/+14
| | | | | Change-Id: Ia3e4811e76f63913d84d86d9e0d41f5976b3c4ad Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief command for property docs (QAbstractDataProxy)Leena Miettinen2017-02-171-1/+1
| | | | | Change-Id: Ie23fb3c9cd5a1e2197fda2231cf6b5dab9e3f64c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (QAbstract3dSeries)Leena Miettinen2017-02-171-72/+71
| | | | | | | Remove \a commands from property docs. Change-Id: I50b7cdbe144d157580c9e647a44708e93ab81784 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (axis)v5.9.0-alpha1Leena Miettinen2017-02-104-35/+72
| | | | | | | | Adjust the text as necessary. Also remove \a commands, because properties don't take arguments. Change-Id: I9f2198e383806de6a4f06745f1398d67aee4ac09 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-243-6/+4
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I10b221188c4306563f3b150f048d5f99aefc9fb1
| * Fixed incorrect value axis autoAdjustRange behavior5.8Tomi Korpipää2017-01-041-3/+3
| | | | | | | | | | | | Change-Id: I8c52745f18a710add9e257a4fe587833f711a2f2 Task-number: QTBUG-57599 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * remove redundant MODULE_INCNAMEOswald Buddenhagen2017-01-021-2/+0
| | | | | | | | | | | | | | | | the value was the default, and the variable is reserved for Very Special Magic (TM) anyway. Change-Id: Ib81471b685471f5a2f7c1d0f0c2443c09c1e9707 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| * Fix warning about change of signThiago Macieira2016-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | setSelectionIdRange takes uint as parameters, so pass unsigneds. engine/surface3drenderer.cpp(2445): warning #68: integer conversion resulted in a change of sign Change-Id: Idc347fbb462f4122b044fffd14905eea36583259 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Add mutex guards for AbstractDeclarative::updateWindowParametersMika Salmela2017-01-125-0/+12
| | | | | | | | | | | | | | | | | | | | | | Adds a mutex to guard that pointer to controller is not deleted while doing updateWindowParameters. The render thread doesn't have control to the node mutex, so that won't apply since it may be deleted while requesting a mutex. Change-Id: I8897954415c1bd7ab61ef99b420c9ac2aaa89411 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-1216-49/+139
|\| | | | | | | | | | | | | | | Conflicts: tests/auto/cpptest/q3dscene/tst_scene.cpp tests/auto/qmltest/scene3d/tst_scene.qml Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124
| * qtouch3dinputhandler_p.h: Add "We mean it." commentFriedemann Kleint2016-12-021-0/+10
| | | | | | | | | | | | | | | | Fix warning: QtDataVisualization: WARNING: qtdatavis3d/src/datavisualization/input/qtouch3dinputhandler_p.h does not have the "We mean it." warning Change-Id: I74c3c0d8f525322b135302b3ddd166c7d99010f1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Handle data proxy change on the controllerMika Salmela2016-11-296-3/+24
| | | | | | | | | | | | | | | | Adds a connection to controllers to react dataProxyChange signal. Task-number: QTBUG-57291 Change-Id: Ia9ad6880418ec861381e1a5363ce38f8d0bda2e8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-rc1v5.8.0Liang Qi2016-11-268-19/+88
| |\ | | | | | | | | | Change-Id: I42fd801107912d52c3e1bcd52d98d4362e2c27ef
| | * Ensure that the formatter is respected for zero and negative valuesTomi Korpipää2016-11-148-19/+88
| | | | | | | | | | | | | | | | | | | | | | | | This also ensures that INF and NaN numbers are also handled correctly Task-number: QTBUG-57075 Change-Id: I8db693cb28303bc13f936c818147fe31b7ee1199 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-081-10/+9
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/datavisualization/bars/doc/src/bars.qdoc examples/datavisualization/custominput/doc/src/custominput.qdoc examples/datavisualization/customitems/doc/src/customitems.qdoc examples/datavisualization/draggableaxes/doc/src/draggableaxes.qdoc examples/datavisualization/itemmodel/doc/src/itemmodel.qdoc examples/datavisualization/qmlaxisdrag/doc/src/qmlaxisdrag.qdoc examples/datavisualization/qmlaxisformatter/doc/src/qmlaxisformatter.qdoc examples/datavisualization/qmlcustominput/doc/src/qmlcustominput.qdoc examples/datavisualization/qmloscilloscope/doc/src/qmloscilloscope.qdoc examples/datavisualization/qmlscatter/doc/src/qmlscatter.qdoc examples/datavisualization/qmlspectrogram/doc/src/qmlspectrogram.qdoc examples/datavisualization/qmlsurface/doc/src/qmlsurface.qdoc examples/datavisualization/qmlsurfacelayers/doc/src/qmlsurfacelayers.qdoc examples/datavisualization/rotations/doc/src/rotations.qdoc examples/datavisualization/scatter/doc/src/scatter.qdoc examples/datavisualization/surface/doc/src/surface.qdoc examples/datavisualization/texturesurface/doc/src/texturesurface.qdoc examples/datavisualization/volumetric/doc/src/volumetric.qdoc src/datavisualization/doc/src/qtdatavisualization.qdoc Change-Id: Ic15e77b1fee0708a235bf21815f72b854981537a
| | * Doc: Use capitalization in section titlesTopi Reinio2016-11-021-9/+9
| | | | | | | | | | | | | | | Change-Id: I3ea9dde5f98813716d754d292af1f005d33ba98e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| | * Doc: Add a \brief command to the QtDataVisualization namespace docsLeena Miettinen2016-10-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | ...to display them correctly in tables. Change-Id: I09c92ebbe684828e282b7675b584a971f0f72f4f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * | Doc: Add dependency to Qt Widgets to enable automatic linkingLeena Miettinen2016-11-041-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Idf59ce8f3c225cbcd5c314fc1c25d94696ac3436 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * | Doc: Add section on running examples to example docsLeena Miettinen2016-11-021-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Include examples-run.qdocinc from qtbase/doc/global. - Add section title to Audiolevels example docs. - Remove unnecessary leading paragraph from Custom Proxy example docs. - Remove information about running examples from Getting Started topic. Change-Id: I33e8189fa20bad38e52f424b0143b4031ad7872f Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | Doc: Use standard headings on the front pageLeena Miettinen2016-11-021-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | Link to the examples page instead of listing the examples here. Change-Id: Ia1ae2796055d42e1aa5de8768808c23ab5d02134 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Allow light position modification by userTomi Korpipää2016-11-188-16/+543
| | | | | | | | | | | | | | | | | | Change-Id: I7efd56754bae16990fd11081493da0a37698f76b Task-number: QTRD-1803 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Check if we got OpenGL2.1 functions before trying to use themTomi Korpipää2016-11-172-2/+10
| | | | | | | | | | | | | | | | | | Change-Id: Ia8b4a25094d4a608d3a20b808fd14c3941ae2dff Task-number: QTRD-2116 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Fixed inability to set subviewportsTomi Korpipää2016-11-142-49/+114
|/ / | | | | | | | | | | Change-Id: I7966292cca04fe990a2fa6a5b4233bf89e77c553 Task-number: QTRD-1807 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* / Fix loading of QML pluginsv5.8.0-alpha1Simon Hausmann2016-08-291-1/+1
|/ | | | | | | | | | Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader is strict about requiring the correct interface id, to avoid loading unrelated plugins in the loader thread (which they may not be prepared to do). Change-Id: Ie7ef84be45bb89887fac47fd9ac1d024a0a41acd Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-08-013-36/+9
|\ | | | | | | | | | | | | Conflicts: src/datavisualization/datavisualization.pro Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
| * Set up relation with c++ module correctlyTomi Korpipää2016-05-241-3/+1
| | | | | | | | | | | | | | TARGETPATH to be removed in 5.7 Change-Id: I5f2b7c6c82e10bed6b7a2358d8269bc0aef26542 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * Don't duplicate functionality from various .prf filesTomi Korpipää2016-05-231-7/+0
| | | | | | | | | | | | Change-Id: Ibaf10cb5806dae0287888a20d26e34d4dfefff75 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Remove unused non-standard test export macrosTomi Korpipää2016-05-231-8/+0
| | | | | | | | | | Change-Id: Ifcfb6eaddfd5e54820bb3f5af235833b7f906b3c Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * Use standardized module export macrosTomi Korpipää2016-05-232-16/+9
| | | | | | | | | | | | Change-Id: Id6122641b63d8e1435314c1ae8492a7ee96b25a8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Remove redundant handling of static buildsTomi Korpipää2016-05-201-3/+0
| | | | | | | | | | | | Change-Id: I7f504bcd21045d6eaf2534d3ab2416b402e88b87 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Place load(qt_module) at the end of the project fileTomi Korpipää2016-05-201-2/+1
| | | | | | | | | | | | Change-Id: I612e0334d72c0405b7c180c1e90381eb5641dcaa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Remove debug messageTomi Korpipää2016-05-191-1/+0
| | | | | | | | | | Change-Id: I7bab1d2f8187a65abf3602e19e9baa6f78d0c496 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 11:18:38 +0000