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
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
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