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
Sona Kurazyan 7ca9b86c78 Remove the usage of deprecated QWheelEvent::pos 
Task-number: QTBUG-76491
Change-Id: I5831525f8ac4bf0cbec6a52a434b1d8c3b388b80
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
 2019-08-23 17:17:51 +02:00
Antti Kokko 3858190b2b Add changes file for Qt 5.12.5 
+ 54a0844f5c Bump version

Change-Id: I7ae9ff4d484931d90fe4d7fc5c7998dd71e69dab
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-08-23 14:33:44 +03:00
Ville Voutilainen b0114f0dcb Fix GCC 4.8 build of abstract3drenderer 
Task-number: QTBUG-77730
Change-Id: I827d727b103a9923a8b82163bfa4f77c81c0906b
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2019-08-22 08:29:18 +03:00
Alexandru Croitor c4c7a35ea5 Fix Qt6 build 
Modify all the qmlRegisterModule calls to use minor version 15
because minor version zero from 6.0.0 would make tests fail.

This is similar to what was done in qtdeclarative in
c147b20a2c1299b2d659fe7c9472ae3866b6a425.

Change-Id: If3202a887389351dd6efa760b0212e69582d9576
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-08-07 10:39:27 +02:00
Antti Kokko ddc28d060d Add changes file for Qt 5.13.1 
+ 18c303dc1e Bump version
+ 41d93443ab Add changes file for Qt 5.12.4
+ 10fbcc8ea7 Bump version
+ 54a0844f5c Bump version
+ 66d9e04f79 Doc: Replace example file lists with links to code.qt.io

Change-Id: Ifc82b0acb8e100fc3c1a7bb3723560a3725dffd9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-07-30 12:05:09 +03:00
Qt Forward Merge Bot 422856bb47 Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-07-16 03:00:36 +02:00
Qt Forward Merge Bot 3d6a70aaae Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I9d75a47adea2d20db06f66ffa844275cbcf928d3
 2019-07-16 03:00:31 +02:00
Qt Forward Merge Bot 0f38a04479 Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-07-11 14:51:24 +02:00
Qt Forward Merge Bot 88e2eb6e4b Merge remote-tracking branch 'origin/5.13' into dev 
Conflicts:
	.qmake.conf

Change-Id: I48d89401b174483be79f903a63a99bbe016ec2a2
 2019-07-11 14:50:58 +02:00
Qt Forward Merge Bot 3206729aa7 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-07-11 14:14:42 +02:00
Qt Forward Merge Bot 74ab42d1cd Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	.qmake.conf

Change-Id: Ic14bf6bb18c30b3c2759d40dd7b4ec86fb0670e4
 2019-07-11 14:14:13 +02:00
Alexandru Croitor 7d898954aa Bump Qt version to Qt 6 
Change-Id: Ic01cd61ea5c53c4685fcd74e5a980d93fc4bc33a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-07-10 18:16:07 +02:00
Topi Reinio 66d9e04f79 Doc: Replace example file lists with links to code.qt.io 
Task-number: QTBUG-74391
Change-Id: I8cefab01c450ad5b52ba57ba161ee9065e00a6b1
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
 2019-07-09 10:15:58 +02:00
Marc Mutz ff5ecc6cc8 Mark the module free of Java-style iterators and of QLinkedList 
Java-style iterators are going to be deprecated, or at the very least
banned from use in Qt code. Ditto QLinkedList.

Unfortunately, the module contains more than 100 uses of Q_FOREACH,
even though, according to my sources, its use was banned in Qt
implementation from the get-go. So QT_NO_FOREACH is currently not an
option.

Change-Id: Ib34d7634f59ba5395cfb2b4b3afbfe0b62f52a73
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 2019-07-04 13:33:05 +02:00
Frederik Gladhorn 54a0844f5c Bump version 
Change-Id: Ibed2beed70164d5e491115e2e174a924614ae9b2
 2019-07-01 16:03:01 +02:00
Frederik Gladhorn 10fbcc8ea7 Bump version 
Change-Id: I7f315cb2cb3668e8c6831c06980308625b548a5a
 2019-07-01 15:56:30 +02:00
Qt Forward Merge Bot 0aec1b9919 Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-06-29 03:06:48 +02:00
Qt Forward Merge Bot deb54004e6 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: Ie0499243ee2ff168d435672c31d844772b6b8b25
 2019-06-29 03:06:42 +02:00
Qt Forward Merge Bot 4c150c9479 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-06-28 10:56:43 +02:00
Qt Forward Merge Bot 922412f6d3 Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	.qmake.conf

Change-Id: Ic8bbec1126304d50e0498581812a8ef05f9e4331
 2019-06-27 16:35:07 +02:00
Qt Forward Merge Bot afd72ec3dd Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-06-22 03:02:55 +02:00
Qt Forward Merge Bot 44cc41ef99 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I371597630015889280973f6c303e6996c98c918f
 2019-06-22 03:02:55 +02:00
Qt Forward Merge Bot 2e60208c8e Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13" 2019-06-20 16:24:59 +02:00
Qt Forward Merge Bot f50a41017f Merge remote-tracking branch 'origin/5.13.0' into 5.13 
Change-Id: If2a1b23c9fad339c0255015ca7534bfbd092461d
 2019-06-20 16:24:59 +02:00
Qt Forward Merge Bot eef5e52668 Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12" 2019-06-17 12:30:18 +02:00
Qt Forward Merge Bot c84d7cd96c Merge remote-tracking branch 'origin/5.12.4' into 5.12 
Change-Id: I345903427ae721e51ad01c77ffe721411be6c0e4
 2019-06-17 12:30:18 +02:00
Edward Welbourne e82f57fc52 Convert uses of QTime as a timer to QElapsedTimer 
Change-Id: I6050b5269304ac6941d3a9d057c91d439f46b63c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 2019-06-12 18:25:48 +02:00
Friedemann Kleint d785429192 Fix deprecation warnings about QString::sprintf() 
Fix warnings:
utils/utils.cpp:268:55: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
utils/utils.cpp:270:56: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
utils/utils.cpp:272:47: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]

Change-Id: I27628b7a3d7daa75399ef4952efe373a65d8974e
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2019-05-27 10:44:29 +02:00
Antti Kokko 41d93443ab Add changes file for Qt 5.12.4 
Change-Id: I4024892784b6c6258297c984c047d13835ea68da
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
 2019-05-23 15:20:42 +03:00
Frederik Gladhorn 18c303dc1e Bump version 
Change-Id: If1e0c3b6cb1e24dd3540a0744d29f889d5b39c77
 2019-05-23 11:18:39 +02:00
Antti Kokko cc7f4769a0 Add changes file for Qt 5.13.0 
Change-Id: Ib20ec99073e189c259a8b89bde025ba7ad59d925
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
 2019-05-08 08:50:24 +00:00
Qt Forward Merge Bot 2158334721 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: Ie398d7814f964598d57fba37744dedf78951c773
 2019-04-30 03:00:59 +02:00
Tomi Korpipaa e4cd15e388 Fix hanging at application exit 
Task-number: QTBUG-75256
Task-number: QTBUG-69627
Change-Id: If4221c8fcf783daf4bf6a38dbf1b9633a20eafb0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2019-04-29 12:58:36 +00:00
Qt Forward Merge Bot 1860c49b37 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I9dbaad5ff455dbb528d8dce554acce4aa0e29aee
 2019-04-23 03:02:53 +02:00
Qt Forward Merge Bot fd902c04b9 Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: Iec16a39fd968a92a5fec79b5873d20dedda11f49
 2019-04-20 03:00:44 +02:00
Qt Forward Merge Bot 13c950f006 Merge remote-tracking branch 'origin/5.12.3' into 5.12 
Change-Id: Iffe3e3da5b41775340fcaf6186bf859ab934c7d7
 2019-04-17 10:33:31 +02:00
Antti Kokko edabd45add Add changes file for Qt 5.12.3 
+ e91e0d04e2 Register revision 1 of Q3DScene
+ c71ab9ebe8 Bump version

Change-Id: I13d2e90c9d090dc3cb5a85cc63f29a94bbf91b09
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2019-04-03 04:16:42 +00:00
Qt Forward Merge Bot afe8f78d36 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I36d78c6f13de1250d0ed8954eb8cc98d57dc21e9
 2019-04-02 03:02:50 +02:00
Qt Forward Merge Bot 7dc2d93023 Merge remote-tracking branch 'origin/5.12' into 5.13 
Conflicts:
	.qmake.conf

Change-Id: I74c21ff111662ab85eae42aa50e0b6a724413898
 2019-03-27 10:28:14 +01:00
Qt Forward Merge Bot 8b639bba53 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I9f5c405501f18661aebe43856ee919fe2a62916a
 2019-03-26 03:03:37 +01:00
Kari Oikarinen c71ab9ebe8 Bump version 
Change-Id: If78a0a1ebcc94328ee78d4ae8c4141b3d2f544b9
 2019-03-21 09:10:08 +02:00
Kai Koehne f171e62493 Update plugins.qmltypes for Qt 5.13 
Task-number: QTBUG-73739
Change-Id: Id8a0509b9f4c397c4c1897e47c1915959477cd2c
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2019-03-21 05:52:38 +00:00
Qt Forward Merge Bot 787dc64350 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I73831adaf7bcbc59c55302af39cf510fffd0e8b6
 2019-03-19 03:03:03 +01:00
Qt Forward Merge Bot 4d88f5b7da Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: Iaa73229bf77144f2698be0c0536f3c771510c464
 2019-03-16 03:02:44 +01:00
Qt Forward Merge Bot 111484f3e3 Merge remote-tracking branch 'origin/5.12.2' into 5.12 
Change-Id: Icc331f527da6339f447ad7f7a847a93713418310
 2019-03-15 11:09:42 +01:00
Tomi Korpipaa 5c2043f77c Fix QML import version 
Task-number: QTBUG-74032
Change-Id: I1fca2212a2013fe18388e5e1e20e75847ee6be8b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
 2019-03-14 05:31:08 +00:00
Qt Forward Merge Bot 452cac276b Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: Id7b55ddeb86b6f51e5d46f3172715fd3de21e4d5
 2019-02-25 15:08:09 +01:00
Qt Forward Merge Bot d0ece82c68 Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: I32360af290132f0341e126bb2578d1f220133b28
 2019-02-25 14:24:14 +01:00
Ulf Hermann e91e0d04e2 Register revision 1 of Q3DScene 
Without this, properties of Q3DScene added after revision 0 stay unknown
to the QML engine.

Fixes: QTBUG-74016
Change-Id: I7bec39b5984dce6d5724287a79f23cb1cc86d378
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2019-02-25 12:43:34 +00:00
Kari Oikarinen 109c729ed0 Bump version 
Change-Id: Ib624e5ff3c1ca12dc609fab1619bf7a3ade53e7b
 2019-02-25 09:39:27 +02:00