Commit Graph

1737 Commits

Author SHA1 Message Date
Olivier Goffart da3c5925d5 Use Qt::Alignment instead of the AlignmentFlag enum to represent flags
Because from Qt 5.12, the the right operator| is found in the Qt namespace
instead of in the global namespace.

One must still add the 'using' statement so this patch can be integrated
using a previous qtbase. But the statement can be removed once qtbase is
updated.

Task-number: QTBUG-67582
Change-Id: Ib79c4623e858988bb55a87ad4fb0c1e0ceee81cf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-10 10:23:16 +00:00
Qt Forward Merge Bot 1212170af2 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Icf25f1e5df654eba7a76620d61fb5516d905f6d0
2018-03-31 03:00:11 +02:00
Jani Heikkinen 6c253768e2 Fix wrong license header
Some old license header were used. replace it with proper one

Task-number: QTBUG-67308
Change-Id: I6c501ab381c4ebb9f0b3466c303447edf3531915
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Simon Quigley <tsimonq2@ubuntu.com>
2018-03-28 11:38:07 +00:00
Qt Forward Merge Bot 191ace1edd Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I103882a747cf750dfbfba3f3004b1edfbecaca57
2018-03-10 03:00:03 +01:00
Topi Reinio 8a05311964 Remove QDoc-related typedef hacks
These are now longer required on Qt 5.11 where QDoc uses Clang to
parse the documentation.

Change-Id: I8a3bd7d935acf4c93fb8a6179cb8d3327697759a
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2018-03-08 14:10:34 +00:00
Topi Reinio 93a4741490 Fix documentation build when using Clang-enabled QDoc
QDoc in Qt 5.11 uses Clang to parse the C++ documentation.

Ignore the custom namespace used for Qt Data Visualization when
Clang is used - this resolves all documentation warnings and
generates it as it did on Qt 5.10.

Change-Id: I331bdb07611eb97f1df1896468d11c9341156739
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
2018-03-08 14:10:30 +00:00
Qt Forward Merge Bot 311a1d5dca Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I568a496e778bbefd7568a93174ae4e0e7f40dd02
2018-02-27 18:41:28 +01:00
Oswald Buddenhagen 096a930759 Bump version
Change-Id: Ica5f14b80e62b8bb100ebff6f89351ee908bd8c9
2018-02-19 13:53:45 +01:00
Liang Qi be7e45ca25 Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
	.qmake.conf

Change-Id: Id472b54f56aa0e58095c50f896e3cb44c6124cd9
2018-02-18 20:33:13 +01:00
Liang Qi c4d27bc94a Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: Ie385d52f1f490cbfa76ea2385862455f12f4fed7
2018-02-14 10:28:51 +01:00
Liang Qi 3e1f2777b7 Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: Ic7d85aece55a90a0fed7ee62a03b1203bbba65fd
2018-02-12 13:05:51 +01:00
Antti Kokko 397e501474 Add changes file for Qt 5.10.1
Change-Id: Ied0acb882d58707ff0bedb2e8fd06f7e554ed8ff
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2018-02-05 10:14:11 +00:00
Oswald Buddenhagen 8bfa8a8ef3 Bump version
Change-Id: I0472458c2d3acca239c8d0b076792775b5695a7b
2018-02-02 15:12:45 +01:00
Rainer Keller 4ceabb63a6 qtlite: Skip building examples when configured with no-feature-itemviews
Task-number: QTBUG-53141
Change-Id: I2e9fa0a5b72d79acc22c779e68a3dbe6a320a32a
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2018-01-26 07:50:30 +00:00
Liang Qi 8b0018cb1a Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	.qmake.conf

Change-Id: Ie7a50a1cc66ddffe04933f77323d03941e0d7acd
2018-01-20 22:39:23 +01:00
Rainer Keller 63b90a1d33 Remove unneeded include
Change-Id: I508fc0322f473a476f8943d4171f2242697519fa
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2018-01-19 08:04:14 +00:00
Liang Qi c6a8bae256 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.qmake.conf

Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782
2018-01-18 21:25:09 +01:00
Liang Qi 172dbad2db Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: Ibc5db332babec46a503f19b496391a9100caecef
2018-01-18 11:00:28 +01:00
Antti Kokko 6631505614 Add changes file for Qt 5.9.4
Change-Id: I887a82b73b10d0b559651c9cfb0bd81d9a4b816b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2018-01-17 08:27:44 +00:00
Mika Salmela 4cd89b61be Fix mixing of vec3 and vec2 for coords_mdl
Vec3 used on fragment shader when vec2 used on vertex shader. On
surfaceTextureFlat coords_mdl not used at all, so remove it.

Change-Id: I7898db37e7967a7cb9933fe1a05f42a332c06130
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2017-12-21 09:52:51 +00:00
Oswald Buddenhagen 7dd95d1d4c Bump version
Change-Id: I478999dcb4670fe49802f108dbb7f102024e93fa
2017-12-20 12:07:10 +01:00
Oswald Buddenhagen de34617101 Bump version
Change-Id: I8eeeed3dca94f94e39350ac62325279c20a9a728
2017-12-12 09:55:55 +01:00
Liang Qi cf4bf69664 Merge remote-tracking branch 'origin/5.10.0' into 5.10
Change-Id: I4d617d8737910076e35e8a59e2aad07a1cf0a1a9
2017-12-08 13:57:42 +01:00
Mika Salmela c3a973273e If not m_resetArray then create it
Fix m_resetArray so that if it not yet created, then create it. Currently
it is created every time.

Change-Id: I850bd9d2f719cd76bfd3292a439f9585a4e99fc3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2017-12-04 08:39:36 +00:00
Liang Qi cedc62610e Merge remote-tracking branch 'origin/5.9.3' into 5.9
Change-Id: I9255375f69a1b294da4fba89ba390808f47236e2
2017-11-23 09:48:26 +01:00
Liang Qi d2abb20082 Merge remote-tracking branch 'origin/5.9.3' into 5.10.0
Change-Id: I117a04d48ccce0c1319d66d6ced9391e7242cd87
2017-11-21 11:04:14 +01:00
Liang Qi 7722638fcd Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Iea700ac85da7205933622b61e1c43f774c82e45a
2017-11-20 13:16:41 +01:00
Mika Salmela 34b202cf74 Render custom items at insertion order
Changes the rendering order of custom items to insertion order.

Task-number: QTBUG-64312
Change-Id: I1ce865a3492c145ffa269cd12baa15ffff8d6a59
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-11-16 07:49:06 +00:00
Topi Reinio 966bdad4d5 Doc: Update the list of highlighted examples
Drop highlighting for 'Surface Example' in favor of 'Qt Quick 2 Surface
Multiseries Example'.

Task-number: QTBUG-60663
Change-Id: I7a8e3c501b7d5eaf500d3e0eca2eb41c17d182d5
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-11-09 12:41:53 +00:00
Jani Heikkinen 5b6f665aeb Add changes file for Qt 5.10.0
Change-Id: I3e552a83fe8ea72079e3d7dc503db3a7888cebdd
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-11-08 12:55:58 +00:00
Antti Kokko b943457790 Add changes file for Qt 5.9.3
Change-Id: I1f2db77065efd4b6509dce8cb1af827ed764e702
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-11-08 07:56:32 +00:00
Thiago Macieira 190687f649 Fix build: pow() is in math.h
Change-Id: Icaa86fc7b54d4b368c0efffd14f0b2721e74f854
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2017-11-05 18:45:48 +00:00
Thiago Macieira 6867324cb0 Update to new QRandomGenerator API
Change-Id: I69f37f9304f24709a823fffd14e676c097712329
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-11-03 09:12:25 +00:00
Liang Qi ee68813c81 Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.qmake.conf

Change-Id: Ibd0e0140e7055c7819a65e661a96095648de6fcd
2017-10-30 09:00:32 +01:00
Thiago Macieira 0565aadd97 Fix build: this example uses exceptions for some reason
cumulativedistributor.cpp:128:44: error: exception handling disabled, use -fexceptions to enable
     throw std::runtime_error("out of range");

Change-Id: Icaa86fc7b54d4b368c0efffd14f0b2b6258fe6f5
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-10-25 15:42:06 +00:00
Oswald Buddenhagen 32fc1c7d36 Bump version
Change-Id: I86340fbce9be0da41b0de395892222420bb107d3
2017-10-06 18:01:33 +02:00
Venugopal Shivashankar 6300ff26ae Doc: Update the highlighted examples list
Change-Id: Ied7eec2b6646d079ca2838f1b69d6626017818df
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-10-05 11:00:33 +00:00
Kevin Funk 3a965b26e3 Replace Q_NULLPTR with nullptr
Change-Id: Idc9a7a0ebcc986c8def79ac56f7defceea1e4432
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-09-26 17:14:16 +00:00
Antti Kokko 8329a8fb28 Add changes file for Qt 5.9.2
Change-Id: I408eb3e0f9dc997dec0dc0c9a780857435def96d
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-09-25 04:18:03 +00:00
Jani Heikkinen 82f9c8a5a2 Add change file for Qt 5.6.3 (qtdatavis3d 1.2.3)
Change-Id: Ic5e9448f5050f3ea42a4fddbc1f9ff2407144a4c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-09-06 04:08:58 +00:00
Mika Salmela fdc983fb3c Set clamp to edge wrap modes for surface textures
By default surface textures had wrong wrap modes making the color bleed
on edges. This patch changes the texture wrap modes to clamp to edge.

Task-number: QTBUG-62996
Change-Id: Iebee66b01a78db6036cb0c833f39237f8e98b6b7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-09-05 07:00:50 +00:00
Frederik Gladhorn 73c299f96e Bump version
Change-Id: I981a04de082d1d8e80a7fdd7ac1e30156734a555
2017-09-04 18:08:54 +02:00
Liang Qi c54adde27f Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	.qmake.conf

Change-Id: I849ed97b46cf390fd6c5d3017b7e66f7dd9aeeef
2017-08-15 13:07:25 +02:00
Sami Nurmenniemi d8c81e5db3 Enable tests for boot2qt
The tests for boot2qt were disabled with commit
0340120d5f. Some of them
can now be enabled since qtdeclarative fallbacks to software
renderer if OpenGL is not supported. Some tests still need
to be skipped if OpenGL is not supported.

Task-number: QTBUG-60268
Change-Id: I8019859bc88497e08599d0b5f4981b9a3ac071f3
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-08-11 08:34:35 +00:00
Jake Petroules 7cdbd6c86e Reduce the scope of the preprocessor branches with the help of a union
Change-Id: I195589565920e795cdae99f837b51917b3831228
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-08-09 19:10:31 +00:00
Marc Mutz 3f8ae713df Use QSharedPointer::create() more
This is the result of running the (experimental) clang-tidy check
   qt-modernize-qsharedpointer-create

Discarded changes: none.

Change-Id: Id131553710a846ff131abbc7fd7c01cc5b1da1df
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-07-31 13:21:25 +00:00
Thiago Macieira 096b9122b9 Use QRandomGenerator instead of q?rand
Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-07-04 11:45:30 +00:00
Oswald Buddenhagen cec5d284e2 Bump version
Change-Id: I2b9f8d5887205f1962b29d2b2a1e649662e77a27
2017-06-30 09:52:46 +02:00
Antti Kokko 8c6db2a9e8 Add changes file for 5.9.1
Change-Id: Idbc072028735655ac19281fa818bfd17075b56c7
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-06-23 06:36:37 +00:00
Edward Welbourne af03eef4ab Use qRadiansToDegrees() and qDegreesToRadians() more widely
These document what the arithmetic is actually doing; and save us an
ad-hoc use of an approximate value for pi while we're about it.

Task-number: QTBUG-58083
Change-Id: I82c5502af724b33ec598c5a9da76537f93a95eac
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2017-06-14 08:21:29 +00:00