Commit Graph

529 Commits

Author SHA1 Message Date
Tuomo Pelkonen 18a562554e Force OpenGL backend for RHI
Set QSG_RHI_BACKEND environment variable to "opengl" to force
RHI to use OpenGL backend.

Change-Id: Ie1fa0ffe466f97b1bbcc5281c49bbdf6e6d053c0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2021-01-27 10:06:52 +02:00
Tuomo Pelkonen df33d053c1 Fix qmlbars example for Qt 6.0
Remove API versions from imports, using standard Button and adapted to new TableView

Task-number: QTBUG-89298
Change-Id: Ic41c53a6c6d2c0b0542464e78395f5347bdb4e74
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2021-01-27 10:02:19 +02:00
Tuomo Pelkonen 6c2aec18ed Fix most of the QML example applications
Most of the QML examples work now as supposed to. Qmlbars still needs
fixing and is not included in this patch.

Task-number: QTBUG-89298
Change-Id: Ic8bc6511cdb00dd3db0a181b7a31b3bbc39f0556
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2021-01-27 10:01:58 +02:00
Lars Schmertmann 09e937788d Add ; to Q_UNUSED
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>
2020-06-26 15:21:41 +02:00
Jarek Kobus 3c7d4de151 Use QList instead of QVector
Task-number: QTBUG-84469
Change-Id: I4dc064b70adb054ca4add2dd662e7227255ff970
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-06-25 10:11:51 +02:00
Qt Forward Merge Bot 23e00330af Merge "Merge remote-tracking branch 'origin/5.15' into dev" 2020-03-26 08:52:12 +01:00
Friedemann Kleint 51c361b85c Update dependencies
Add missing Q_MOC_INCLUDE and adapt to OpenGL split.

Change-Id: I6150876a62ca55ad63c09a128226c2bac428b821
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-26 08:14:59 +01:00
Edward Welbourne 407bee91eb Use Qt::SplitBehavior in preference to QString::SplitBehavior
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>
2020-03-02 15:58:33 +01:00
Friedemann Kleint ebb48fa6be Fix deprecation warnings
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>
2020-02-17 09:48:50 +01:00
Sona Kurazyan 57ba04b0f0 Replace the deprecated QWheelEvent::delta() -> QWheelEvent::angleDelta()
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>
2019-08-26 14:35:12 +02:00
Topi Reinio 1ad75d1169 Doc: Fix \code command usage
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>
2018-10-25 09:44:07 +00:00
Paul Wicking 5be5da2f09 Doc: Add missing dots (qtdatavis3d)
Task-number: QTBUG-68933
Change-Id: I4947e5906049cadcd2aefd7dfb7aee25fea7a778
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2018-06-19 09:54:17 +00:00
Kai Koehne 71b6fb32b1 Use FDL license for all .qdoc files
Change-Id: I732a95d5adbd7579b05e8cb2b1afd586d5b5bc58
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2018-05-30 09:20:42 +00:00
Friedemann Kleint b844f84418 itemmodel example: Remove unused member variables
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>
2018-05-09 08:28:54 +00:00
Rainer Keller 4ceabb63a6 qtlite: Skip building examples when configured with no-feature-itemviews
Task-number: QTBUG-53141
Change-Id: I2e9fa0a5b72d79acc22c779e68a3dbe6a320a32a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2018-01-26 07:50:30 +00:00
Rainer Keller 63b90a1d33 Remove unneeded include
Change-Id: I508fc0322f473a476f8943d4171f2242697519fa
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2018-01-19 08:04:14 +00:00
Liang Qi c6a8bae256 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.qmake.conf

Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
2018-01-18 21:25:09 +01:00
Mika Salmela c3a973273e If not m_resetArray then create it
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>
2017-12-04 08:39:36 +00:00
Thiago Macieira 6867324cb0 Update to new QRandomGenerator API
Change-Id: I69f37f9304f24709a823fffd14e676c097712329
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-11-03 09:12:25 +00:00
Thiago Macieira 096b9122b9 Use QRandomGenerator instead of q?rand
Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-07-04 11:45:30 +00:00
Edward Welbourne af03eef4ab Use qRadiansToDegrees() and qDegreesToRadians() more widely
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>
2017-06-14 08:21:29 +00:00
Liang Qi 3f5c279083 Merge remote-tracking branch 'origin/5.7' into 5.8
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
2016-11-08 11:46:38 +01:00
Topi Reinio 90aff70262 Doc: Use capitalization in section titles
Change-Id: I3ea9dde5f98813716d754d292af1f005d33ba98e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-11-02 12:46:21 +00:00
Leena Miettinen e9aa193181 Doc: Add section on running examples to example docs
- 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>
2016-11-02 09:45:10 +00:00
Liang Qi 8427634773 Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
	src/datavisualization/utils/qutils.h

Change-Id: Ic882590b5386697fb4af068e435704849ed5405c
2016-04-08 10:33:17 +02:00
Oswald Buddenhagen 364ed207af fix namespaced build
Change-Id: I76b85f4e2653f20a368b4b413b29c733a6a3f300
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2016-04-06 11:16:33 +00:00
Tomi Korpipää a9bb6f0952 Made controls easier to use on touch devices
Change-Id: Ife9b72e390a9d9c0f012d6b9ac4a421fad9f0315
Task-number: QTRD-3782
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2016-01-15 11:50:42 +00:00
Miikka Heikkinen 957936525c Copyright file update to GPL
Change-Id: Ib264fe1f2cd1589e2ba1ef2dc7d8f3951e125708
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
2016-01-12 15:38:13 +00:00
Miikka Heikkinen 64f0d4fb35 Add a method for checking if context was successfully created
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>
2015-12-30 08:45:14 +00:00
Miikka Heikkinen 31f9c57bc5 Fix issues with COIN builds
-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>
2015-10-22 10:08:51 +00:00
Miikka Heikkinen 4162ddeb02 Update license headers
Change-Id: I0581aefcf9dabc64b05eb8c97b5b92da1fb26299
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
2015-10-20 08:47:05 +00:00
Miikka Heikkinen a71eb045af Fix building against 5.6
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>
2015-06-17 14:24:57 +03:00
Mika Salmela 273bae38cf Copyright header changes
Copyright header changes for 5.5.

Change-Id: I0361cfe1ebdb28955cb927700f14cf7b72694421
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2015-04-14 13:50:10 +03:00
Caroline Chao 0a18b2fffc qmlscatter example: Give a default size to the view item
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>
2015-03-11 09:14:46 +02:00
Tomi Korpipää 0e9d60eee9 Qt 5.5 fixes
Change-Id: I01260f9849340ea5cce2b5c00aa6c2c50192720c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2015-02-23 13:20:45 +02:00
Miikka Heikkinen cf47756e17 Minor tweaks to texturesurface example.
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>
2014-11-21 13:51:18 +02:00
Miikka Heikkinen 2f7c12bfee Make customitems example actually show some custom items.
Change-Id: I056b71fc913e5fd68b895d6bf4b5676cbe7c6db0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-21 13:51:05 +02:00
Miikka Heikkinen cba93d8dea Fix WinRT issues.
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>
2014-11-19 15:56:56 +02:00
Miikka Heikkinen 5d24897d35 Fix typo in docs
Change-Id: Iad4d07765b9f1310baf3b43d5307906c9887bca6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
2014-11-13 16:26:45 +02:00
Miikka Heikkinen b6ee023ced Change copyright headers.
Change-Id: I453438fee92f18c983c1bef04c68b24a7ff72cf9
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: Mika Salmela <mika.salmela@theqtcompany.com>
2014-11-07 10:22:35 +02:00
Miikka Heikkinen 8a7c69cb94 Fix qmloscilloscope linking issue on some envs
Change-Id: Iab45f95e8ff0faacc5cf50fdf052bf2c69d7988a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-11-03 10:20:34 +02:00
Miikka Heikkinen 20d1d25119 Fix crash on qmloscilloscope in Qt 5.4
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>
2014-10-30 14:50:46 +02:00
Miikka Heikkinen bf716cfdf0 Support for dynamic opengl builds.
Task-number: QTRD-3392
Change-Id: I786bbf5ee9252b92d43d02d6b88ed9b986b4a5eb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-29 09:35:29 +02:00
Miikka Heikkinen 33b3fe3784 Make build check for existence of quick module.
Change-Id: Icd04b72bb7bdbf34c73e6f27c90674fda4fc4cc2
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-24 10:16:58 +03:00
Mika Salmela edbaf4a432 License info for texturedsurface example
Change-Id: Iac6e8eac0da0264a586477038753c54edcd58e47
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
2014-10-09 15:24:13 +03:00
Miikka Heikkinen 0d102fc303 Fix minor issues found in testing
Change-Id: If40f10043951409b3d6597776b60d7eb55c73eec
Reviewed-by: Mika Salmela <mika.salmela@digia.com>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-08 09:52:19 +03:00
Mika Salmela aab6b4f77d Texture UVs for surface to follow data dimension
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>
2014-10-07 12:09:29 +03:00
Tomi Korpipää f1325a1e05 Added snapshots to examples missing them
Change-Id: I64a6067102f205094d7be55a9eb348b3280a7e77
Change-Id: I64a6067102f205094d7be55a9eb348b3280a7e77
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-06 13:26:56 +03:00
Miikka Heikkinen ec4ed5f383 Fix invalid pixel in water layer corner in qmlsurfacelayers example
Change-Id: Ic1a32e2b23133ce8caa042ddfbf9566cd89d58f1
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
2014-10-06 12:37:10 +03:00
Miikka Heikkinen e42580773c Fix mac -> OS X
Change-Id: If0409af049a55dae152139fdb55a2eb58e5fbb51
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
2014-10-06 11:42:27 +03:00