summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix Qt6 buildwip/qt6Alexandru Croitor2019-08-061-2/+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: I983fcc06cfffc27ed4864a81b75e90c53b079add Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add missing qqmlfile.h includeMitch Curtis2019-07-161-0/+1
| | | | | | | | | | | | | | | Fixes the following error on Ubuntu 18.04.2 with g++ 7.4.0: /home/mitch/dev/qt5-dev/qtxmlpatterns/src/imports/xmllistmodel/qqmlxmllistmodel.cpp: In member function ‘void QQuickXmlListModel::reload()’: /home/mitch/dev/qt5-dev/qtxmlpatterns/src/imports/xmllistmodel/qqmlxmllistmodel.cpp:1063:16: error: ‘QQmlFile’ has not been declared } else if (QQmlFile::isLocalFile(d->src)) { ^~~~~~~~ /home/mitch/dev/qt5-dev/qtxmlpatterns/src/imports/xmllistmodel/qqmlxmllistmodel.cpp:1064:20: error: ‘QQmlFile’ has not been declared QFile file(QQmlFile::urlToLocalFileOrQrc(d->src)); ^~~~~~~~ Change-Id: I2ff7f898d42f51f8d0c5a1116049278a502ba343 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-162-0/+3
|\ | | | | | | Change-Id: If5274213e3d0d91e1b56693dc60cd45240b4dfaa
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-111-0/+2
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-111-0/+2
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icb9c69298452f55c0816fca75b79c0f041c9d8cf
| | | * Fix GCC 9 -Wdeprecated-copyMarc Mutz2019-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida54f2edbfa41936d40e7309c0ea1cd8d6d02e5f Reviewed-by: Mårten Nordheim <marten.nordheim@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>
* | | Port towards load/storeRelaxed atomicsFriedemann Kleint2019-06-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Plain load() / store() have been deprecated, so port away to their straight replacements. Change-Id: Id026544af12f93ba7bd1b0ba6ff95c1efaff8106 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Fix deprecation warnings about deprecated container conversionsFriedemann Kleint2019-05-226-14/+24
| | | | | | | | | | | | | | | | | | | | | | | | Fix warnings introduced by qtbase/92f984273262531f909ede17a324f546fe502b5c. Change-Id: I1f64f1573ae4cff9e39f1a340711f2e90a6a7dd1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-141-4/+5
|\ \ \ | |/ / | | | | | | Change-Id: Ic9eba22749056310f0dc8d345ac11159683051d5
| * | 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>
* | | Include qjsvalue.h to use QJSValueUlf Hermann2019-05-092-2/+1
| | | | | | | | | | | | | | | Change-Id: I20821a57596061bd3a3e7f744e4f8952b78dcfae Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | QQuickXmlListModel: Fix compilation after removal of QQmlV4HandleFriedemann Kleint2019-04-122-4/+4
|/ / | | | | | | | | | | | | | | Replace by QJSValue after qtdeclarative/65299ce292180a845eb2d76756faeeaa1456d8f0. Change-Id: I3c74dcaebaf069f7f5b14e51de8fdbbba2fe9281 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | 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>
* | 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>
* Doc: Correct depends statement in qtxmlpatterns.qdocconfNico Vertriest2019-01-101-1/+1
| | | | | Change-Id: Ic16ad880a71237ddd7ec6f1346774a1844a752a1 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+96
|\ | | | | | | 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>
* | 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>
* Move changes from qtdeclarative xmllistmodel over to xmlpatternsFrederik Gladhorn2018-10-253-6/+8
| | | | | Change-Id: I98958a66a6280eec26df9f32859e45f04dac4293 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-288-0/+1609
| | | | | 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>
* 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>
* Change QSourceLocation::operator!=() to test for inequalityPaul Colby2018-04-271-4/+5
| | | | | | | | | | | | | | [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>
* 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>
* 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>
* 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 license headersJani Heikkinen2018-01-061-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | - Replace old header.LGPL21 usage with header.LGPL one - Remove unnecessary license files Change-Id: Ie5ac3785daa1805aef8eb2c5176c95c51523259a Reviewed-by: Kai Koehne <kai.koehne@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>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-162-23/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6f68767536130d88d48c12e578eb7cd7cd19a40c
| * | Fix license headersJani Heikkinen2018-01-151-14/+20
| | | | | | | | | | | | | | | | | | | | | | | | old header.LGPL21 was still used in one src file. Replace that one with correct header.LGPL one. Remove also unnecessary license files. Change-Id: I02126d6114ca04dffbd488610195919b67fdd96c Reviewed-by: Liang Qi <liang.qi@qt.io>
| * | Significantly improve memory usage in XsdStateMachine::toDFAViktor Engelmann2018-01-041-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now mark DFA state sets immediately when they are enqueued and check for that mark before enqueing them. This way, we save a lot of memory when a set has many states and is encountered often. In the referenced bug report, there were 60000 copies of a set with 40000 entries, wasting tens of gigabytes of memory. Task-number: QTBUG-65067 Change-Id: Iec3a04c8badfac29faefbba22c2942ed104effbb Reviewed-by: Kari Hormi <kari.hormi@qt.io> Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | | Raise minimum supported MSVC version to 2015Friedemann Kleint2018-01-051-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove code for older versions and streamline #ifdefs. Task-number: QTBUG-51673 Change-Id: Ic6c735aa46b7c80f82d741d67e72706c9c983eb6 Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
* | | type: Add missing override and remove redundant virtualAlexander Volkov2017-11-2726-697/+697
| | | | | | | | | | | | | | | Change-Id: I1c8c39947c9c6f54f6232d2a9cad5d5a41b4bd49 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | api: Add missing override and remove redundant virtualAlexander Volkov2017-11-2712-91/+91
| | | | | | | | | | | | | | | Change-Id: Ic43bbe7d5ee372fbe70ee39040fb97fb0302fc07 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-11-2025-91/+244
|\ \ \ | |/ / | | | | | | Change-Id: I5164e541f99e42d78d12fbdeea98ecc6db117637
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-11-153-9/+11
| |\ \ | | |/ | | | | | | Change-Id: Idcfaa401ee18ab56f63d2089eca666be12abadcd
| | * Fix clazy-temporary-iteratorFriedemann Kleint2017-11-143-9/+11
| | | | | | | | | | | | | | | Change-Id: I512ffb927cfa161fc810c846a7b57b02601b14b9 Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
| * | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-3021-73/+233
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I03793037d5cb382a3ea411286633903e4fee60ce
| | * Fix outdated FDL license headerKai Koehne2017-10-175-25/+25
| | | | | | | | | | | | | | | Change-Id: I50ac50f96c8ac4bf7023b9488e6a634d3f71e583 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix outdated BSD license headerKai Koehne2017-10-1716-48/+208
| | | | | | | | | | | | | | | Change-Id: I90b4636aeaf7465f5938ff3454d735cf67816d98 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | remove wince leftoversGatis Paeglis2017-09-191-9/+0
| |/ | | | | | | | | Change-Id: I0579f73576722ebe68c3574f48934b15997aa035 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Replace Q_NULLPTR with nullptrKevin Funk2017-09-264-4/+4
|/ | | | | Change-Id: Iae074eb184283d09528ada65ec2d8d252639720d Reviewed-by: Lars Knoll <lars.knoll@qt.io>
View Lorry Controller Status