summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.2v5.13.25.13.2Antti Kokko2019-10-141-0/+20
| | | | | | | + cdf3aa96879b7f5f0bd9bec9d1bd8dd624beee28 Add changes file for Qt 5.12.5 Change-Id: I83e50c04167a687aa666bfce9d300b11e1de3514 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | Change-Id: I8b7d19766262a617d612737ff32b19e6b7865474
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| |\ |/ / | | | | Change-Id: I4871adce37736010f202c800c7197077535ad87e
| * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | |\ | |/ / | | | | | | Change-Id: I123ee1b23e1fe90536e34d2a970db1cfe95b9840
| | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-281-0/+20
| |/ | | | | | | | | | | | | | | | | + 47c86cbb55a03df0f9d95dc2311b0be6d7852a5b Actually test XmlListModel + adf91ef5da6bb51288fffd68d3c9ebb02c3fe9bf Fix GCC 9 -Wdeprecated-copy + 1fe82f967320b3c65f29ed704862f8c34a6c0c87 Bump version Change-Id: I4faaef9a8e7c4b44f73e2a27ce028e2112aa5a29 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
|\ \
| * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| |\ \ |/ / / | | | | | | Change-Id: Ie0c61b7154416d8ad8a0a916ef5d1e943498485e
| * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-08-061-0/+20
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 25a313cc7af41c2c63231499c49cc1f3e382e019 Allow union memberTypes as members of a SimpleType in a XSDSchema + a8e463058edec8882bf5eb1ae1ba87cefdb8ba8c Bump version + 4efc4b1d0c11b68e1140734f659b22ce266d1bd6 Add changes file for Qt 5.12.4 + 78c788c386ccb69d823d71f668cfae45eef56351 Android: Disable tests that depend on external files + 47c86cbb55a03df0f9d95dc2311b0be6d7852a5b Actually test XmlListModel + adf91ef5da6bb51288fffd68d3c9ebb02c3fe9bf Fix GCC 9 -Wdeprecated-copy + 0e1ee397fe97d06b946e6fa296378721496ba3e5 Bump version + 1fe82f967320b3c65f29ed704862f8c34a6c0c87 Bump version + 5e6e09823da454e16341b9cab944b74a13265ef9 Doc: Replace example file lists with links to code.qt.io Change-Id: Ic21afc08f0fe1fe77dd5d0225e2d780b66b82d32 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-117-12/+225
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-117-12/+225
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icb9c69298452f55c0816fca75b79c0f041c9d8cf
| | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: Ieef19b19ec0ea8df01190de0ad24105c61465c2c
| | * Fix GCC 9 -Wdeprecated-copyMarc Mutz2019-07-011-0/+2
| | | | | | | | | | | | | | | Change-Id: Ida54f2edbfa41936d40e7309c0ea1cd8d6d02e5f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * Actually test XmlListModelMarc Mutz2019-07-016-12/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a typo in 'SUBDIRS', the test was never added to the build. Adding tests/shared/util.* from (current) qtdeclarative, adjusting paths and eradicating Q_FOREACHs, as the module defines QT_NO_FOREACH. Amends 8c6e24329ecd65f364654b1ca2b6a273f0826a8b. Change-Id: Ifacec982e8628c1317b1d7cc5c454c0a2cfafba1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
|/ / | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Ibc00cc7b8cb9258ea0675f01ff4731788a4b4c8b Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: Ib13265c50fae3e7116dc354947942cf4d2b8efa1
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| |\ \ |/ / / | | _ | | | | | | | | Conflicts: .qmake.conf Change-Id: I2824eb36147257ba4f1d4b970ef636608adc2789
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | |\ | |/ / | | | | | | Change-Id: I4721331d9bc186b1729b7557a8eb01524d459133
| | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | Change-Id: I51e1b5c5bed83d0e597f10e3e78278d56cfb04e6 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| |/ | | | | | | Change-Id: Iab28ca8562e9595613dc6568947dc53d616781e5
* | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
|\ \
| * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| |\ \ |/ / / | | | | | | Change-Id: I7503438df2b1bcfd24980a4812e2199e0b478059
| * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-101-0/+18
| | | | | | | | | | | | | | | Change-Id: Idd15bd65fb9cc98c33518d693c0d5e120ca8a9f2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Android: Disable tests that depend on external filesVolker Hilsheimer2019-06-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing those tests is cumbersome, and doesn't cover anything that isn't already tested sufficiently on other platforms. Fixes: QTBUG-73643 Change-Id: I800196ec37ee2b364e086202e9a51a5edd541d52 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-111-4/+5
|\ \ \ | |/ / |/| / | |/ Change-Id: Ifd4941a823c0d2cdcd1ec07ee6001b03ca18763b
| * Allow union memberTypes as members of a SimpleType in a XSDSchemaAndy Shaw2019-05-071-4/+5
| | | | | | | | | | | | | | | | | | | | | | In accordance to the standard, a SimpleType can have both union and atomic type members in a XSDSchema. Reference - https://www.w3.org/TR/xmlschema-2/#rf-defn Fixes: QTBUG-74702 Change-Id: I337b5aeded843c06d7850a8b88d17178a38db79e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
|\ \ | |/ | | | | Change-Id: Iff5cadbacf23e4bc611671403fb3657d992622fa
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| |\ | | | | | | | | | Change-Id: I3ad15ca7f32af5dc4dc85e9b43a658b9e638cb86
| | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
| |/ | | | | | | | | | | | | + 595e7cf516be4667b41ed358eabafcbf2f23ef5c Bump version Change-Id: I4b8c570c4d75773fb7a255f880a6da87ad6a2df9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iff5664d0a21b3c7216d5fbc18524e7623e31ebb0
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I54287d9e1965140aa403256e6b0f6a915e8c0d02
* | Highlight the fact that Qt XML Patterns is deprecatedAlex Blasche2019-03-211-0/+2
| | | | | | | | | | Change-Id: I389f40be19090afe72fee91743f821cadf9f6fbe Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-181-2/+2
| | | | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: Ifba338201b0cba686c21ae29ef1018e82eeb5762 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
|\ \ | |/ | | | | Change-Id: I57911fdbfa3a8a0668b29de456daa9c675701fee
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| |\ | | | | | | | | | Change-Id: I80621e14c5bb3f0857027a451404fa16f85ce013
| | * Add changes file for Qt 5.12.2v5.12.25.12.2Antti Kokko2019-02-211-0/+20
| |/ | | | | | | | | | | | | | | + 1ff699ae47d14e39316a335ce897ca55a8ce6aad Doc: Correct depends statement in qtxmlpatterns.qdocconf + 79984891427743dfb16df056ecee56384024e93e Bump version Change-Id: Ie141fee167d89bda3878c9023541faec61c00e11 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Doc: Correct link errors qqmlxmllistmodel.cppv5.13.0-beta1Nico Vertriest2019-02-271-2/+2
| | | | | | | | | | Change-Id: I066325d87c7e067d9a456fec2821bfe69fd806e3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Doc: Fix documentation errorsNico Vertriest2019-02-271-3/+1
| | | | | | | | | | | | | | | | - wrong file name for snippet file - instantiates statement provoking spurious errors Change-Id: I39d0852828c7382eda709bf32e2d6b3e6a8c6c53 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Fix deprecation warning about Qt algorithms in tool xmlpatternsv5.13.0-alpha1Friedemann Kleint2019-02-053-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use std::sort and implement operator< for class QApplicationArgument, fixing: qapplicationargumentparser.cpp:301:7: warning: ‘template<class T> class qLess’ is deprecated [-Wdeprecated-declarations] from qapplicationargumentparser.cpp:29: qapplicationargumentparser.cpp: In member function ‘void QApplicationArgumentParserPrivate::displayHelp() const’: qapplicationargumentparser.cpp:337:15: warning: ‘void qSort(Container&) [with Container = QList<QApplicationArgument>]’ is deprecated: Use std::sort [-Wdeprecated-declarations] from qapplicationargumentparser.cpp:29: qapplicationargumentparser.cpp:356:19: warning: ‘void qSort(Container&) [with Container = QList<QApplicationArgument>]’ is deprecated: Use std::sort [-Wdeprecated-declarations] from qapplicationargumentparser.cpp:29: Change-Id: I63d8dd5a83f3478b2c70b5b288d9ddb3e5ad5a76 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-021-0/+20
|\ \ | |/ | | | | Change-Id: I0068cf06a849ea65b6a4081ffbc26ee4e1446865
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+20
| |\ | | | | | | | | | Change-Id: I80393be6f4bb8905e24e56943d845319ce4f871a
| | * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-101-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + af06f4fbf76ef6168529f5de4480d4afd2cf204b Bump version + 657995db766faa48084024e780c4cd02fa05c527 Add changes file for Qt 5.11.3 + 19b28e271ca3f4d0042b739e90b3d902f2866044 Doc: Add the XmlListModel sources to the doc config + a6efe4020c83384b0aa88aa71da49fce679bc24d Bump version Change-Id: If005ff5b73a4ea6db76cb241103fecdc4f242d21 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-220-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2a31f29b54049463ffcf2de9c65d228b7d07bf6a
| * | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | | | | | Change-Id: Ib1afc0957894b3fc9f99bff6160d715ab4d458f4
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-101-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I346e4a6c0b56a2730dfb90ac4629e2a621d2fe1f
| * | Doc: Correct depends statement in qtxmlpatterns.qdocconfNico Vertriest2019-01-101-1/+1
| |/ | | | | | | | | Change-Id: Ic16ad880a71237ddd7ec6f1346774a1844a752a1 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | Change-Id: Ib69194378fd96ff4062609540d2d292df53bf34d
View Lorry Controller Status