summaryrefslogtreecommitdiffstats
path: root/src/datavisualization
Commit message (Collapse)AuthorAgeFilesLines
...
* Doc: Add \brief commands for property docs (Q3dInputHandler)Leena Miettinen2017-03-021-8/+12
| | | | | Change-Id: Ie133649df4efb6c3acb7bdb3adcc311822aae590 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix some references in ItemModelProxy type docsLeena Miettinen2017-03-021-4/+4
| | | | | Change-Id: Ia32c27f8d05ee8fb87ce4ed9f4bee2d99e0e61de Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QAbstract3dGraph)Leena Miettinen2017-03-022-170/+226
| | | | | Change-Id: I076eafb31ab9710f59eb47287cf91882a56bb8e7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return commands (QAbstract3dInputHandler)Leena Miettinen2017-03-021-8/+14
| | | | | Change-Id: I68118110654675af9e4c514a48a78f501597e54a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (Q3dScene)Leena Miettinen2017-02-271-63/+83
| | | | | | Change-Id: I1124ecce8a81256916e4936dc952ea619082a272 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return commands (QSurfaceDataProxy)Leena Miettinen2017-02-271-10/+10
| | | | | Change-Id: I3a44f525b75a7f89d3aaaaf38342ec5e1de66bae Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (Q3dBars)Leena Miettinen2017-02-272-48/+95
| | | | | Change-Id: I75cb18ad5ea6b7c88c940d52ccb82753fcc0c7c7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QScatter3DSeries)Leena Miettinen2017-02-271-17/+33
| | | | | Change-Id: I7d3e77746ba81f76ec22c7a4b8779df56e680f78 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return commands (Q3dScatter)Leena Miettinen2017-02-272-30/+49
| | | | | Change-Id: I45c048acffc57b56205b694dd4fcb4b89917b5a3 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return QDoc commands (QSurface3dSeries)Leena Miettinen2017-02-271-36/+61
| | | | | | Change-Id: I95eeefc57ccefe8548c76f40157148c0a5cb8196 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Add \brief commands for property docs (QItemModelScatterDataProxy)Leena Miettinen2017-02-271-39/+63
| | | | | Change-Id: I014470926e16e1b5f0b00f263e321302bbfa6652 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief command to property docs (Q3dLight)Leena Miettinen2017-02-271-6/+6
| | | | | Change-Id: Iae596f33b2f263452206cbb7d5728d6d4798738e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit 3D object class and type docsLeena Miettinen2017-02-271-14/+16
| | | | | | | Fix grammar and QDoc command usage. Change-Id: I5d9c3f40b9a2fa83bce42ff3978c27b5358fb87a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (QScatterDataProxy)Leena Miettinen2017-02-271-11/+10
| | | | | | | | - Add \brief commands for property docs - Replace \returns with "Returns". Change-Id: I49b67c8a86135666e43c89f787a0821b48b5587a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (QItemModelSurfaceDataProxy)Leena Miettinen2017-02-231-113/+171
| | | | | | | | | | - Add \brief commands for property docs. - Replace \return with "Returns". - Use the \c command to format "true". - Edit the text where necessary. Change-Id: I9ab1f5ed2c242118990d08da8114012899d88289 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Add \brief commands for property docs (QHeightMapSurfaceDataProxy)Leena Miettinen2017-02-231-10/+33
| | | | | | | | | Separate setter function docs to from property docs, to be able to describe the arguments for the setter functions. Change-Id: I60bd1a31cd1424260070c231af48c9603916d132 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: Fix QDoc commands (QCustom3dVolume)Leena Miettinen2017-02-201-32/+67
| | | | | | | | | | | - Add \brief commands to property docs - Fix \note commands (the colon after the command results in a double colon) - Remove \a commands from property docs - Replace the \return command with "returns" Change-Id: I0dd555a350999d588fff904d5a46c6d57e8f6199 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (QCustom3dLabel)Leena Miettinen2017-02-201-14/+28
| | | | | Change-Id: Iafc407d288ef26d94b33ea07e36f34da5a9f38a0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docs (QCustom3dItem)Leena Miettinen2017-02-201-27/+47
| | | | | Change-Id: I37f31a95e35722a78040055d045206082aaf457c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* 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>
* | 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-186-12/+88
| | | | | | | | | | | | 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>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-08-012-23/+8
|\ | | | | | | | | | | | | Conflicts: src/datavisualization/datavisualization.pro Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
| * 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>
| * 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>