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

1661 Commits

Author SHA1 Message Date
Alexandru Croitor b255d8923b Bump version 
Change-Id: I9794d24e2f1ce6b04da675acdcabcd66deccd132
 2020-02-02 13:42:49 +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
Daniel Smith 86efcb0bea Bump version 
Change-Id: I1b5fa87d115b2e3f74392d373841a6349bd0ce69
 2019-12-16 15:23:38 +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
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 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
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
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 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
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
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
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
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