summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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>
* | Bump versionOswald Buddenhagen2017-02-021-1/+1
|/ | | | Change-Id: I9fc841f390283b3711f6fe5548473adfe67a1dc2
* 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>
| * Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | Change-Id: I6be843a4ef3816200157edbf70530e952377169e
| * 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-1241-132/+291
|\| | | | | | | | | | | | | | | 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-269-19/+93
| |\ | | | | | | | | | Change-Id: I42fd801107912d52c3e1bcd52d98d4362e2c27ef
| | * Updated changes file5.7Tomi Korpipää2016-11-141-0/+5
| | | | | | | | | | | | | | | Change-Id: I1487c602e0b9f55f08f1b53413c1d9d1e70768fc Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * 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-0820-83/+82
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0220-82/+82
| | | | | | | | | | | | | | | 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-0224-12/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * | Fixed some autotestsv5.8.0-beta1Tomi Korpipää2016-09-273-17/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some compare types seems to have worked incorrectly and/or differently in previous Qt versions. Made changes to autotests accordingly. Change-Id: Ia2c5da59ebec76718266a8009bbffe060ae32470 Task-number: QTBUG-55910 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Updated README and changes fileTomi Korpipää2016-11-232-3/+9
| | | | | | | | | | | | | | | Change-Id: I7c8ba93e2106133af52b690a48581092094a6a04 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Allow light position modification by userTomi Korpipää2016-11-1810-24/+555
| | | | | | | | | | | | | | | | | | Change-Id: I7efd56754bae16990fd11081493da0a37698f76b Task-number: QTRD-1803 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Update .gitignore to ignore qmlc files and build foldersTomi Korpipää2016-11-171-0/+3
| | | | | | | | | | | | | | | Change-Id: I902ea6af3ee4f0be08ea4cc73a013b00666ece85 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-145-63/+144
| | | | | | | | | | | | | | | | | | Change-Id: I7966292cca04fe990a2fa6a5b4233bf89e77c553 Task-number: QTRD-1807 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | | Bump versionOswald Buddenhagen2016-08-291-1/+1
|/ / | | | | | | Change-Id: I5691ea917b87b3a22882ad380beba76bf3f01cb2
* | 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.7' into devLiang Qi2016-08-026-38/+13
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I709c31705a7edc722039caa4b1c57a0627bde8b9
| * Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.1Liang Qi2016-08-014-37/+9
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/datavisualization/datavisualization.pro Change-Id: Ie79d1c1e959bac9a674a9031c36e7914252805b9
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I70d8aeb77388aa3895007b7aa03f84dad085bc2a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * 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>
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I4193c5b7e08a40a9dc76bc0deaa77593984fe178
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-162-1/+4
| |\ \ | | | | | | | | | | | | Change-Id: I38af779191ffc1038bf04ef22249ac99fb6eca55
| | * | Change file updatedv5.7.0Tomi Korpipää2016-06-091-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I49e6779be815a30e39b72b8701caa679ed1aee2a Reviewed-by: Jani Heikkinen <jani.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>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-243-12/+7
|\| | | | | | | | | | | Change-Id: I05e7c35760c0caf0a8b71823210dc0d78c1784ce
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/datavisualization/datavisualization.pro Change-Id: Iaa51ffb3d2f111595bed4b200cbedd9c2c3b5f34
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 06:21:13 +0000