summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | Change-Id: Iab28ca8562e9595613dc6568947dc53d616781e5
* 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.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>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I54287d9e1965140aa403256e6b0f6a915e8c0d02
* 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>
* 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>
* | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | Change-Id: Ib1afc0957894b3fc9f99bff6160d715ab4d458f4
* | 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
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ | | | | | | Change-Id: I4aec355b91236f84c6976fb1f64f5d500a002cd2
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: I6092bf11c5d422df5f6707417ec4012aeaca53df
| | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-191-0/+20
| |/ | | | | | | | | | | | | + af06f4fbf76ef6168529f5de4480d4afd2cf204b Bump version Change-Id: Idb6e1d84a4cf7507141d930929d29d5efad3309f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-052-0/+114
|\ \ | | | | | | | | | Change-Id: Iae558cdf73e96d8248b721c04aae92c2595929f7
| * | Doc: Copy the snippet file over from qtdeclarativev5.12.0-rc2v5.12.0-rc1v5.12.0-beta4v5.12.05.12.0Venugopal Shivashankar2018-11-021-0/+96
| | | | | | | | | | | | | | | | | | | | | It's is referred in the XmlListModel docs. Change-Id: I4ad1d27d4ba046058e6bb0fdba774c4397df04dc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | Add changes file for Qt 5.12.0Antti Kokko2018-10-311-0/+18
| | | | | | | | | | | | | | | Change-Id: I68a5c5c8c601c8ac2efa9857785cf04d21a91cdf Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Doc: Add the XmlListModel sources to the doc configVenugopal Shivashankar2018-11-303-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, the XmlListModel and XmlRole docs are not built. Change-Id: I9d74d969e805a97b650f24797f171d8f03dcf88c Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: .qmake.conf Change-Id: Ice7a60f230736fb86f4044d79831ff9d41b3d297
| * Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | Change-Id: I2a3861b0ca7b2ecac6e9432325cb69b4cafeec74
* | Move changes from qtdeclarative xmllistmodel over to xmlpatternsFrederik Gladhorn2018-10-253-6/+8
| | | | | | | | | | Change-Id: I98958a66a6280eec26df9f32859e45f04dac4293 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Exclude when Qt Network is not availablev5.12.0-beta3v5.12.0-beta2Eskil Abrahamsen Blomfeldt2018-10-051-0/+1
| | | | | | | | | | | | | | Qt Xml Patterns depends on Qt Network. Change-Id: I815e4065672139930b68b26d8c71aba8bf66a86a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta1v5.12.0-alpha1Qt Forward Merge Bot2018-09-111-0/+24
|\ \ | |/ | | | | Change-Id: Ifd467c9d3e6e7b0790ce72c8c771db319b33dde4
| * Merge remote-tracking branch 'origin/5.11.2' into 5.11Qt Forward Merge Bot2018-09-091-0/+24
| |\ | | | | | | | | | Change-Id: I56267b98102dc5b2a223c7e077f5c74e9cf727d5
| | * Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-08-291-0/+24
| |/ | | | | | | | | Change-Id: I16e163121cd1713de5ea309211295b589176d6ea Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Update with change that went into qtdeclarativeFrederik Gladhorn2018-09-051-4/+4
| | | | | | | | | | | | Change-Id: Idacc3f77ed0dfcae7d3340262d89d3cf8052e9dd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Move xmllistmodel to xmlpatternsFrederik Gladhorn2018-08-2827-0/+2977
| | | | | | | | | | Change-Id: Ida2a23ae93b8625638397ee7ae10f32b9dcd2043 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Remove forward declaration of non existing classJędrzej Nowacki2018-08-162-4/+0
| | | | | | | | | | | | | | | | QAbstractMessageHandler and QAbstractUriResolver have no private classes, there is no need to declare fake ones. Change-Id: Ibe18d7bec21ecf5df1d5f0068185e568b96460fd Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-310-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I49765ada59c4b616a7354df475413485419404c7
| * Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | | | | | Change-Id: Id793f6fdb01271e69a0e5baf8dfeba425c23423e
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-173-6/+6
|\ \ | |/ | | | | Change-Id: If4a67889fb7dafb929930d5e572b154244f66ae9
| * Fix a cyclic reference that resulted in a memory leakErik Verbruggen2018-07-163-6/+6
| | | | | | | | | | | | | | | | | | | | | | An element in a complex type would refer to its parenty by a QExplicitlySharedDataPointer, resulting in a reference cycle where none of the items woulf reach a zero refcount, resulting in a leak. Task-number: QTBUG-62691 Change-Id: I469c8cb38cc89ed778dac7534690a5d343b4bf25 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-231-0/+29
|\ \ | |/ | | | | Change-Id: Iefc1090b17c072ff524f6e115893b1544b9f8784
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+29
| |\ | | | | | | | | | Change-Id: I06eec78ce16e16a3f299c169ea76bf2c82d27a69
| | * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-131-0/+29
| |/ | | | | | | | | Change-Id: I94c5b551e791ae5d1ef63585fc6b4200ccb81067 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-121-0/+5656
|\ \ | |/ | | | | Change-Id: I1ca6fd4497d92882d55de77e375ba16d7530189b
| * Add binary compatibility file for 5.11 for QtXmlPatternsMilla Pohjanheimo2018-06-061-0/+5656
| | | | | | | | | | | | | | File for bic test added. Change-Id: Iee7e3abe68eb1132c5d8c316e3095e13886adf1f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-06-042-0/+48
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4e12c0fbbaa0449bdd3b9fd3ad4beac5ea245d1f
| * Add changes file for Qt 5.9.6Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | Change-Id: I4818447cbb75f5e27de197acbf176b33a1f01b4e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 4dcae15a5a7f848addfb1b6bc2a98a63dc7218b4) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Add changes file for Qt 5.9.5Antti Kokko2018-06-011-0/+24
| | | | | | | | | | | | | | | | Change-Id: Ia765adc99276d319c74bc23e9785f6d471340d06 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit c7c568100450e4eedc88ab3e195a54259a7270ac) Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | | | | | Change-Id: I8d6589ee214cf6722e6f23b615ab98a50b89aecc
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-121-0/+22
|\ \ | |/ | | | | Change-Id: I2473fbf68b6d1cbfd6bd42903d6b8fd3daa7399b
| * Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
| |\ | | | | | | | | | Change-Id: I2bc5a7a660f636a4dbc278984e22066cb8bc45d6
| | * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-231-0/+22
| | | | | | | | | | | | | | | Change-Id: I5151606f71a74ae6f536735f129bb6b4702f920d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-05-057-13/+8
|\ \ \ | |/ / | | | | | | Change-Id: Id2b1cebbc86bad2780d964c896b4eb6c8188526f
| * | Tests: Fix clang warnings about unused variablesFriedemann Kleint2018-05-025-9/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests/auto/qxmlnodemodelindex/tst_qxmlnodemodelindex.cpp:112:warn:unused variable 'copy' [-Wunused-variable] tests/auto/xmlpatternssdk/ResultThreader.h:86:warn:private field 'm_eventLoop' is not used [-Wunused-private-field] tests/auto/xmlpatternssdk/Worker.cpp:114:warn:unused variable 'endB' [-Wunused-variable] tests/auto/xmlpatternssdk/Worker.cpp:112:warn:unused variable 'itB' [-Wunused-variable] Change-Id: Idb1d0f78233665cb64025bda90a325db4562b41a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Tests: Fix Clang warnings about hiding overloaded virtual functionsFriedemann Kleint2018-05-022-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Rename functions to fix: tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp:127:tst_QSimpleXmlNodeModel::stringValue()::TypedModel::root' hides overloaded virtual function [-Woverloaded-virtual] tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp:365:'tst_QAbstractXmlNodeModel::typedValue()::TypedModel::root' hides overloaded virtual function [-Woverloaded-virtual] Change-Id: I8fe19ec51126383e5363636e8ae0ea3d3c65d578 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-282-6/+7
|\ \ \ | |/ / | | | | | | Change-Id: Ic81ebebfb9966bf7d450dacb403242c2f7dafba1
| * | Change QSourceLocation::operator!=() to test for inequalityPaul Colby2018-04-272-6/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QSourceLocation] Corrected QSourceLocation::operator!=() to test for non-equality, where prior to this it was incorrectly testing for equality instead. Also, corrected the QSourceLocation::operator!=() documentation which was erroneously referencing an unrelated QXmlName class, and updated the QSourceLocation::operator==() documentation to be consistent with the rest of the class, as well as broader Qt documentation conventions. Change-Id: Ia74f84e965f45fd2da3aa42c9c59eba7014b6edb Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
View Lorry Controller Status