summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | 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
| | * Remove debug messageTomi Korpipää2016-05-191-1/+0
| | | | | | | | | | | | | | | Change-Id: I7bab1d2f8187a65abf3602e19e9baa6f78d0c496 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * | 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>
| * | Skip build for missing opengl dependenciesKai Koehne2016-05-031-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | Do not error out if opengl is missing, but rather skip the build. This allows people to compile qt-everywhere packages with e.g. -no-opengl . Change-Id: I08212b53e37931347b6f6bea5736f99111bcdc92 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.7' into devLiang Qi2016-04-0834-98/+101
|\| | | | | | | | | | | Change-Id: I17383a4cdebb3c54489f6f39e1ad7ae136d80971
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0834-98/+101
| |\| | | | | | | | | | | | | | | | | | | Conflicts: src/datavisualization/utils/qutils.h Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
| | * fix namespaced buildOswald Buddenhagen2016-04-061-0/+3
| | | | | | | | | | | | | | | Change-Id: I76b85f4e2653f20a368b4b413b29c733a6a3f300 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| | * 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>
* | | Bump versionOswald Buddenhagen2016-02-231-1/+1
|/ / | | | | | | Change-Id: I761e9d0a7ea0d2fc813f843cd7c09dba2269cb78
* | Doc: Use a standard documentation config for a Qt modulev5.7.0-alpha1Topi Reinio2016-02-033-16/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
* | add missing repo dependenciesOswald Buddenhagen2016-02-011-0/+2
| | | | | | | | | | Change-Id: I39b962ac2e6cf8418d8405a0bc3b08fc8fdb3e56 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@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>
* | Rename top-level project file to match repository nameSimon Hausmann2016-02-011-0/+0
| | | | | | | | | | | | | | | | The consistency between project file name and repository name avoids the need to code the name of the .pro file in .gitmodules. Change-Id: I458a0f5ad8bb5084fdb0c5b54bdc0bc29385392e Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-261-2/+2
|\| | | | | | | | | | | | | Conflicts: sync.profile Change-Id: If94131861d9c00514fb7b6a035c8895b2d7c937b
| * Fix sync.profile dependency versioningv1.2.2Simon Hausmann2016-01-251-2/+2
| | | | | | | | | | | | | | | | Do not hard-code the version of the dependencies here, the CI system determines the version based on the target branch of the module. Change-Id: I2da5c352d5ef3ef0b63bb411596ae47db40a76b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Remove some manual test appsMiikka Heikkinen2016-01-13163-49031/+1
| | | | | | | | | | | | | | | | | | | | | | Removed - Kinectsurface - Has 3rd party code. - qmlcamera - Ugly mess and kinda pointless. - qmlmultiwindow - Test is not relevant and is buggy. - spectrum - Has 3rd party code. Change-Id: Ic28ffddf9e45f51a5320d4ebd0e2b7b373452cb7 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
| * Merge branch 'develop'Miikka Heikkinen2015-11-091-10/+0
| |\ | | | | | | | | | Change-Id: Iadc933f0db06f65013f74d5764b51be43bd79ebd
| * \ Merge branch 'develop'Miikka Heikkinen2015-10-293-1/+4
| |\ \ | | | | | | | | | | | | Change-Id: I198fd13ce1975833d02db39bde5a718ea60be623
| * \ \ Merge branch 'develop'Miikka Heikkinen2015-10-22646-5387/+7058
| |\ \ \ | | | | | | | | | | | | | | | Change-Id: Id4ff4c5196d35401f647e70a8c2a127d1c77629f
| * | | | Depend directly on 5.6 branchJędrzej Nowacki2015-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5454749905a78372704c8a317fc56d17428af6b0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
| * | | | Merge branch 'develop'Miikka Heikkinen2015-09-289-6/+12
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I3ac421702add928023ba838355aa88df5cdc7d6c
| * \ \ \ \ Merge branch 'develop'Miikka Heikkinen2015-09-1496-138/+156
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: I55a342465fa2ddb6db14056f4a991bdc1d4ef8ce
| * \ \ \ \ \ Merge branch 'develop'v1.2.1Miikka Heikkinen2015-04-14479-1403/+2535
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I58fa595eee1cf9ab934cb3187981355d6a856d05
| * \ \ \ \ \ \ Merge branch 'develop'v1.2.0Miikka Heikkinen2014-11-211-5/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea324a1101b33b60686038116c422e99f79dff3e
| * \ \ \ \ \ \ \ Merge branch 'develop'Miikka Heikkinen2014-11-211-5/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I51bb8521cca5373cb5e7f364d9ced538b82de86a
| * \ \ \ \ \ \ \ \ Merge branch 'develop'Miikka Heikkinen2014-11-217-13/+18
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I29b28286f0faac3180d0df2d4b2e9de13362149d
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 23:55:53 +0000