summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-091-0/+20
| |\ \ | | |/ | | | | | | Change-Id: I8bdf4a25cbf1e7d13a093200b234866e622e9af6
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-051-0/+20
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5f2c272ee2c34387b7ef5169dc553cec14f1db80
| | | * 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
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-081-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I02d557666944f5afe9479f3ca9e82d7e1b1dcb40 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-051-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I85e622b3f15a62e526f250ec08aa1c815fac6a42 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-0423-72/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-291-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I18cf90cffc4728a9e5c8feef77200dc7661117a7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-261-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I66f59c065819aba8ad480b8e05a2c108078533c8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I022eb7c219cb154aca3199de5bdda689811e637f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-221-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I93fe5a3b0f9bf2abb640895c924bff0c735c4b21 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-191-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia7e71d3ada1e406e7fd13e4c909e6203d241bf66 Reviewed-by: Simon Hausmann <simon.hausmann@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>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I6603f361c4eb72e4cf06f22468eb23bf5976a27e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia9eeea9be2a5210db1b071ac85e30dc9775327e7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie40e1d29534e4e226a0b4626b7647b718bad2d36 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0f5a1e57b213860b989048b7cf2531c622a2428b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-161-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia4425375a66697b53f8b2ab3770ccd3c37173149 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-151-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I859f4a9651bc6cc42775cba488a22a4a6f4cb520 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-141-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie956b8a67bbd3303adf0b91b1e93a0d21cc7e8a4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-131-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I53397862461a5f9e63e44115ca108128f915c87f Reviewed-by: Simon Hausmann <simon.hausmann@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>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I131db0201e6e7ea69d2db9d5d9a18463b9016e44 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-081-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I9090b0120db71bed9b1297ab9ce66a4c2f7fcf9c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-10-041-0/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I8585b8c2980c9614538aa0c425b8703ee19fd2c0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-045-22/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Fix Qt6 buildAlexandru Croitor2019-08-012-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I46589a4698251fc271c45639b1d3b0ec8cf89fb2 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | | | Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"Simon Hausmann2019-07-179-12/+227
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/dev' into wip/qt6Simon Hausmann2019-07-179-12/+227
| | |\ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I623e15b5095a5f63664416f30a1b30788f0ccb8c
| * | | | | Bump Qt version to Qt 6Alexandru Croitor2019-07-112-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix usage of text stream operators. Change-Id: I6c3ca0fe501f0565ecae5782a52cc70e1a4b6c04 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | | | Add missing override and remove redundant virtualAlexander Volkov2019-10-0367-473/+473
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1a2974e012a45eb5145a092c9014d8eaab9f3ce7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Qt Forward Merge Bot2019-09-2416-879/+957
|\ \ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-2416-879/+957
| |\ \ \ \ \ \ |/ / / / / / / | | | | _ / / | | | | / / Change-Id: Ia4166b28c3fc1d7bcdd58ce3f23212a777ee711f
| * | | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-213-5/+48
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-213-5/+48
| | |\ \ \ \ \ | |/ / / / / / | | | | | _ / | | | | | / Change-Id: Idc45924a74c32bce5ef90e42b2fd1517022b6086
| | * | | | Make a test conditional on its set-up having succeededv5.14.0-beta1v5.14.0-alpha1Edward Welbourne2019-09-201-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QXmlQuery::setQueryQUrlFailure()'s sub-test "Query via file:/ that does not have read permissions." depends on the file it tries to read being unreadable. The test's set-up contained a comment explaining why we don't QVERIFY() that it succeeded, but went ahead with adding the test-case regardless. Oddly enough, when the set-up fails to deny permissions, the test fails because the file can be read, so isn't found invalid. Made addition of the test-case conditional on the set-up having succeeded. This made a long line over-long; and it included a duplicated long slab of boring code, used in another test, so extract that piece of code as a lambda and use it twice to save duplication. The tests were also passing raw C-strings to QUrl(), which wants a QString, so give it QStringLiteral() in one case and the existing QString with the relevant name in the other. Fixes: QTBUG-78560 Change-Id: I2e9ca6fe526edfc021cb4978c81fc9204e047c7f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
| | * | | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-192-0/+40
| | |\ \ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| | | |\ \ \ \ | | |/ / / / / | | | | | | _ | | | | | | Change-Id: I78e676fc7b8ec4aa401c0c0407bee6e2c25a3704
| | | * | | 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
View Lorry Controller Status