summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-302-2/+2
|\ | | | | | | Change-Id: I76d2acc6e6189b94b951e28d3ceff93817a3bc1c
| * Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-252-2/+2
| | | | | | | | | | | | | | It is being deprecated. Change-Id: I3c331ceb434f48939e4ce7e550c57df1b1794b17 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-233-3/+13
|\ \ | |/ | | | | Change-Id: I928747197843381b430cc4b652a74740b28b033b
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-163-3/+13
| |\ | | | | | | | | | Change-Id: Icde6a1cc61662a8b55325727182d174cf17f8b1b
| | * Doc: Suppress unnecessary documentation warnings for \internal typesTopi Reinio2019-11-133-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add \internal commands to documented member functions of internal classes. Fixes: QTBUG-79819 Change-Id: I90a0b17df623fda350810c46ff3bc3421692f753 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-0417-63/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also applied build fixes to build with QList == QVector. This means replacing forward-declarations and removing conversion code between list and vector. Change-Id: I6eac649f8376eafca8f96c3fa603d27ad5ad7b38 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-022-3/+277
|\ \ \ | |/ / | | | | | | Change-Id: I5a58398069603f4d0398a0cb507b411a8617be45
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-262-3/+277
| |\ \ | | |/ | | | | | | Change-Id: I9a32082a43f99b34431e27360214af1ce8ad621f
| | * Doc: Fix typoPaul Wicking2019-10-241-1/+1
| | | | | | | | | | | | | | | Change-Id: I462fb91fbb2dfef7c29c0662f710aac5903791f4 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Update plugins.qmltypes for 5.14Kai Koehne2019-10-221-2/+276
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: Id6361fc271aec1db292d1ea0e40f90f443b7b97e Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-192-8/+11
|\ \ \ | |/ / | | | | | | Change-Id: I53bbc2cee5dcc1175773ba79b2767888aaf3e887
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-122-8/+11
| |\ \ | | |/ | | | | | | Change-Id: Id99fd14f46601939c9b97d163e7bd794b9496df0
| | * Fix loading of schemas and validation to use resolved URLsv5.14.0-beta2Edward Welbourne2019-10-102-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loading the scheme did compute and record a resolved URL, but didn't actually pass it on, so a QUrl() of a plain local path (which is unresolved so doesn't know it's local) isn't recognized by QNAM as being local when it decides how to handle the request it's been sent. Likewise, verification's loading of files used the URL it was given, without resolving, so would fail to read local files it was meant to validate. This lead to getting no data from local files. (That, in turn, prevented a new test-case I'm about to add from crashing, which the same change shall fix.) Change-Id: Icc56dd599897d3498f0838b2f12e3ac46da84519 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-122-153/+115
|\ \ \ | |/ / | | | | | | Change-Id: I13fa4a6ea461db348b95c87a256773156e8c6813
| * | Fix createTokenLookup.sh and re-run itEdward Welbourne2019-10-082-153/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This regenerates the tooken lookup code, now without the need for hand-editing after running the script. The script's copy of a license header came through shell variable expansion, which broke the $...$ markers; so just cat the relevant lines of the gperf file. As gperf wants to use size_t for the len parameters of TookenLookup's hash() and value() methods, pipe its output through a simple sed to convert size_t to the unsigned int we actually want; and fix a fall-through marker at the same time. Change-Id: Ia38c4cd833c6fcaad2371c154e2204c0992aa811 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-041-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0398388adfa338cb5f3dda722f30da14b57dde00
| * | | 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 override and remove redundant virtualAlexander Volkov2019-10-0366-469/+469
| | | | | | | | | | | | | | | | | | | | Change-Id: I1a2974e012a45eb5145a092c9014d8eaab9f3ce7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-2413-874/+909
|\ \ \ \ | | |/ / | |/| | | | | | Change-Id: Ia4166b28c3fc1d7bcdd58ce3f23212a777ee711f
| * | | Run createParser.sh to update the query transform parserEdward Welbourne2019-09-1713-874/+909
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are curious to know whether to keep the ypp file around, so wish to review what changes when we use it. Various things with YY* names have now changed to have XPATH* names, so renamed them systematically in the non-generated code. Change-Id: Ia5fad9bc5845a8707430d59aaf6ac6dadf17b5bd Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-172-4/+4
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Id2a8b163f6c01f8e54f8e97da0b93be2e3b90b54
| * | | Fix three warnings from bisonEdward Welbourne2019-09-161-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | We were using directives that are now deprecated. Replaved them with the modern equivalents bison suggested when run. These changes *do* change the output. Change-Id: I18064e60c86d1782490ab5896ab9233593198caf Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Change a fall-through comment to Q_FALLTHROUGH()Edward Welbourne2019-09-041-1/+1
| |/ | | | | | | | | | | | | | | Calms gcc 7, which makes unannounced fall-through part of our standard warnings (which are handled as error in developer builds). Change-Id: Idc8cbb91d2fc5530a979b0ff06adde13f7c1b675 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | data: Add missing override and remove redundant virtualAlexander Volkov2019-09-0232-320/+316
| | | | | | | | | | Change-Id: Ic114d4c1243f4c6f10cbf6ece408e2f7586e17fc Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | expr: Add missing override and remove redundant virtualAlexander Volkov2019-09-0274-474/+474
| | | | | | | | | | Change-Id: If9f4b61a6eb739966b3941b1f97ba5dd6252053b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | functions: Add missing override and remove redundant virtualAlexander Volkov2019-09-0246-207/+207
|/ | | | | Change-Id: I33a85990adb8b13db11c3e59a1eb9da2e7e3352f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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>
View Lorry Controller Status