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
Qt Submodule Update Bot ad9d63cd55 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I2e0ceebf98dd740a95e525e745d722882bbf4ba9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-12 10:01:39 +01:00
Qt Forward Merge Bot 1504931284 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: I9b969eee802e8e0288c07fe138fd45f550ba787b
 2019-11-12 03:01:12 +01:00
Qt Forward Merge Bot daf6381fd1 Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: Ib7ba82cc6f1a30e8f026cea8da5b36d8201db7de
 2019-11-09 03:03:47 +01:00
Qt Submodule Update Bot 72196397ff Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I4d2c4a63de35cd50745fecec0538f4d2967a7dae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-09 00:01:15 +01:00
Qt Submodule Update Bot d4a969763a Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: If16f228e23013566dbfab6b9c2ee00506710b520
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-05 18:01:19 +01:00
Qt Forward Merge Bot 5587117016 Merge remote-tracking branch 'origin/5.13' into 5.14 
Conflicts:
	.qmake.conf

Change-Id: I9404bf15dd2321957603feb1a605f7b50724cbe3
 2019-11-05 07:32:48 +01:00
Qt Submodule Update Bot 4f31ff1737 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I84e6a4dc4a78c9add7f19349164831593b51eccd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-03 15:24:59 +01:00
Qt Submodule Update Bot f34157d4d0 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Ia6d8590a9e08c575cc2b3e5b02b819f7d2f42e04
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-11-02 11:02:32 +01:00
Qt Submodule Update Bot ba80f38575 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Ia21d54c4040450b939994994bf57dbbbb374a675
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-31 15:01:56 +01:00
Qt Submodule Update Bot 7ab7786c33 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Ib29162ef8730c5eae80fbc7bac2dfe57cb223873
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-29 20:01:01 +01:00
Qt Submodule Update Bot 78befdb83f Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I938b41eab377d2a1827e8f4213246fc8c013eea5
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-26 07:01:13 +02:00
Qt Submodule Update Bot d8815a4b13 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Ie6ba6b2bc8fabb7c72d86c51f480a9e84683180c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-24 19:01:56 +02:00
Qt Submodule Update Bot 48a80b59a8 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I450ee11b517c06ca03be2669c428764a38424e17
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-22 23:01:19 +02:00
Qt Submodule Update Bot 775dc250c5 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Ia4cd251de4c0ab9b84e8bffd9249a287a8256d9e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-21 10:00:37 +02:00
Qt Submodule Update Bot ecda0ecd08 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I903bb837e438bdb2b756ce4143c52b61fb67a4e4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-18 13:00:50 +02:00
Qt Submodule Update Bot dc638c3dde Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I45edbb8e58c2d550c8d201d7bd419b9db0f85b50
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-17 23:00:59 +02:00
Qt Submodule Update Bot a15e10a5de Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Ieca9ff8c07645a150ef410b62bfd1d92ff572997
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-17 07:00:48 +02:00
Qt Submodule Update Bot 8e8008d42c Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Id5d78e5fa39cc68587dfa9d894dc97b572f10db1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-16 20:00:44 +02:00
Qt Submodule Update Bot 55906f8cc1 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I2f8255f24e4a539f3092a4e06b6081a57437a460
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-16 12:00:54 +02:00
Qt Submodule Update Bot 73545eac3a Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I907178d165d82388413db1f1c6c7733188c83e02
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-16 00:00:44 +02:00
Qt Submodule Update Bot e16a8789e0 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I5bc1d65ff6395a7335241327ce03748bdf419538
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-15 10:32:26 +02:00
Antti Kokko af4466c7af Add changes file for Qt 5.13.2 
+ b0114f0dcb Fix GCC 4.8 build of abstract3drenderer
+ 3858190b2b Add changes file for Qt 5.12.5

Change-Id: I9f7ee8e553b55d87a4695f71af7411aa1bcbfaef
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2019-10-15 07:22:54 +03:00
Frederik Gladhorn 1263dcbb86 Bump version 
Change-Id: I01244127c6025b18b32ce40648f4d1de4a5fc0ff
 2019-10-14 09:42:43 +02:00
Qt Submodule Update Bot da647bb62b Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: Ieb62e66701ee3bc45f2720e7eae110080341be36
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-13 14:39:49 +02:00
Qt Forward Merge Bot a2b9e73df7 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: Ib309fe3b5adee4933ae9a66f4419aec28b088aa5
 2019-10-12 03:07:47 +02:00
Qt Submodule Update Bot b40e6e318b Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I25604d98dd64be2ab1a9f59ce07022822a841ee6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-11 07:30:41 +02:00
Qt Submodule Update Bot 4178095d50 Update dependencies on 'dev' in qt/qtdatavis3d 
Change-Id: I3eff46c0b81d282ef064bf54ec71bd4797860cb2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
 2019-10-08 09:16:05 +02:00
Simon Hausmann a87ef47a47 Merge remote-tracking branch 'origin/wip/qt6' into dev 
Conflicts:
	.qmake.conf

Change-Id: Ic4b3c490262e4a72bdd45b03828b88a784a4b9b8
 2019-10-04 14:30:34 +02:00
Qt Forward Merge Bot 2900ec11a8 Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: Ib04f91529d95b1268bfd470fa88e00dce866121a
 2019-10-01 03:01:45 +02:00
Kai Koehne 49b84db584 Update plugins.qmltypes for 5.14 
Task-number: QTBUG-78690
Change-Id: Ib264cb0294f02e2983cba0041a48ff87b7bc4f51
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2019-09-30 11:44:42 +02:00
Qt Forward Merge Bot 339b94c95c Merge "Merge remote-tracking branch 'origin/5.15' into dev" 2019-09-24 03:07:26 +02:00
Qt Forward Merge Bot fd67acbfe3 Merge remote-tracking branch 'origin/5.15' into dev 
Change-Id: I1a5bcfb48938c296864f435e0159e9a2176a4131
 2019-09-24 03:07:21 +02:00
Qt Forward Merge Bot 00f0be218d Merge "Merge remote-tracking branch 'origin/5.14' into 5.15" 2019-09-21 03:00:39 +02:00
Qt Forward Merge Bot 0806a8767f Merge remote-tracking branch 'origin/5.14' into 5.15 
Change-Id: I65642f3568bcb7873893beb85cb88a7f07a2eed7
 2019-09-21 03:00:34 +02:00
Qt Forward Merge Bot a1d1299385 Merge "Merge remote-tracking branch 'origin/5.13' into 5.14" 2019-09-17 03:08:59 +02:00
Qt Forward Merge Bot c795f5d7b2 Merge remote-tracking branch 'origin/5.13' into 5.14 
Change-Id: I33d39a00a4628baeda098ce5e8665307617ad789
 2019-09-17 03:08:53 +02:00
Qt Forward Merge Bot 1a58c3cffe Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-09-08 11:29:45 +02:00
Qt Forward Merge Bot 6b8b6743d3 Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: Ia2b7db2f249f6606629a2df3a242176f97559417
 2019-09-08 11:29:40 +02:00
Qt Forward Merge Bot 5d95f3f371 Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12" 2019-09-07 13:10:36 +02:00
Qt Forward Merge Bot 408af0cba0 Merge remote-tracking branch 'origin/5.12.5' into 5.12 
Change-Id: I7c34d832f81f7f96ea7d3fe56a25722a3a161d4a
 2019-09-07 13:10:31 +02:00
Qt Forward Merge Bot cd09330ce6 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-09-05 13:31:58 +02:00
Qt Forward Merge Bot c3bad50133 Merge remote-tracking branch 'origin/5.13.1' into 5.13 
Change-Id: I337c17410cc8f3d69a3817c052c14cb284824317
 2019-09-05 13:31:53 +02:00
Kari Oikarinen 548b93d6e5 Merge "Merge dev into 5.14 (delayed final downmerge)" 2019-09-04 13:37:20 +03:00
Kari Oikarinen 6d93bcf549 Merge dev into 5.14 (delayed final downmerge) 
This replicates the effects of the fast-forward merge that should have
been pushed on 2019-08-27 as the final down-merge from dev to 5.14.

Task-number: QTBUG-78019
Change-Id: I9e1685238ec1d8450c8d0a5e8894f4d38407dd54
 2019-09-04 11:28:00 +03:00
Qt Forward Merge Bot 7bd8bf6cf8 Merge "Merge remote-tracking branch 'origin/5.13' into 5.14" 2019-08-28 07:37:15 +02:00
Qt Forward Merge Bot 3aa00c484e Merge remote-tracking branch 'origin/5.13' into 5.14 
Change-Id: Ibfe56eccd7435d995db91964e2352f19a4272d56
 2019-08-28 07:37:10 +02:00
Kari Oikarinen a54a5a253f Bump version 
Change-Id: Icf111f789a66ec18b56d4e142d6fa8ac5d233545
 2019-08-27 09:12:42 +03: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
Qt Forward Merge Bot b84c4ddddf Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-08-24 03:02:27 +02:00
Qt Forward Merge Bot a5c912e116 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I08c9b0b57ccefc161815833ccd63208d2768cb54
 2019-08-24 03:02:22 +02:00