summaryrefslogtreecommitdiff
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>
* 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
| * 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
| | * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib13265c50fae3e7116dc354947942cf4d2b8efa1
* | | | 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>
* | | Fix Q_FOREACH in commented-out codeMarc Mutz2019-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The module is under QT_NO_FOREACH, so don't create a surprise if the code gets uncommented. Yes, this is borderline OCD, indulge me. I like modules that are grep-clean re:foreach... Change-Id: I8211c40d359c308a18fadbc56640861c65cd270f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-291-0/+20
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-0/+20
| |\ \ \ |/ / / / | | _ / | | / Change-Id: Ibfca1888d06a4373525ea73c15dc0c225441078c
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+20
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+20
| | |\ \ | |/ / / | | | _ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I2824eb36147257ba4f1d4b970ef636608adc2789
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |\ | | |/ / | | | | | | | | Change-Id: I4721331d9bc186b1729b7557a8eb01524d459133
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I51e1b5c5bed83d0e597f10e3e78278d56cfb04e6 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | |/ | | | | | | | | | Change-Id: Iab28ca8562e9595613dc6568947dc53d616781e5
* | | 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>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-222-0/+26
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-222-0/+26
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I593c8014b8726aff1b50a2c9c8fef4ac95ad7141
| * | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| | |\ \ | |/ / / | | | | | | | | Change-Id: I7503438df2b1bcfd24980a4812e2199e0b478059
| | * | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-101-0/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: Idd15bd65fb9cc98c33518d693c0d5e120ca8a9f2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | | Android: Disable tests that depend on external filesVolker Hilsheimer2019-06-201-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing those tests is cumbersome, and doesn't cover anything that isn't already tested sufficiently on other platforms. Fixes: QTBUG-73643 Change-Id: I800196ec37ee2b364e086202e9a51a5edd541d52 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | | 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>
* | | | Tests: Fix warnings about deprecated function qVariantFromValue()Friedemann Kleint2019-05-224-9/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I6351b21813f0680b21405fdeadd7ee072dae703f Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
* | | | 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>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-271-0/+20
|\ \ \ | |/ / | | | | | | Change-Id: I985c3ad56caad40332054ff69056a50d3176c061
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
| |\ \ | | |/ | | | | | | Change-Id: Iff5cadbacf23e4bc611671403fb3657d992622fa
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I3ad15ca7f32af5dc4dc85e9b43a658b9e638cb86
| | | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-021-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 595e7cf516be4667b41ed358eabafcbf2f23ef5c Bump version Change-Id: I4b8c570c4d75773fb7a255f880a6da87ad6a2df9 Reviewed-by: Jani Heikkinen <jani.heikkinen@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>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-020-0/+0
|\ \ \ | |/ / | | | | | | Change-Id: I5e90bfc112f053f6a94165e929566013971c4539
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iff5664d0a21b3c7216d5fbc18524e7623e31ebb0
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: I54287d9e1965140aa403256e6b0f6a915e8c0d02
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-261-0/+2
|\ \ \ | |/ / | | | | | | Change-Id: If35b2e449b7e49109d19b418bd1b9ecd3187c70c
| * | 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>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-192-2/+22
|\ \ \ | |/ / | | | | | | Change-Id: Ia8492d9fdb809f0a88ea35a6930d41ec6112e76e
View Lorry Controller Status