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
Antti Kokko 428195cb2b Add changes file for Qt 5.12.2 
+ a0e8ef6caf Bump version
+ 96b5237dcd Fix mesa check

Change-Id: I2aee86066916efe8ab028808b517f778b71cb0d0
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2019-02-21 08:15:57 +00:00
Qt Forward Merge Bot 1f9bbe1f99 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I8cf35c280a3b0406376302f637604655348b9764
 2019-02-12 03:02:39 +01:00
Friedemann Kleint 7044c0c82c Fix deprecation warnings 
utils/utils.cpp:87:43: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
utils/utils.cpp:139:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
engine/axisrendercache.cpp:204:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFontMetrics::horizontalAdvance [-Wdeprecated-declarations]
volumetrictest.cpp:384:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations]
volumetrictest.cpp:538:32: warning: ‘int QImage::byteCount() const’ is deprecated: Use sizeInBytes [-Wdeprecated-declarations]

Change-Id: I59d0ce39584b11ec239cbdadf067c30cf37ca05a
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
 2019-02-11 12:28:44 +00:00
Friedemann Kleint d44f6ddba7 Fix QFont-related deprecation warnings 
Replace QFontMetrics::width() by horizontalAdvance(), fixing:

utils/utils.cpp:87:43: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]         ^~~~~
utils/utils.cpp:139:58: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]
engine/axisrendercache.cpp:204:50: warning: ‘int QFontMetrics::width(const QString&, int) const’ is deprecated: Use QFont::horizontalAdvance [-Wdeprecated-declarations]

Change-Id: I8cfc466cee55b14060feae9b16a087c1db92cf90
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
 2019-02-06 08:39:56 +00:00
Qt Forward Merge Bot 5a4f041e67 Merge remote-tracking branch 'origin/5.13' into dev 
Change-Id: I6895de9641551d9ddeee7058cc8894f56f9c2d99
 2019-02-05 03:05:22 +01:00
Qt Forward Merge Bot 7d7038d47a Merge remote-tracking branch 'origin/5.12' into 5.13 
Change-Id: Ic663469af239791f81397bcffad3ca29fa0e6693
 2019-02-02 03:05:01 +01:00
Qt Forward Merge Bot 54adef94a3 Merge remote-tracking branch 'origin/5.12.1' into 5.12 
Change-Id: I4d769b4a76b43c84a774fa4d8b062848d725ddd8
 2019-02-01 11:45:33 +01:00
Joni Poikelin 96b5237dcd Fix mesa check 
VMware virtual machines have "OpenGL ES 3.0 Mesa x.x.x" as the version
string.

Change-Id: I5c23524a021732e84b78090de2913b4d974e9f34
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2019-01-22 10:15:11 +00:00
Qt Forward Merge Bot c6e1dd505f Merge remote-tracking branch 'origin/5.12' into dev 
Conflicts:
	.qmake.conf

Change-Id: I2005685b95ca394f2f819516c3228e1a1cee1daa
 2019-01-22 09:31:11 +01:00
Kari Oikarinen a0e8ef6caf Bump version 
Change-Id: Ied738fe9533a170cedebaff9980968d48d61a7bf
 2019-01-14 09:15:06 +02:00
Qt Forward Merge Bot 4a86aa5243 Merge remote-tracking branch 'origin/5.12' into dev 
Conflicts:
	.qmake.conf

Change-Id: I0d60e376037397944bc541b25d75ac52e221df62
 2019-01-10 21:33:27 +01:00
Antti Kokko 7f661ab616 Add changes file for Qt 5.12.1 
+ 7b091d13ed Bump version
+ a04bbfd931 Add changes file for Qt 5.11.3
+ 9ab15db102 Bump version

Change-Id: I0b782701187ade64db8d986771b4c858943d6dc1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2019-01-09 13:03:51 +00:00
Kari Oikarinen 9ab15db102 Bump version 
Change-Id: I30b28d165091100fd512180fe1ec3196bcf4096f
 2019-01-07 09:30:41 +02:00
Qt Forward Merge Bot 1b2e311b34 Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: Iaa900913ecd0166d9f921a09f2d4a573a853962d
 2018-12-15 03:04:10 +01:00
Qt Forward Merge Bot 20f42d4c87 Merge remote-tracking branch 'origin/5.11' into 5.12 
Change-Id: Iae4ef1680a7ae0f35da4da9e1d941fcd257babcd
 2018-12-11 10:19:20 +01:00
Qt Forward Merge Bot 941b50a5af Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: Ie484046d4d632b09d2c89a2cd29690d6b20f40a0
 2018-12-08 03:02:24 +01:00
Qt Forward Merge Bot 7a78111396 Merge remote-tracking branch 'origin/5.12.0' into 5.12 
Change-Id: I9e3d9a7357be0050ea1f4a7b3c8a349b50ea117a
 2018-12-05 09:17:12 +01:00
Qt Forward Merge Bot f68245a9bf Merge remote-tracking branch 'origin/5.11.3' into 5.11 
Change-Id: I93ebbaae4e91ebb8b0c3dd2361866e72111a6c54
 2018-12-04 09:41:56 +01:00
Antti Kokko a04bbfd931 Add changes file for Qt 5.11.3 
+ 191ef6d873 Do show module license on all help pages
+ 7b091d13ed Bump version

Change-Id: I93bc890a6158e3378a38ffc72a7f7a2ee9d8770d
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2018-11-19 05:23:17 +00:00
Qt Forward Merge Bot 184fe20622 Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: Ia9b0bdbb81409e111559dd800346c90cebc0d11a
 2018-11-17 03:02:50 +01:00
Qt Forward Merge Bot a8c1b85b91 Merge remote-tracking branch 'origin/5.11' into 5.12 
Conflicts:
	.qmake.conf

Change-Id: I88de56f107b431f786e2561d265d476ee8899fb7
 2018-11-16 13:25:22 +01:00
Oswald Buddenhagen 7b091d13ed Bump version 
Change-Id: I361758adeb173a8c2f6f15057d9db548015bb382
 2018-11-08 11:28:13 +01:00
Antti Kokko 5aaaab8461 Add changes file for Qt 5.12.0 
Change-Id: I0a929367bfcb7495e80260ac46120cf25f547c83
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
 2018-10-31 11:08:27 +00:00
Qt Forward Merge Bot ca11df0031 Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: I6d456c497dd29371337c5ffdf03e09919d73426d
 2018-10-27 03:00:13 +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
Oswald Buddenhagen 3fae1115d4 Bump version 
Change-Id: I04a1cede38f26e8069af40b39a75e7d6122f359d
 2018-10-11 12:43:30 +02:00
Qt Forward Merge Bot 29b1b9654a Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: Ide3baa0f89b9e43b2905f283077cf8fe018661cc
 2018-10-06 03:00:21 +02:00
Qt Forward Merge Bot e76c7140d3 Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: I31571b10bce830e17416ea09af246f8f40dfd9f4
 2018-09-29 03:00:31 +02:00
Qt Forward Merge Bot 12d9593dae Merge remote-tracking branch 'origin/5.11' into 5.12 
Change-Id: I600f4d6094d1934b082ed506f3cde75f13b41cfc
 2018-09-29 03:00:27 +02:00
Kai Koehne 191ef6d873 Do show module license on all help pages 
Qt Data Visualization has a different main license than most other Qt
modules, which is easy to miss. We do show the license on the module
landing page and in the 'All modules' overview page, but if you
directly open an example or a class page you can still miss this.

This change adds the main license description to the header shared
by all pages of the module; we (mis)use the buildversion variable for
that, which was so far unused.

Right now qdoc does not 'linkify' the entry. It could add a generic
link to the landing page though, where the license is also described.

Task-number: QTBUG-70354
Change-Id: Ic4917541a6480d1cb3879f87e6aac0093dd1f3b3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
 2018-09-27 12:31:26 +00:00
Kai Koehne 913b61e09d Update plugins.qmltypes 
Task-number: QTBUG-70264
Change-Id: I2742e2c61e0fe6a2566a11d721f0cbd0135c7a00
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
 2018-09-27 10:39:39 +00:00
Qt Forward Merge Bot 043eb707d0 Merge remote-tracking branch 'origin/5.12' into dev 
Change-Id: I0c3279b0bd8a978d1dc4b75f114d41073d352384
 2018-09-15 03:03:27 +02:00
Qt Forward Merge Bot 7320188f25 Merge remote-tracking branch 'origin/5.11' into 5.12 
Change-Id: Ic54b1a747b4cab6b293aa9933bff2c6b6dc3d037
 2018-09-11 03:00:46 +02:00
Qt Forward Merge Bot f305948c23 Merge remote-tracking branch 'origin/5.11.2' into 5.11 
Change-Id: I345d0637c46a80d6bd2054eef7107b8909026bca
 2018-09-09 12:12:12 +02:00
Antti Kokko 2927c2509a Add changes file for Qt 5.11.2 
Change-Id: Iebebaf25141b2bf50352eb2455500ae1f18ec499
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2018-08-29 10:49:19 +00:00
Qt Forward Merge Bot eea291d2a5 Merge remote-tracking branch 'origin/5.11' into dev 
Conflicts:
	.qmake.conf

Change-Id: I5a834dd3b204deef8b09a926bb496a4d376f1782
 2018-07-31 11:21:06 +02:00
Oswald Buddenhagen d4ef709d16 Bump version 
Change-Id: Id4a42078d6aab155a599200af01629ab59969675
 2018-07-30 18:47:23 +02:00
Qt Forward Merge Bot 631069f6d0 Merge remote-tracking branch 'origin/5.11' into dev 
Change-Id: I22c00453350070d69e03d1d4cf426a86fbcf0c9c
 2018-06-23 03:00:46 +02:00
Qt Forward Merge Bot 4d2d9a8593 Merge remote-tracking branch 'origin/5.11.1' into 5.11 
Change-Id: Ic1f178389975b730da51ff317ed0ef64348c0483
 2018-06-19 13:18:40 +02: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
Antti Kokko 3b44cb4c0a Add changes file for Qt 5.11.1 
Change-Id: Ib5df75f2d80dd7ad6e5848295b3557b23c398648
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2018-06-11 10:41:07 +00:00
Qt Forward Merge Bot cc270d39bc Merge remote-tracking branch 'origin/5.11' into dev 
Conflicts:
	.qmake.conf

Change-Id: I135ec58950ba88e041d19561353e0946f4a51497
 2018-06-04 16:13:00 +02:00
Antti Kokko 672028cd4d Add changes file for Qt 5.9.5 
Change-Id: I85cb2874e7896f2f84e20eccc16a7ad457ce35ed
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit f95fc1d059)
 2018-06-04 10:52:38 +00:00
Oswald Buddenhagen 8a6ec922d1 Bump version 
Change-Id: Ic672091dd6628af4e0abb3702e27ac8cd22b7115
 2018-05-31 14:05:09 +02: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
Qt Forward Merge Bot 1c0b503885 Merge remote-tracking branch 'origin/5.11' into dev 
Change-Id: I06c078868b98c6210bac5ad450122a191eeedef5
 2018-05-12 03:00:43 +02:00
Kai Koehne 8f0491327a Doc: Add license information to index page 
Change-Id: I0c20e133621f4095df5fc7f53a3e1981d248a93f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
 2018-05-09 09:09:30 +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
Simon Hausmann 08de2bbd63 Remove the code to manually initialize resources in static builds 
After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is
not needed anymore. Instead the resource system injects the plugin entry
point with a reference to all resources.

Change-Id: I1ad043f9e676deaea30ae022c090f188066a299c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2018-04-27 09:48:29 +00:00
Olivier Goffart 3dc7bf54e3 Remove Qt<5.12 workaround 
This change partly reverts commit da3c5925d5.

Change-Id: Ifd09b63a56d5f2e8837e461ca6048d80fcb8c916
Reviewed-by: Liang Qi <liang.qi@qt.io>
 2018-04-10 13:02:45 +00:00