summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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: I638b5166296b4034310c75f5bc08245def618884
| * 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: I4c54e2034e810a8a33107544e00f8b5669c8a86d
| | * 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: I593f373f8504eec3a8d7119d5bc8329d90570728
| | | * Merge "Add changes file for Qt 5.12.4"v5.12.4Antti Kokko2019-05-281-0/+20
| | | |\
| | | | * Add changes file for Qt 5.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib05d3e9f6edc753676f4602392a7a84e202fb0d3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | | * | Merge 5.12 into 5.12.4Frederik Gladhorn2019-05-271-2/+2
| | | |\ \ | | | |/ / | | |/| / | | | |/ Change-Id: I84be737c8ab49128e8de26a97ffafd653c542108
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: I2f753d67eca332db468f5e957a043fb64fdeef26
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-224-10/+25
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-224-10/+25
|/| | | | | |/ / / | | | | | | | | Change-Id: Iee84aeee7be18e557c1eafe8aef0a03a5fb9f8ab
| * | | qscxmlc: Don't compress the templatesThiago Macieira2019-06-202-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those files are small, so we may as well not bother. Fixes: QTBUG-76521 Change-Id: Ief874765cd7b43798de3fffd15a9f511bc9c723a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-202-1/+19
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-202-1/+19
| |/| | | | | | | | | | | | | | | | | | Change-Id: Ide847e86590039af3cc25211ff316bd14d57653f
| | * | | Increase timeout for send-data/send1 testv5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.0Ulf Hermann2019-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: QTBUG-75684 Change-Id: I3b379c8f9ee9e17614e663d8842ae4329109c4a4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | | Add changes file for Qt 5.13.0Antti Kokko2019-05-131-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icd80ce9e1bdcca3c7a31fc5c1ccd56498e10ae82 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-031-2/+2
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-031-2/+2
|/| | | | | | |/ / / / | | | | | | | | | | Change-Id: I26b42db1fde32e787929f7c2bd95791d791d41ee
| * | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-021-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-021-2/+2
| |/| | | | | |/ / | | | | | | | | Change-Id: I0d9f4c33a54c19d3f7707ae515eea90779219491
| | * / Fix warnings about fall throughFriedemann Kleint2019-05-271-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | Use Q_FALLTHROUGH, fixing: ../../src/scxml/qscxmlcompiler.cpp:1591:9: warning: this statement may fall through [-Wimplicit-fallthrough=] ../../src/scxml/qscxmlcompiler.cpp:1610:9: warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: I39fb346f1c5fa3e328ee82aa14675557034439c9 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Optimize connectToState() methodJarek Kobus2019-05-292-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Introduce a cache of state name to signal index and use it in connectToStateImpl. Change-Id: I75af2b77b12d6e087163612f3ba10590a14fd9e2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Fix deprecation warning about QVector<T>::fromStdVector()Friedemann Kleint2019-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warning: scxmlstatemachineinfo.cpp:246:30: warning: 'static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]' is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] amending c17eb247ddf22280f19975eec4d3a13335d43ba7. Change-Id: I340f1969a62f25dba1b8cd67f62c7403d48b5383 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Fix deprecation warnings about QVector<T>::fromStdVector()Friedemann Kleint2019-05-271-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings: qscxmlstatemachine.cpp:1098:59: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1098:91: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1129:64: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1130:46: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1193:59: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachine.cpp:1193:85: warning: ‘static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]’ is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachineinfo.cpp:246:30: warning: 'static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]' is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] qscxmlstatemachineinfo.cpp:246:92: warning: 'static QVector<T> QVector<T>::fromStdVector(const std::vector<T>&) [with T = int]' is deprecated: Use QVector<T>(vector.begin(), vector.end()) instead. [-Wdeprecated-declarations] Change-Id: Ib7469b6b0f92de06779419629ba8170c6d96c04c Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-05-021-2/+2
|\| | | | | | | | | | | Change-Id: I98f5c2716b6bfd21b6719867862caa2d0f186d2e
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-301-2/+2
| |\| | | | | | | | | | Change-Id: I01a6583514a3483ea2706dfd9d70a3c15999969e
| | * Fix module dependencies of scxmlKai Koehne2019-04-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 67d9d69b97 made qml a conditional dependency of a qtscxml module. Anyhow, because qt_module.prf was included before the qml dependency was added, the generated qt_libs_scxml.pri file didn't track this dependency. This lead to issues when examples were built against a Qt where libQt5Scxml was not yet installed, and therefore libQt5Qml and libQt5Network wasn't found. Fixes: QTBUG-75383 Change-Id: Ieba5972a1509400aa145fc29b11fbba4c1d625fd Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-231-0/+20
|\| | | | | | | | | | | Change-Id: Ia0d46206e527b220b37eeebc7545290af04216fa
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+20
| |\| | | | | | | | | | Change-Id: If77dba971c4fd8b19e12e054f2a4e6449186025a
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Ib36c5d5cd62f3e013005cef2155e95500a0c683c
| | | * Add changes file for Qt 5.12.3v5.12.3Antti Kokko2019-04-021-0/+20
| | |/ | | | | | | | | | | | | | | | | | | + 554ac4551c154f39de2917877b189b74e4464d3b Bump version Change-Id: I4fb60f61daaa98b6f0c39ec73d582fc79bd8017f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-135-19/+25
|\| | | | | | | | | | | Change-Id: I76b32ad6f263b4a45c0f7c9b40a121528dd3bc14
| * | Update plugins.qmltypesv5.13.0-beta3Kai Koehne2019-04-121-12/+13
| | | | | | | | | | | | | | | Change-Id: I0ad674b4855ebf0152a2c13a354fc06a14c11b46 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Automatically register the latest import versionKai Koehne2019-04-125-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows what was done in d28c9f6a for Qt Quick Controls 2. The latest import version (e.g. 1.14 in Qt 5.14) will automatically be registered whenever the Qt version is bumped. This avoids needing to wait until a new type is added (or a new revision is added to an existing type) before being able to use the newest Qt Quick version. Change-Id: Ibe271d4814032fe758545abd31573220ed84b5f8 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-300-0/+0
|\| | | | | | | | | | | Change-Id: I492817d49a71563ca0ba53999115ebbd7b36e4bb
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta2Qt Forward Merge Bot2019-03-270-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I09029f460af99bd0d95ddc33006ea75d4006ef19
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: I5860cb28eca9c415245117833b4ed4a715aa1258
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-191-0/+20
|\| | | | | | | | | | | Change-Id: I6a930934668bbe6e59b2459db8ac6a9d82663e9c
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-161-0/+20
| |\| | | | | | | | | | Change-Id: I10d269b8f9078aefbec2d480ba2754f8c3d284ae
| | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+20
| | |\ | | | | | | | | | | | | Change-Id: If529d2d73b8819003632175de9c6d1330dc910a5
| | | * Add changes file for Qt 5.12.2v5.12.2Antti Kokko2019-02-221-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | + f167b3cdb61a0bd51360d9736f23e99e5ae0c860 Bump version + dca1cd7cfb03ba383012dbfcf7b40924ac887bf8 examples: depends on Quick instead of Qml Change-Id: I060bc2fc8c3903d360ee2d802e8166b79a6dd22f Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Bump versionKari Oikarinen2019-02-251-1/+1
| | | | | | | | | | | | Change-Id: I7bb520fd5fc6bcd3ef52e0fe888913818c07864c
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-191-1/+1
|\| | | | | | | | | | | Change-Id: Ib07c3c2281c25cf27755211691e9a7ae4db28e95
| * | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-02-161-1/+1
| |\| | | | | | | | | | Change-Id: I6ce0f760da8c52e05c4e4eb07b90faef1ccdc500
| | * examples: depends on Quick instead of QmlLiang Qi2019-02-131-1/+1
| | | | | | | | | | | | | | | Change-Id: I5c824bb2e91b3e7d3a2bb70feb1d8419827482c9 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-02-121-0/+25
|\| | | | | | | | | | | Change-Id: Idc7134e793db2fe52107fedb2be7d880d2c1c741
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-021-0/+25
| |\| | | | | | | | | | Change-Id: I0089485b4db9e61238fb0cc1bfd2fbe918d63ec2
| | * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+25
| | |\ | | | | | | | | | | | | Change-Id: Idf76edb33f833d1f859cf161cb6ca972115180c2
| | | * Add changes file for Qt 5.12.1v5.12.1Antti Kokko2019-01-101-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + a5effbcb0372020f5ce3134a4f38eb865fd6cdd6 Bump version + bde8d341cc095a3877e4ecc80b02c267bb651d4b Don't suppress <log> tags with missing or bad expr + b99d699a8e1fe1a2968edafa6f0154a2581c2143 Add changes file for Qt 5.11.3 + 2dfb1d046d4a1dcb046bfb287d240a8869c78baa Bump version Change-Id: If1e51901c003d7a9d4d5b5a38b86ddcdce95d122 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 18:14:21 +0000