summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-1431-40/+6253
|\ \ | |/ | | | | Change-Id: Ief4b8ef19ad417bac23f4a4fe42e3b1c53455f03
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\ | | | | | | | | | Change-Id: If025f51e601f4ec7f23e1fe51d698f9c20e67256
| | * Add changes file for Qt 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Antti Kokko2019-11-261-0/+18
| | | | | | | | | | | | | | | Change-Id: I00cdf3d22cdbad6d697ea5895e80b17a9e7506a5 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Add binary compatibility file for qtxmlpatterns 5.14 branchMilla Pohjanheimo2019-12-131-0/+6205
| | | | | | | | | | | | | | | | | | | | | BC file built against 5.14.0 added. Change-Id: I1d29b035c0efa57424fca81aa6fd09c461281a08 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Enable auto tests run stand-aloneFriedemann Kleint2019-12-0929-40/+30
| | | | | | | | | | | | | | | | | | | | | | | | Change the QtXmlPatternsSDK helper library to be a static library. Fixes: QTBUG-79802 Change-Id: I2f299fbcb73da155643a0b66a13a88745de6d00f Reviewed-by: Matti Paaso <matti.paaso@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-075-1/+76
|\ \ \ | |/ / | | | | | | Change-Id: I967a3678e5791457e25618e46611f6327e182c70
| * | Catch invalid simple type that was causing a crashEdward Welbourne2019-12-045-1/+76
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Although the type passes a check that's supposed to find all types with a simple type, and appears to be of a simple type, its primitive type is apparently null. This was causing a segmentation fault. Apparently the code fails to correctly set the primitive type of a pattern-type instance of a union type. Document the known limitation by a QEXPECT_FAIL() in the test; I was unable to find where the primitive type should be set. Task-number: QTBUG-77620 Change-Id: I56b95ed815366c508f71b8af03b6f2a653d338c5 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | 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.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>
* | 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
* | | 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.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>
* | | 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 "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
| | | | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-281-0/+20
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 47c86cbb55a03df0f9d95dc2311b0be6d7852a5b Actually test XmlListModel + adf91ef5da6bb51288fffd68d3c9ebb02c3fe9bf Fix GCC 9 -Wdeprecated-copy + 1fe82f967320b3c65f29ed704862f8c34a6c0c87 Bump version Change-Id: I4faaef9a8e7c4b44f73e2a27ce028e2112aa5a29 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| | * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| | |\ \
| | | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | | |\ \ | | |/ / / | | | | | | | | | | Change-Id: Ie0c61b7154416d8ad8a0a916ef5d1e943498485e
| | | * | Add changes file for Qt 5.13.1v5.13.15.13.1Antti Kokko2019-08-061-0/+20
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 25a313cc7af41c2c63231499c49cc1f3e382e019 Allow union memberTypes as members of a SimpleType in a XSDSchema + a8e463058edec8882bf5eb1ae1ba87cefdb8ba8c Bump version + 4efc4b1d0c11b68e1140734f659b22ce266d1bd6 Add changes file for Qt 5.12.4 + 78c788c386ccb69d823d71f668cfae45eef56351 Android: Disable tests that depend on external files + 47c86cbb55a03df0f9d95dc2311b0be6d7852a5b Actually test XmlListModel + adf91ef5da6bb51288fffd68d3c9ebb02c3fe9bf Fix GCC 9 -Wdeprecated-copy + 0e1ee397fe97d06b946e6fa296378721496ba3e5 Bump version + 1fe82f967320b3c65f29ed704862f8c34a6c0c87 Bump version + 5e6e09823da454e16341b9cab944b74a13265ef9 Doc: Replace example file lists with links to code.qt.io Change-Id: Ic21afc08f0fe1fe77dd5d0225e2d780b66b82d32 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | | 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>
* | | | 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>
* | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-051-1/+1
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-051-1/+1
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: I7159b9e3f50bc6d54f5d89f2984f0f76803c621e
| * | | 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>
* | | | Bump versionKari Oikarinen2019-08-271-1/+1
|/ / / | | | | | | | | | Change-Id: I1e428fccd9dc0e9531ec6bab27f68d27297658ee
* | | 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 "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-168-12/+226
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-168-12/+226
| |\ \ \ |/ / / / | | _ / | | / Change-Id: If5274213e3d0d91e1b56693dc60cd45240b4dfaa
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-117-12/+225
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-117-12/+225
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icb9c69298452f55c0816fca75b79c0f041c9d8cf
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ieef19b19ec0ea8df01190de0ad24105c61465c2c
| | | * Fix GCC 9 -Wdeprecated-copyMarc Mutz2019-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida54f2edbfa41936d40e7309c0ea1cd8d6d02e5f Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | | * Actually test XmlListModelMarc Mutz2019-07-016-12/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to a typo in 'SUBDIRS', the test was never added to the build. Adding tests/shared/util.* from (current) qtdeclarative, adjusting paths and eradicating Q_FOREACHs, as the module defines QT_NO_FOREACH. Amends 8c6e24329ecd65f364654b1ca2b6a273f0826a8b. Change-Id: Ifacec982e8628c1317b1d7cc5c454c0a2cfafba1 Reviewed-by: Simon Hausmann <simon.hausmann@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>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
| |\ \ \ |/ / / / | | _ / | | / | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7b4a6b4ec0b51cd9438daa17900eb46664db715f
View Lorry Controller Status