summaryrefslogtreecommitdiff
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Make sure all private headers include at least one otherThiago Macieira2022-03-081-1/+2
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-081-1/+1
|\ | | | | | | Change-Id: If5721286fbb7c3dd0564f11e12311176477b92bb
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-1/+1
| |\ | | | | | | | | | Change-Id: Ib8ba4718239d5b7690a20b50c6f49a055a0ea04f
| | * Doc: Fix regression caused by moving files around (leave no file behind)Paul Wicking2020-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When xmllistmodel moved to xmlpatterns, an xml file quoted from in docs was unintentionally left behind. This adds the missing file, and corrects the file to quote from (which had since been adjusted to quote from the wrong file). Fixes: QTBUG-77176 Change-Id: I9cc871cf58dd33ce922fa0f6c5d86800210208c5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-01-211-1/+1
|\ \ \ | |/ / | | | | | | Change-Id: Ia0f79b0c59c6339e471533b644f40995d8c4df37
| * | Use QNetworkReply::networkError() instead of deprecated error()Timur Pocheptsov2020-01-151-1/+1
| |/ | | | | | | | | | | Task-number: QTBUG-80369 Change-Id: I6e71a6b888f292c283c85b6aeb3aa5804f032c91 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-021-2/+276
|\ \ | |/ | | | | Change-Id: I5a58398069603f4d0398a0cb507b411a8617be45
| * 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>
* | 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 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>
* Port towards load/storeRelaxed atomicsFriedemann Kleint2019-06-251-3/+3
| | | | | | | | Plain load() / store() have been deprecated, so port away to their straight replacements. Change-Id: Id026544af12f93ba7bd1b0ba6ff95c1efaff8106 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* 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>
* 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: Add the XmlListModel sources to the doc configVenugopal Shivashankar2018-11-301-1/+2
| | | | | | | | | 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-287-0/+1603
Change-Id: Ida2a23ae93b8625638397ee7ae10f32b9dcd2043 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
View Lorry Controller Status