summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2020-01-201-2/+2
| | | | | Change-Id: Ie53e2ceb358a7a43b164749c371a247b5e8a905d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2020-01-151-2/+2
| | | | | Change-Id: I1c69a5d7c2b4b5413e4be8d6e5fae58b62cc979a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-1731-40/+6253
|\ | | | | | | Change-Id: I96404d75682581891c8fb1c8ae610eeff6ece53d
| * 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.15' into devQt Forward Merge Bot2019-12-105-1/+76
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I3eb54f906dc1ee8fedf64a4cde67edb3f8ce5460
| * | | 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>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-12-051-2/+2
| | | | | | | | | | | | | | | Change-Id: Ib3e73cd343f457326e4a04ec85ba9af1930ce985 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-12-041-2/+2
| | | | | | | | | | | | | | | Change-Id: I0cef97090876ba836af9222e1019c8a72f8279e3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | 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>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-291-2/+2
| | | | | | | | | | | | | | | Change-Id: I7e04361434c7e4f5a18ec30c33c77b9ca29a59b7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-281-2/+2
| | | | | | | | | | | | | | | Change-Id: Ib26501c76e78b25fe6655860f7af6df69463f133 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-261-2/+2
| | | | | | | | | | | | | | | Change-Id: Ia4f43189aa6d8089f7bf0db2ddfa4a3c79f0107c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-251-2/+2
| | | | | | | | | | | | | | | Change-Id: Iba6b94225822b6b5f4a9df656b061159d83d20ce Reviewed-by: Simon Hausmann <simon.hausmann@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-221-2/+2
| | | | | | | | | | | | | | | Change-Id: I05554c036c3cd38c0f90ed68a01da497131b76be Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-131-2/+2
| | | | | | | | | | | | | | | Change-Id: I02180903b96844267f6b57ed32bc937427890618 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Update dependencies on 'dev' in qt/qtxmlpatternsQt Submodule Update Bot2019-11-121-2/+2
| | | | | | | | | | | | | | | Change-Id: I7581792dd09d209f1bc05c69cafc36ff7c518380 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-121-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I56d9522e8743afa71f29ae89b69d85da6767e119
| * | 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>
View Lorry Controller Status