summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-241-4/+4
|\
| * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-241-4/+4
|/| | | | | | | Change-Id: I6a15cb588b39ea63856b24fb6d4870b3ea4ace41
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-201-4/+4
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-201-4/+4
| |/| | | | | | | | | | Change-Id: I58544f3833ea4a0d08408795dfd4f146db70377d
| | * Fix shadow buildSamuli Piippo2019-08-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Don't write to source directory when using shadow build. This stops working with Qt 5.14.0. Change-Id: Ica83b9c810e2a937aab75af131484f5f91570453 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | Eradicate the last Q_FOREACHs and mark the module cleanMarc Mutz2019-07-182-8/+10
| | | | | | | | | | | | | | | | | | | | | ... of Q_FOREACH, Java-style iterators, and QLinkedList use. Change-Id: Iec6c576e8c7aba81594e3d3e6c4d1e1cc487fbdf Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-161-0/+1
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-161-0/+1
|/| | | | |/ / | | | | | | Change-Id: Ib0e7bdb66fc3e8d0cf5eeca900e93703c76f1cae
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I72c1322203a9f5bbeba52098ba412d210ed8eb59
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ie78264de8c4b2ff1b455cb0290f8bbd9b7c7f724
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-091-0/+1
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: Iddf20afd4fe0289079afc91fe43c14fd7ebbb5ab Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Fix compilation with explicit QChar(*int*) ctorsMarc Mutz2019-07-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QChar ctors from integral non-char types are under consideration for adding explicit. Fix users of these ctors ahead of the change. Change-Id: I3f3480336ba30a368034bb15b67ada854115e374 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@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: Ifdabe76e9d0643c188fbf0d664f0a6d36f15011f
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I0b247408f83afb75b9f04a6ff4c784ce73268aa8
* | | 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 19:15:08 +0000