qiurui
/
qtdatavis3d
mirror of https://github.com/qt/qtdatavis3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,737 Commits 50 Branches 222 Tags 46 MiB
Commit Graph

1737 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
Tuomo Pelkonen 1fc3926113 C++ build fixes for Qt 6.0 on Windows 
Fixes c++ build issues with Qt 6.0, verified to work on Windows.

Changed QQmlListProperty constructors functions types from int to qsizetype
GeometryChanged changed to GeometryChange
createTextureFromNativeObject changed to QNativeInterface::QSGOpenGLTexture::fromNative
clearBeforeRendering and setClearBeforeRendering removed

Task-number: QTBUG-89297
Change-Id: I84c723560de2821572af00f62e7780445b6c2595
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2021-01-27 10:01:45 +02:00
Tomi Korpipaa 8a9decbda7 Update dependecies.yaml 
Change-Id: Ie0be5b43ec600e7828591e10c6ae07be955658d0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2021-01-27 09:39:23 +02:00
Tomi Korpipaa 471a6cbd07 Migrate C++ API rendering path to Qt 6 
Replace QRegExp with QRegularExpression and change usage accordingly.
Replace shared QOpenGLFunctions_2_1 with our own copy. Fix header
include changes.

Task-number: QTBUG-89297
Change-Id: I6d3cf36ba9303ef62db3220816ea35f51eb26a3c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2020-12-14 06:57:52 +02:00
Antti Kokko 058eab02a5 Add changes file for Qt 5.15.1 
+ fe5eb952c4 Bump version

Change-Id: I0393073328499d305f7ab1c35a0886749189d06f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 0980126449)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2020-08-25 07:32:49 +00:00
Alexander Volkov 14684346ef Add missing override 
Change-Id: I20cec71db97cbf896255d4f6d7e947072a86e2bb
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2020-06-29 10:49:34 +03: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 fcb44309e4 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: Id0b05f32ccb145b58c04d4f6db69caba8f17c733
 2020-05-14 21:06:08 +02:00
Qt Forward Merge Bot 8ea21240c3 Merge remote-tracking branch 'origin/5.15.0' into 5.15 
Change-Id: I393d29005bbff24389a2558cad1ad67dbdde0ca8
 2020-05-14 14:05:31 +02:00
Qt Forward Merge Bot 4e6b8b0907 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: I3e803c50d446bab023d3f03897cea76086bb1fe3
 2020-04-25 03:04:28 +02:00
Qt Forward Merge Bot d15ace0300 Merge remote-tracking branch 'origin/5.15' into 5.15.0 
Change-Id: Id46db73bd6d94dc879657086663594436bd36c7c
 2020-04-22 10:13:50 +02:00
Antti Kokko 2978911f4d Add changes file for Qt 5.15.0 
+ a54a5a253f Bump version
+ 309066052e Avoid initializing QFlags with 0 or nullptr
+ a315402ab2 abstractdeclarative.cpp: Fix deprecation warnings
+ ebb48fa6be Fix deprecation warnings
+ 407bee91eb Use Qt::SplitBehavior in preference to QString::SplitBehavior

Change-Id: Icff9f191797dd8d615765f3b8bc38fdc938ac237
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2020-04-22 08:32:52 +03:00
Qt Forward Merge Bot 24c043fbff Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: Ic8fe0e6ff9f0ee51615a9b1582f6d48df6907f68
 2020-04-21 21:14:26 +02:00
Qt Forward Merge Bot 1ae0fae9ed Merge remote-tracking branch 'origin/5.14.2' into 5.14 
Change-Id: Idec69f0f9a6dc4f57e7e8d040f5658601e053bea
 2020-04-21 09:34:11 +02:00
Sona Kurazyan bbb548634e Remove QT_NO_LINKED_LIST 
QLinkedList is deprecated and moved to Qt5Compat, there's no need for
QT_NO_LINKED_LIST.

Change-Id: I9174a19c385eed9e14cc4acfb5416616abbf5fef
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
 2020-04-02 09:49:16 +00: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
Qt Forward Merge Bot 2e3983d554 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: I9152493c8aed299f0bcffc03651b05d6ae01db22
 2020-03-24 03:01:11 +01:00
Antti Kokko 1e5f5525cf Add changes file for Qt 5.14.2 
+ 0b6024b853 Doc: Fix typo in qdoc command
+ b255d8923b Bump version

Change-Id: I5af5cb807ea65de14434c8f31c73f34a578c07ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-03-10 10:19:16 +02: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
Qt Forward Merge Bot 9ba8b807d0 Merge remote-tracking branch 'origin/5.14' into 5.15 
Conflicts:
	.qmake.conf

Change-Id: If0a9a36e4d9fe5151014dded02559ce60f2eae32
 2020-02-18 09:22:51 +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
Alexandru Croitor b255d8923b Bump version 
Change-Id: I9794d24e2f1ce6b04da675acdcabcd66deccd132
 2020-02-02 13:42:49 +01:00
Qt Forward Merge Bot 2dd285bc28 Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: Ie1823c477a005d44d7b12d1e6d9228d89b619298
 2020-01-28 03:02:44 +01:00
Qt Forward Merge Bot 0d3e12b2f8 Merge remote-tracking branch 'origin/5.14.1' into 5.14 
Change-Id: I366104c6fc4c8097326241662592e53da6251a3a
 2020-01-27 14:16:25 +01:00
Paul Wicking 0b6024b853 Doc: Fix typo in qdoc command 
Fixes: QTBUG-81676
Change-Id: Ibe7f73e1fc529411ca92d7bdbb2ad8824cb97a62
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
 2020-01-27 11:27:53 +01:00
Antti Kokko 6b15c2bee0 Add changes file for Qt 5.14.1 
+ 86efcb0bea Bump version

Change-Id: I67a2381681fdc5378235510a60038df3789b6355
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2020-01-10 08:59:19 +02:00
Qt Forward Merge Bot 57029b2a39 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: Ia189ad6a24e3284a538cea1f78fcbc9b4687f6b8
 2020-01-07 03:01:19 +01:00
Friedemann Kleint a315402ab2 abstractdeclarative.cpp: Fix deprecation warnings 
Use QHash::contains() instead of checking for presence via value(),
fixing:

abstractdeclarative.cpp:681:48: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations]
abstractdeclarative.cpp:694:45: warning: 'QList<ValueType> QHash<K, V>::values(const Key&) const [with Key = QQuickWindow*; T = bool]' is deprecated: Use QMultiHash for hashes storing multiple values with the same key. [-Wdeprecated-declarations]

Change-Id: Ic858949514a647f62e74bff6ece346851dce413b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
 2020-01-02 11:21:28 +01:00
Qt Forward Merge Bot ebf53010bc Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: Ibe0aae25bf91001c915b3f14f072d0a9888e0f8a
 2019-12-31 03:03:10 +01:00
Qt Forward Merge Bot 620eeaaa5b Merge remote-tracking branch 'origin/5.14' into 5.15 
Conflicts:
	.qmake.conf

Change-Id: If5cf8cef472f062899993c6bd69018df1953c5bb
 2019-12-30 11:33:00 +01:00
Qt Forward Merge Bot 7138dc8d29 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: Id462569181a90c692b28f49acef1f3f5476fde37
 2019-12-17 03:05:54 +01:00
Daniel Smith 86efcb0bea Bump version 
Change-Id: I1b5fa87d115b2e3f74392d373841a6349bd0ce69
 2019-12-16 15:23:38 +01:00
Qt Forward Merge Bot b0b223aace Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: If81fffe1cbdb10b14fc762fdb9c6634680ba75b5
 2019-12-14 03:01:14 +01:00
Qt Forward Merge Bot 8df924f3f3 Merge remote-tracking branch 'origin/5.14.0' into 5.14 
Change-Id: Ie62ba04e425b7ebf5cfe48f0addac351788f23e6
 2019-12-13 12:48:16 +01:00
Qt Submodule Update Bot fd5f7f4db7 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I4e86bc5a1048521fd4b68133b774db48e12979c2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-12-05 21:01:20 +01:00
Qt Submodule Update Bot ca872e6f1e Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I0756ecb2bc712b77530c0183b25ab0b3fa581c9a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-12-04 18:01:17 +01:00
Qt Forward Merge Bot d8c62bcd2d Merge "Merge remote-tracking branch 'origin/5.15' into dev" 2019-11-30 03:02:18 +01:00
Qt Forward Merge Bot daf5ead2c0 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: I8bfa9b1604d35abc2844c0a4e10c0f8c66cc2acd
 2019-11-30 03:02:12 +01:00
Qt Submodule Update Bot 523980c758 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Ib8e0fe2417543d712daf74eced57bf04d7042290
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-29 18:01:37 +01:00
Qt Submodule Update Bot 2e67e65278 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I169ba9480bbc54b069e2f3492ee813b44508e8a5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-28 05:01:50 +01:00
Antti Kokko 882075ef10 Add changes file for Qt 5.14.0 
Change-Id: I133417c323b961271be94ca5672c17295989a446
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2019-11-26 14:41:19 +02:00
Qt Submodule Update Bot c48677d741 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I93885697578e4c377cba915d549f25c34aad1d41
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-26 13:01:45 +01:00
Friedemann Kleint 309066052e Avoid initializing QFlags with 0 or nullptr 
It is being deprecated.

Change-Id: I38e6bc29ac03108f56f445069b2dbbe8a3db201a
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
 2019-11-26 08:56:24 +01:00
Qt Submodule Update Bot 3f0bd7f6f4 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I872642f24917856cefb97b80e01c838c590f781e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-25 19:01:51 +01:00
Qt Submodule Update Bot 72e777cc3b Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I5e4a066de71420f25e26bf00267da3d0bcd9d7a5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-22 14:01:24 +01:00
Qt Submodule Update Bot 14c34f23b8 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Ia8233bfc975abd56f579f58d9d6df909ea8015b4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-14 01:02:12 +01:00