summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-04-141-3/+4
|\ \ | |/ | | | | Change-Id: I481492bb425ee36fc887da58fd4407f305e7194c
| * Fix developer build with new GCCv5.11.0-beta4Allan Sandfeld Jensen2018-04-131-3/+4
| | | | | | | | | | | | | | | | Avoid casting to a possibly null QXmlNodeModelIndex as that now can cause -Wunitialized warnings. Change-Id: Id53d213f90e9845f6e4b4e9ada5945726750ec86 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-241-3/+0
|\ \ | |/ | | | | Change-Id: I976437c1971d6938ae39f078f6fc77cc65a0559d
| * Unblacklist the test that depended on QDateTime stringificationv5.11.0-beta3Thiago Macieira2018-03-191-3/+0
| | | | | | | | | | | | | | qtbase is up-to-date Change-Id: I41d006aac5bc48529845fffd15102ff5f8322c3e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-162-17/+17
|\ \ | |/ | | | | Change-Id: I78c3ea5e250d3000c68cba05e1831f3933f06284
| * Doc: Fix qdoc/clang diagnostic warningsPaul Wicking2018-03-132-17/+17
| | | | | | | | | | | | | | | | Update templated function doc signatures to include correct return type. Change-Id: Iaca1ae3ebccf09b328e0cb66c27787df5052f9a0 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-02-278-95/+82
|\ \ | |/ | | | | Change-Id: I0d82ee6a8feee9a1543651c0592ec2bafe36bf93
| * Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie22521d6ce234132ebde19dfb91e09203f5fe13d
| | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | Change-Id: I645325992034208ef9bd0b4fd1755d9045316d85
| * | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
| |\ \ | | | | | | | | | | | | Change-Id: I9eea0bd13cfdf0cce4a693e90320ae1e0d85f491
| | * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | | | | | | Change-Id: I35ef3417ea68d2c4b60e69533907b836326a6cd4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | | Fix typosJarek Kobus2018-02-142-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I29f89ddf8e2ff9ef47a6f27897e458d042293979 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-125-90/+51
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ic4b4cabff030fe494e2f446d99127847c6ba421a
| | * | Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-293-88/+49
| | |\ \ | | | |/ | | | | | | | | Change-Id: I09553d29eab1e65fc3e51d72ff6ea6682794d312
| | | * Improve documentation for w3c's xml.xsd fileKai Koehne2018-01-263-88/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the qt_attribution.json setup, instead of hardcoding the license in the documentation. Also update the license to the latest W3C one, that supersedes the old license even for exising documents. [Third-Party Code] Update license of w3c'c xml.xsd file. Change-Id: I59a8a6f9d97ad89e530eb4cd30b1f4e1a725fcf4 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * | Fix access after free in evaluation cacheAllan Sandfeld Jensen2018-01-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a let expression is compressed away to just its value, let the value keep a reference to the variable declaration. Task-number: QTBUG-63613 Change-Id: I544ca682627c0fc0fe13984602aefbaaf3df4533 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | Bump versionOswald Buddenhagen2018-02-191-1/+1
| | | | | | | | | | | | | | | | Change-Id: I150bb711d8cdd48c89e24fea068772a3b9f6f7eb
* | | | Fix tests build when staticSergio Martins2018-02-151-1/+1
|/ / / | | | | | | | | | | | | | | | Change-Id: Ia1dc5bf0d12a676b23d1b502044bf81a16198736 Task-number: QTBUG-66419 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Update XML Query baseline after QVariant stringification of QDateTimeThiago Macieira2018-02-042-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QVariant (since qtbase commit ab1e50757454b5afda2f6dec52d2eb16a32d4798, reverted but will be brought back) will use milliseconds in the string form, to retain the ability to convert back to the original QDateTime. Task-number: QTBUG-66030 Change-Id: I41d006aac5bc48529845fffd150e62111a19a10e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-201-0/+25
|\ \ \ | |/ / | | | | | | Change-Id: I732cd6e8c13d582718d239621c86d98d1f3cef84
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-181-0/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id91fb508787683912928d16ac54e18b30eed0f18
| | * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+25
| | |\ | | | | | | | | | | | | Change-Id: I2f4e95418e26b29b2f3428f3bd18ec40079b60d3
| | | * Add changes file for Qt 5.9.4v5.9.45.9.4Antti Kokko2018-01-081-0/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: I91420c38715431220b15b65226e9ce67cd58d488 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
View Lorry Controller Status