summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Add ; to Q_UNUSEDLars Schmertmann2020-06-265-8/+8
| | | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I66f620431011d02cb1542e8ad613dadd28fdd843 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-256-37/+34
| | | | | | | Task-number: QTBUG-84469 Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2020-03-263-3/+3
|\
| * Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Edward Welbourne2020-03-022-2/+2
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: Iee6bd8e83592c26b63259959e58d52131921438f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Fix deprecation warningsFriedemann Kleint2020-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | colorgradient.cpp:80:61: warning: ‘QQmlListProperty<T>::QQmlListProperty(QObject*, QList<T*>&) [with T = QtDataVisualization::ColorGradientStop]’ is deprecated: Use constructor taking QList pointer, and gain improved performance [-Wdeprecated-declarations] declarativerendernode.cpp:116:71: warning: ‘QSGTexture* QQuickWindow::createTextureFromId(uint, const QSize&, QQuickWindow::CreateTextureOptions) const’ is deprecated: Use createTextureFromNativeObject() instead [-Wdeprecated-declarations] customformatter.cpp:167:34: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] Change-Id: Iaf3b8814cd70a704b87b4970ad83ed5a7d4dc0f1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Update dependenciesFriedemann Kleint2020-03-261-0/+1
|/ | | | | | | Add missing Q_MOC_INCLUDE and adapt to OpenGL split. Change-Id: I6150876a62ca55ad63c09a128226c2bac428b821 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Replace the deprecated QWheelEvent::delta() -> QWheelEvent::angleDelta()Sona Kurazyan2019-08-261-1/+1
| | | | | | | | | | Replaced the deprecated QWheelEvent::delta() with the vertical component of angle delta, assuming that it's acceptable to have a single-dimension mouse wheel in the example code. Task-number: QTBUG-76491 Change-Id: Ie05bb5934ce43976cd3cf009343d7b50ea327f14 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Doc: Fix \code command usageTopi Reinio2018-10-251-2/+6
| | | | | | | | | Since Qt 5.12, \code command accepts parameters, and in-line usage no longer works (and was never documented to work). Task-number: QTBUG-70980 Change-Id: I010ba21c2a20f70bfdacd7bb0c1aea3836c8efca Reviewed-by: Martin Smith <martin.smith@qt.io>
* Doc: Add missing dots (qtdatavis3d)Paul Wicking2018-06-192-2/+2
| | | | | | Task-number: QTBUG-68933 Change-Id: I4947e5906049cadcd2aefd7dfb7aee25fea7a778 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Use FDL license for all .qdoc filesKai Koehne2018-05-3023-253/+207
| | | | | Change-Id: I732a95d5adbd7579b05e8cb2b1afd586d5b5bc58 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* itemmodel example: Remove unused member variablesFriedemann Kleint2018-05-091-6/+0
| | | | | | | | | | | | Fix Clang warnings main.cpp(74,13): warning: private field 'm_styleTimer' is not used [-Wunused-private-field] main.cpp(75,13): warning: private field 'm_presetTimer' is not used [-Wunused-private-field] main.cpp(76,13): warning: private field 'm_themeTimer' is not used [-Wunused-private-field] Task-number: QTBUG-63512 Change-Id: I618b0b6e6157b8a82af7e81b178f5156cf9c1bca Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* qtlite: Skip building examples when configured with no-feature-itemviews5.10Rainer Keller2018-01-265-0/+7
| | | | | | Task-number: QTBUG-53141 Change-Id: I2e9fa0a5b72d79acc22c779e68a3dbe6a320a32a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove unneeded includeRainer Keller2018-01-191-1/+0
| | | | | Change-Id: I508fc0322f473a476f8943d4171f2242697519fa Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-181-2/+2
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
| * If not m_resetArray then create itMika Salmela2017-12-041-2/+2
| | | | | | | | | | | | | | | | Fix m_resetArray so that if it not yet created, then create it. Currently it is created every time. Change-Id: I850bd9d2f719cd76bfd3292a439f9585a4e99fc3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Update to new QRandomGenerator APIThiago Macieira2017-11-034-14/+14
| | | | | | | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Use QRandomGenerator instead of q?randThiago Macieira2017-07-044-8/+19
| | | | | | | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Use qRadiansToDegrees() and qDegreesToRadians() more widelyEdward Welbourne2017-06-141-1/+1
|/ | | | | | | | | These document what the arithmetic is actually doing; and save us an ad-hoc use of an approximate value for pi while we're about it. Task-number: QTBUG-58083 Change-Id: I82c5502af724b33ec598c5a9da76537f93a95eac Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-0819-73/+73
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0219-73/+73
| | | | | | | | | | Change-Id: I3ea9dde5f98813716d754d292af1f005d33ba98e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Doc: Add section on running examples to example docsLeena Miettinen2016-11-0223-1/+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>
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-081-0/+3
|\ | | | | | | | | | | | | 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>
* | Made controls easier to use on touch devicesTomi Korpipää2016-01-152-9/+64
| | | | | | | | | | | | Change-Id: Ife9b72e390a9d9c0f012d6b9ac4a421fad9f0315 Task-number: QTRD-3782 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* | Copyright file update to GPLMiikka Heikkinen2016-01-12121-1089/+2057
| | | | | | | | | | Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* | Add a method for checking if context was successfully createdMiikka Heikkinen2015-12-3013-1/+92
|/ | | | | | | | | | 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 issues with COIN buildsMiikka Heikkinen2015-10-221-4/+3
| | | | | | | | | | | | -Fix miscellaneous compile errors -Move manual tests to manual folder and enable export of autotests -Added widgets requirement -Fixed autotests -Fixed renderer and controller synchronization in QML case -Treat fallback Mesa as ES2 similar to setting AA_UseSoftwareOpenGL Change-Id: If6619733725d079e339bef16262e5ea1450ab20f Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Update license headersMiikka Heikkinen2015-10-20121-1331/+1694
| | | | | Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299 Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
* Fix building against 5.6Miikka Heikkinen2015-06-1713-17/+17
| | | | | | | | Apparently Qt modules are now required to use Q_SIGNALS and Q_SLOTS macros instead of 'signals' and 'slots' in headers. Change-Id: I4140b1fff4386d74bb371176919234366965e887 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Copyright header changesMika Salmela2015-04-14121-363/+363
| | | | | | | Copyright header changes for 5.5. Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* qmlscatter example: Give a default size to the view itemCaroline Chao2015-03-111-0/+2
| | | | | | | | | On OS X the content item of the view must have a valid width or height. Change-Id: I6903671a9bd39511a4d0d649819b68930597260d Task-number: QTRD-3469 Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
* Qt 5.5 fixesTomi Korpipää2015-02-234-0/+1
| | | | | Change-Id: I01260f9849340ea5cce2b5c00aa6c2c50192720c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Minor tweaks to texturesurface example.Miikka Heikkinen2014-11-212-1/+2
| | | | | | | | | Change the color of untextured surface so it isn't included in the gradient. Also make it clear the gradient is for highlight only. Change-Id: I822c59b905559da10a987e4a7d616d01dccdedba Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Make customitems example actually show some custom items.Miikka Heikkinen2014-11-212-0/+5
| | | | | Change-Id: I056b71fc913e5fd68b895d6bf4b5676cbe7c6db0 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix WinRT issues.Miikka Heikkinen2014-11-1913-25/+25
| | | | | | | | | | Primary fix is to not use shared context in qml with WinRT, as that causes black screen. Also removed widget apps from build in WinRT. Change-Id: Id65ce90dbeb80442194ab838952e8cadc91135a6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Fix typo in docsMiikka Heikkinen2014-11-131-1/+1
| | | | | Change-Id: Iad4d07765b9f1310baf3b43d5307906c9887bca6 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
* Change copyright headers.Miikka Heikkinen2014-11-07121-847/+847
| | | | | | Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Fix qmloscilloscope linking issue on some envsMiikka Heikkinen2014-11-031-1/+1
| | | | | Change-Id: Iab45f95e8ff0faacc5cf50fdf052bf2c69d7988a Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix crash on qmloscilloscope in Qt 5.4Miikka Heikkinen2014-10-302-2/+2
| | | | | | | | Binding slider value to its minimum value is not correct, so just initialize it on component complete. Change-Id: Ia21ecbffdef84448b70c6b09d240ea4f854ca541 Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
* Support for dynamic opengl builds.Miikka Heikkinen2014-10-291-108/+120
| | | | | | Task-number: QTRD-3392 Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Make build check for existence of quick module.Miikka Heikkinen2014-10-241-12/+15
| | | | | Change-Id: Icd04b72bb7bdbf34c73e6f27c90674fda4fc4cc2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* License info for texturedsurface exampleMika Salmela2014-10-091-0/+77
| | | | | Change-Id: Iac6e8eac0da0264a586477038753c54edcd58e47 Reviewed-by: Mika Salmela <mika.salmela@digia.com>
* Fix minor issues found in testingMiikka Heikkinen2014-10-081-1/+1
| | | | | | Change-Id: If40f10043951409b3d6597776b60d7eb55c73eec Reviewed-by: Mika Salmela <mika.salmela@digia.com> Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Texture UVs for surface to follow data dimensionMika Salmela2014-10-071-2/+3
| | | | | | | | | Change texture UVs to be generated according to data dimension. Also utilise this change on texturesurface example. Change-Id: Ideacfba409dc2e7cf579fb38d897e08c9f9a1b71 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Added snapshots to examples missing them Tomi Korpipää2014-10-062-0/+0
| | | | | | Change-Id: I64a6067102f205094d7be55a9eb348b3280a7e77 Change-Id: I64a6067102f205094d7be55a9eb348b3280a7e77 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Fix invalid pixel in water layer corner in qmlsurfacelayers exampleMiikka Heikkinen2014-10-061-0/+0
| | | | | Change-Id: Ic1a32e2b23133ce8caa042ddfbf9566cd89d58f1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
* Fix mac -> OS XMiikka Heikkinen2014-10-061-1/+1
| | | | | Change-Id: If0409af049a55dae152139fdb55a2eb58e5fbb51 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Allow setting bounds for camera zoom levelMiikka Heikkinen2014-09-262-11/+2
| | | | | | Task-number: QTRD-3337 Change-Id: I503dc4402907a2fdfa74ca86698b0e98a23b3b08 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Implement zooming to cursorMiikka Heikkinen2014-09-261-0/+4
| | | | | | | | | Zooming to cursor is now default operating mode of the default input handler. Task-number: QTRD-3263 Change-Id: I5699fc0ce7393059538972cd52f31f06d87e3d8d Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
* Change custom labels to use label shaderMiikka Heikkinen2014-09-191-64/+74
| | | | | | | | | This fixes the problem with specular highlight making camera-facing labels unreadable. Task-number: QTRD-3276 Change-Id: If16424b07a1f3362428980353c5fb5213c33d06b Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>