summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
| |\| | | | | | | | | | Change-Id: If81fffe1cbdb10b14fc762fdb9c6634680ba75b5
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| | |\ | | | | | | | | | | | | Change-Id: Ie62ba04e425b7ebf5cfe48f0addac351788f23e6
| | | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.0Antti Kokko2019-11-261-0/+18
| | |/ | | | | | | | | | | | | Change-Id: I133417c323b961271be94ca5672c17295989a446 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-12-051-3/+3
| | | | | | | | | | | | | | | Change-Id: I4e86bc5a1048521fd4b68133b774db48e12979c2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-12-041-3/+3
| | | | | | | | | | | | | | | Change-Id: I0756ecb2bc712b77530c0183b25ab0b3fa581c9a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-11-302-15/+8
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-302-15/+8
| |\| | | | | | | | | | | | | | Change-Id: I8bfa9b1604d35abc2844c0a4e10c0f8c66cc2acd
| | * | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-262-15/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It is being deprecated. Change-Id: I38e6bc29ac03108f56f445069b2dbbe8a3db201a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-291-3/+3
|/ / / | | | | | | | | | | | | Change-Id: Ib8e0fe2417543d712daf74eced57bf04d7042290 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-281-3/+3
| | | | | | | | | | | | | | | Change-Id: I169ba9480bbc54b069e2f3492ee813b44508e8a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-261-3/+3
| | | | | | | | | | | | | | | Change-Id: I93885697578e4c377cba915d549f25c34aad1d41 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-251-3/+3
| | | | | | | | | | | | | | | Change-Id: I872642f24917856cefb97b80e01c838c590f781e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-221-3/+3
| | | | | | | | | | | | | | | Change-Id: I5e4a066de71420f25e26bf00267da3d0bcd9d7a5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-141-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia8233bfc975abd56f579f58d9d6df909ea8015b4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-121-3/+3
| | | | | | | | | | | | | | | Change-Id: I2e0ceebf98dd740a95e525e745d722882bbf4ba9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-121-0/+20
|\| | | | | | | | | | | Change-Id: I9b969eee802e8e0288c07fe138fd45f550ba787b
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
| |\| | | | | | | | | | Change-Id: Ib7ba82cc6f1a30e8f026cea8da5b36d8201db7de
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9404bf15dd2321957603feb1a605f7b50724cbe3
| | | * Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-151-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b0114f0dcba2d1709aac47530febc51e5078593e Fix GCC 4.8 build of abstract3drenderer + 3858190b2b2e71a7b63e9976da2b22f1c342e3b3 Add changes file for Qt 5.12.5 Change-Id: I9f7ee8e553b55d87a4695f71af7411aa1bcbfaef Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| | | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I01244127c6025b18b32ce40648f4d1de4a5fc0ff
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-091-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I4d2c4a63de35cd50745fecec0538f4d2967a7dae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-051-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: If16f228e23013566dbfab6b9c2ee00506710b520 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I84e6a4dc4a78c9add7f19349164831593b51eccd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia6d8590a9e08c575cc2b3e5b02b819f7d2f42e04 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-311-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia21d54c4040450b939994994bf57dbbbb374a675 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-291-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib29162ef8730c5eae80fbc7bac2dfe57cb223873 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-261-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I938b41eab377d2a1827e8f4213246fc8c013eea5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie6ba6b2bc8fabb7c72d86c51f480a9e84683180c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-221-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I450ee11b517c06ca03be2669c428764a38424e17 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-211-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia4cd251de4c0ab9b84e8bffd9249a287a8256d9e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-181-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I903bb837e438bdb2b756ce4143c52b61fb67a4e4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I45edbb8e58c2d550c8d201d7bd419b9db0f85b50 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ieca9ff8c07645a150ef410b62bfd1d92ff572997 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Id5d78e5fa39cc68587dfa9d894dc97b572f10db1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-161-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I2f8255f24e4a539f3092a4e06b6081a57437a460 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-161-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I907178d165d82388413db1f1c6c7733188c83e02 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-151-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I5bc1d65ff6395a7335241327ce03748bdf419538 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-131-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ieb62e66701ee3bc45f2720e7eae110080341be36 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-121-1/+277
|\| | | | | | | | | | | | | | | Change-Id: Ib309fe3b5adee4933ae9a66f4419aec28b088aa5
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-011-1/+277
| |\| | | | | | | | | | | | | | Change-Id: Ib04f91529d95b1268bfd470fa88e00dce866121a
| | * | Update plugins.qmltypes for 5.14v5.14.0-beta2v5.14.0-beta1Kai Koehne2019-09-301-1/+277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: Ib264cb0294f02e2983cba0041a48ff87b7bc4f51 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-111-3/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: I25604d98dd64be2ab1a9f59ce07022822a841ee6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtdatavis3dQt Submodule Update Bot2019-10-081-0/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I3eff46c0b81d282ef064bf54ec71bd4797860cb2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-042-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic4b3c490262e4a72bdd45b03828b88a784a4b9b8
| * | | | Fix Qt6 buildAlexandru Croitor2019-08-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify all the qmlRegisterModule calls to use minor version 15 because minor version zero from 6.0.0 would make tests fail. This is similar to what was done in qtdeclarative in c147b20a2c1299b2d659fe7c9472ae3866b6a425. Change-Id: If3202a887389351dd6efa760b0212e69582d9576 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Bump Qt version to Qt 6Alexandru Croitor2019-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic01cd61ea5c53c4685fcd74e5a980d93fc4bc33a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-242-0/+40
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-242-0/+40
|/| | | | | | | |/ / / | |/| | | | | | | | Change-Id: I1a5bcfb48938c296864f435e0159e9a2176a4131
| * | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-212-0/+40
|/| | | |
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-212-0/+40
|/| | | | | | |/ / | |/| | | | | | Change-Id: I65642f3568bcb7873893beb85cb88a7f07a2eed7
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 04:20:27 +0000