summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into ↵v5.15.9-lts-lgpl5.15Tarja Sundqvist2023-03-231-1/+1
|\ | | | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ife65123e00aa9f3ee9ccf6a7e4d9b265edcb5ef6
| * Bump versionTarja Sundqvist2021-12-311-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into ↵v5.15.8-lts-lgplTarja Sundqvist2022-11-101-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Id6724e638c03108b8f5d7bc2dfcaa034e2981b58
| * Bump versionTarja Sundqvist2021-11-081-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.7' into ↵v5.15.7-lts-lgplTarja Sundqvist2022-09-121-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I87b2f8d95c909ec436b50737aa988a967920bae6
| * Bump versionTarja Sundqvist2021-09-071-1/+1
| | | | | | | | Change-Id: I78417c42eb4949c3efbeea4d8d4f5da43761476e
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.6' into ↵v5.15.6-lts-lgplTarja Sundqvist2022-08-161-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I5064b690431db67e99c4dc39c84917b2aec06b19
| * Bump versionTarja Sundqvist2021-06-071-1/+1
| |
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into ↵v5.15.5-lts-lgplTarja Sundqvist2022-06-021-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: Ibb7f57b9ee00a9591e084e4dbdd0f4e53f405593
| * Bump versionTarja Sundqvist2021-05-201-1/+1
| | | | | | | | Change-Id: Ide8f28ee60e84f8010d4d030a0550660a134cede
* | Merge remote-tracking branch 'origin/tqtc/lts-5.15.4' into ↵v5.15.4-lts-lgplTarja Sundqvist2022-04-071-1/+1
|\ \ | |/ | | | | | | | | tqtc/lts-5.15-opensource Change-Id: I879d56c325351e11436bc61603fa4359df74d695
| * Bump versionJani Heikkinen2021-03-031-1/+1
| | | | | | | | Change-Id: Ibaa026339ccad7d094decc315bc343240a337dbf
* | Revert "Update commercial license headers"v5.15.3-lts-lgplTarja Sundqvist2021-03-24730-15146/+15146
|/ | | | | | | | | | | This reverts commit 4f20b58bf26d04f940db39bb5bafa5686299289a. Revert of commercial license headers is required for Qt 5.15.3 opensource release. Task-number: QTBUG-91108 Change-Id: Idfb0a02a064b2e61dc60604ccdb958e68f64b464 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
* Update commercial license headersTarja Sundqvist2021-01-27730-15146/+15146
| | | | | | | | | | | | | | | Updated header.COMM to the files in tqtc-qtxmlpatterns. Examples, tests or documentation files are not updted. The commercial license header may contain some additional lines so that its line count equals with the earlier license header. Reason for this is that some autotests use hard coded line numbers and a change in the line count causes failures in tests. Task-number: QTQAINFRA-4173 Change-Id: Ib454a53153affee0d7f3d6b5ff5e7b96f911b3f4 Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
* Add changes file for Qt 5.15.2Antti Kokko2020-10-281-0/+28
| | | | | | | | | | | - 6bea8f96dbbaf0935cccf9b1623b51d3264368ec Add changes file for Qt 5.15.1 + 569c804bf04be76c7213a09c2058d016fad074fe Bump version + f2e79ee96e94249756191760c844c853044cf77e Add changes file for Qt 5.12.10 Change-Id: I0388633c5ae1edec3dfbe4b351d92d1a2bba593b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 50421402f05b3ee3c76c6cff455a69efaf576b6d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-271-1/+1
| | | | Change-Id: Ia4c86a480ad4de289b38bd67addb45aef513e452
* Add changes file for Qt 5.12.10Antti Kokko2020-10-191-0/+28
| | | | | | | Change-Id: Ic32009cc3ab8cdf15c84dd04fc31f60ce5acb1ab Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 2e532e96db74bc666af800c2530827eea75a2107) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-09-281-1/+1
| | | | Change-Id: I8deea6c5ac99423ad40c13029908458303516341
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | | | | | + fe5abadda4ed0cfe7401ac8cfde29736c52a022e Doc: Add missing image + dcd7355bb9ea7e7f7f788a2e00fdf5fb48ae70b3 Bump version + 029368cde2b9b28de95e6187b3bcabbbc87f5a8b Add binary compatibility file for 5.15 for QtXmlPatterns Change-Id: I4bc56ada96a23a7bc76d612ff9f42385bc385a82 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit c4d24e467d7159a43eb90891b954f4cd816ba04b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add binary compatibility file for 5.15 for QtXmlPatternsMilla Pohjanheimo2020-08-171-0/+6215
| | | | | | | Binary compatibility file added. Change-Id: If7678d4d74edeaf5e8713655e86de1b1b5322e34 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-07-301-1/+1
| | | | Change-Id: I244d4f01dc9a8e4d90a71ef3eb0af7ec417779bd
* Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
|\ | | | | | | Change-Id: I3d8b707211890d8877d6c6622367c78056c42335
| * Merge remote-tracking branch 'origin/5.15' into 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Qt Forward Merge Bot2020-04-221-0/+20
| |\ | | | | | | | | | Change-Id: I8c85b8adeed3986d78f2c024d63ebb9a11979c8b
| * | Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| | | | | | | | | | | | | | | | | | Change-Id: Idc8952609c7ba6442b447337dba80335e6e36df4 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Doc: Add missing imagePaul Wicking2020-05-041-0/+0
| |/ |/| | | | | | | | | | | | | The image was forgotten when moved from qtdeclarative. Fixes: QTBUG-83958 Change-Id: I9c825649d8c2555644d1715795ec2e66bf3529e1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
|\ \ | |/ |/| | | Change-Id: Ic3ac5bbd2c85b93cf9af996fffd82f23f46cac7b
| * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| |\ | | | | | | | | | Change-Id: Ie296539e729340b6babda22a6df3a5649da4aad9
| | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-101-0/+20
| |/ | | | | | | | | | | | | | | + 005a475a2d4dcc16c2a84a3d0f4b11ed44abe205 Doc: Fix regression caused by moving files around (leave no file behind) + 95b629b30380be3de92158ad55ba266452d3c945 Bump version Change-Id: I8f1e8dd8313448df44858dbf1486c3e7bc384e00 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Fix compile errorv5.15.0-beta4v5.15.0-beta3Lars Knoll2020-03-301-1/+1
| | | | | | | | | | | | | | | | | | | | Fix compilation after change 46ebd11e66f6f3180043a7258b46a1aff79a69f8 in qtbase. Fixes: QTBUG-83171 Change-Id: I0a82c8f8c37ca8adc097cb2f480b8b54253e10b2 Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qtxmlpatterns: use the proper signal instead of the deprecated oneTimur Pocheptsov2020-03-232-2/+2
| | | | | | | | | | | | Task-number: QTBUG-82605 Change-Id: Iebd40c2683d9dbf21975c1e53506963bc40ac1cc Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Doc: Remove \contentspage commandTopi Reinio2020-03-151-1/+0
| | | | | | | | | | | | | | | | The command is deprecated and has no effect apart from generating a documentation warning. Change-Id: Ied78d23d7c7afc2d2d07643a5f8b8520191f1a21 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Use Qt::SplitBehavior in preference to QString::SplitBehaviorv5.15.0-beta2Edward Welbourne2020-03-024-20/+20
| | | | | | | | | | | | | | | | The Qt version was added in 5.14 "for use as eventual replacement for QString::SplitBehavior." Move another step closer to that goal. Change-Id: Id6bf95a2717b521a8100c57be34b9e85d20177f7 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Update plugins.qmltypes for 5.15Jani Heikkinen2020-02-271-1/+1
| | | | | | | | | | | | Task-number: QTBUG-82253 Change-Id: I59f074480ad17f02436539688b4c30b2df1af747 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Revert "Use QNetworkReply::networkError() instead of deprecated error()"Timur Pocheptsov2020-02-242-2/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit e263fec484d23fc2e652f538f39934b5364339e1. Naming in QProcess is considered to be the correct one. Change-Id: Ie417b5b0b83f2d5ba4ace1a07d5fd4d5b41233ff Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Doc: Remove \pagekeywords commandv5.15.0-beta1Topi Reinio2020-02-211-1/+0
| | | | | | | | | | | | | | The command does nothing, it was not implemented by QDoc. Change-Id: I3e8d34d633a28739065a61ca08032008506dd792 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Fix one more deprecation warning against QDateTime(QDate)Edward Welbourne2020-02-181-1/+1
| | | | | | | | | | Change-Id: Iea19b45306566179390f6292341c0b8fb2a94559 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix deprecation warningsFriedemann Kleint2020-02-147-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | querymainwindow.cpp:69:82: warning: ‘void QComboBox::currentIndexChanged(int)’ is deprecated: Use currentIndexChanged(int, const QString &) instead [-Wdeprecated-declarations] data/qabstractdatetime.cpp:148:30: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] data/qgday.cpp:78:71: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] data/qgyear.cpp:83:71: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] data/qgmonth.cpp:77:71: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] data/qgmonthday.cpp:80:76: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] data/qgyearmonth.cpp:85:76: warning: ‘QDateTime::QDateTime(const QDate&)’ is deprecated: Use QDate::startOfDay() [-Wdeprecated-declarations] qqmlxmllistmodel.cpp:748:71: warning: ‘QQmlListProperty<T>::QQmlListProperty(QObject*, QList<T*>&) [with T = QQuickXmlListModelRole]’ is deprecated: Use constructor taking QList pointer, and gain improved performance [-Wdeprecated-declarations] connect(ui_defaultQueries, QOverload<int>::of(&QComboBox::currentIndexChanged), Change-Id: Ia4ed432369d25269075d12d06fdbf2e286d5119b Reviewed-by: Vitaly Fanaskov <vitaly.fanaskov@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I12424435f2a4c4f2b582c7acad18e0c57dfbd554
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | | | | | Change-Id: Ie974007aa207364c2157bd7c90a6e79ef1718f9e
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-283-1/+41
|\ \ | |/ | | | | Change-Id: Ib8ba4718239d5b7690a20b50c6f49a055a0ea04f
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\ | | | | | | | | | Change-Id: I3890885d75527dcb516efff1f2636b8a73500828
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-091-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 089bdc0fcc1d87c6f5fe0835a4f723a6677e9a01 Catch invalid simple type that was causing a crash + 45ad1dc9c5f7330ea5d33cc8c8585d33b097e2e8 Enable auto tests run stand-alone + 7c8d1494dc06ff00508f512bdcf8153f21f348ff Add binary compatibility file for qtxmlpatterns 5.14 branch + b8c12ed8b1287462b897de76b7a9ad3ff5cc2194 Bump version Change-Id: Ia2156a2bcac6bc520162ef7e5d5fac2bd9acd028 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * | Doc: Fix regression caused by moving files around (leave no file behind)Paul Wicking2020-01-272-1/+21
| |/ | | | | | | | | | | | | | | | | | | | | 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>
* | Use QNetworkReply::networkError() instead of deprecated error()Timur Pocheptsov2020-01-152-2/+2
| | | | | | | | | | | | Task-number: QTBUG-80369 Change-Id: I6e71a6b888f292c283c85b6aeb3aa5804f032c91 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ieec8f7e562fc4c246a336402985cdb60f36b172f
| * Bump versionDaniel Smith2019-12-161-1/+1
| | | | | | | | Change-Id: I16747fabe937d18a437880acffa35bcd3e7e2a97
* | Bump Qt version to Qt 6Alexandru Croitor2019-12-201-6/+6
| | | | | | | | | | | | | | | | | | Also fix usage of text stream operators. Change-Id: I6c3ca0fe501f0565ecae5782a52cc70e1a4b6c04 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> (cherry picked from commit 2fc7a39180270c7551e99b918e827a93507e32a0) Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* | Stop using SAX classes for writing XML in testsSona Kurazyan2019-12-187-184/+54
| | | | | | | | | | | | | | | | | | | | | | Removed the dependency of XMLWriter from QXmlContentHandler and QXmlLexicalHandler which are about to be deprecated. There's no need in inheriting from these interfaces, the tests call the methods of XMLWriter directly via XMLWriter instance. Task-number: QTBUG-76177 Change-Id: I2fe237b962774a004a9014f3dab1b5de5072f180 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Stop using SAX classes for reading XML filesSona Kurazyan2019-12-1819-171/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtxmlpatterns' tests are using SAX classes for parsing XML files. These classes will be deprecated. Replaced QXmlSimpleReader by QDomDocument where applicable. For the test suite handlers inheriting from QXmlDefaultHandler, introduced the XmlParseHelper base class, which drives the parsing loop and allows overriding the methods for handling different XML tokens. Task-number: QTBUG-76177 Change-Id: Ia1a60c898a272906ede459e95ced7ec95d154fde Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Fix deprecation warnings about QHash::unite()Friedemann Kleint2019-12-183-3/+3
| | | | | | | | | | | | | | | | | | | | Use QHash::insert() instead, fixing: schema/qxsdparticlechecker.cpp:467:83: warning: ‘QHash<K, V>& QHash<K, V>::unite(const QHash<K, V>&) is deprecated schema/qxsdschemachecker.cpp:108:39: warning: ‘QHash<K, V>& QHash<K, V>::unite(const QHash<K, V>&) is deprecated schema/qxsdschemaresolver.cpp:267:39: warning: ‘QHash<K, V>& QHash<K, V>::unite(const QHash<K, V>&) is deprecated Change-Id: I5ac3ee4f9a8103a9ce1210d6c369597c6b0abddc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
View Lorry Controller Status