summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix build for -no-feature-wheeleventStephan Binner2017-04-2410-0/+20
| | | | | Change-Id: I0a436ec2606fe6d76665ef147667c7d8ea5c59e4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit custom item, label, and volume docs for grammar and stylev5.9.0-beta3v5.9.0-beta2Leena Miettinen2017-04-073-114/+145
| | | | | Change-Id: I2b5a546c5035cbf304db57d3e18c998421969392 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit data item docs for grammar and styleLeena Miettinen2017-04-073-44/+47
| | | | | Change-Id: Ic93eb2648bdff84e88acdf7941ddd85cc6d874ca Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit data proxy documentation for grammar and styleLeena Miettinen2017-04-074-195/+249
| | | | | Change-Id: Ibf26f40e53e8dab3cea717c6ca55e2568cb747e1 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix warning about member initialization out of orderThiago Macieira2017-04-031-1/+1
| | | | | | | | | | | Instead of fixing the order in the constructor, let's fix the order of the declarations to follow the rule of thumb to avoid padding holes. q3dlight.cpp:107:5: warning: field 'q_ptr' will be initialized after field 'm_automaticLight' [-Wreorder] Change-Id: I27b55fdf514247549455fffd14b17abe78cbad28 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit the series docs for grammar and stylev5.9.0-beta1Leena Miettinen2017-03-274-115/+133
| | | | | Change-Id: I9b03e4e3cf600fa68a4d7f0372b0fba676affb65 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Edit the axes documentation for grammar and styleLeena Miettinen2017-03-245-135/+157
| | | | | Change-Id: I2109585660af7cfcae2cfd779ebfc67d341a09f5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add an overview of data visualizationLeena Miettinen2017-03-213-35/+279
| | | | | | | | | Move some information from the front page and the known issues to the overview. Add some information to the interacting with data topic. Change-Id: Ia63e1d46ec48861a144c51f0d8796809ea771ea4 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc error by using #ifndef Q_QDOC to omit unused functionLeena Miettinen2017-03-172-2/+4
| | | | | | | | Also fix the function signature in the qdoc file. Change-Id: If8a7cb83f94efb9a5a999c99fce722e4ffb96312 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Enable transparency for wallsMika Salmela2017-03-103-48/+106
| | | | | | | | | | When alpha value for wall is below 1.0, enable blending for walls. Rearrange code so that solid objects are drawn first and then possible tranparent objects. Task-number: QTBUG-59140 Change-Id: I5087a664a59ecdb4516b17e8fac1f8ff48ad1c16 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Remove installation and build informationLeena Miettinen2017-03-032-118/+6
| | | | | | | | Qt Data Visualization is now a standard Qt module that can be installed and built as any other module. Change-Id: Idb7e05304e159c30614d728529261d3ec2ea6002 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands for property docsLeena Miettinen2017-03-031-119/+258
| | | | | Change-Id: I21c74d848088bdbf1ddfc4339deede65eb750c6f Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix \brief and \return commands (Q3dSurface)Leena Miettinen2017-03-022-38/+52
| | | | | | | | Remove property getter docs, because they do not add any info, and move setter docs to separate entries. Change-Id: I78a0dab0ec9652b58b319f09dc5266e36d12e85a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Add \brief commands to property docs (Q3dCamera)Leena Miettinen2017-03-021-54/+63
| | | | | Change-Id: If73980ebc6b34ebae2c362f90837e62910477d37 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Doc: Fix QDoc commands (QItemModelBarDataProxy)Leena Miettinen2017-03-021-38/+64
| | | | | | | | | - Use \list command for lists - Add \brief commands for property docs - Replace \returns with "returns" Change-Id: I7930a9dd9ce87c61e8381a5e2c4f42c7bf0ae75a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* 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>
* | 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