summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.13.2v5.13.25.13Antti Kokko2019-10-141-0/+20
| | | | | | | | + 9bba89da77b73f016f22bc5d3f195d9c0212c7bc Fix shadow build + a1be55be7596f04e57a2f8f9d45bbf304e98ed9a Add changes file for Qt 5.12.5 Change-Id: Ic83dbf3b97ddad043853aa809d4c0f90123fe0f1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | Change-Id: Ie19713b42177c36c817be728228c8dd380c98557
* Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
|\
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
|/| | | | | | | Change-Id: Ic9f0c3c1b882f1fb35df057ad83e31997669b933
| * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| |/| | | | | | | | | | Change-Id: Iffee408270a4f433041c73ce34c2d0a9b8a6c7d2
| | * Merge "Add changes file for Qt 5.12.5"v5.12.5Antti Kokko2019-08-231-0/+20
| |/|
| | * Add changes file for Qt 5.12.5Antti Kokko2019-08-231-0/+20
| | | | | | | | | | | | | | | | | | | | | + db44c53e73479ee8ea98f911078b387735906f38 Bump version Change-Id: Ia6fca6da6bf2dcd0bdd7d18899e3b84a3e3fe07d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
|/| | | | | | | | | | | | | | | Change-Id: I5d6b7b8cbde8053c07cf874a194e5f32fba47b4a
| * | | Add changes file for Qt 5.13.1v5.13.1Antti Kokko2019-08-131-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 4836860343de35124ecf98008ffd548419918ee7 Bump version + 6ac734ef6e940a2d601b9d26195132d0973dc902 Add changes file for Qt 5.12.4 + a368b5fdf4d33361e03a2f05b6f159566dd06e9d Fix warnings about fall through + 8be5e49379fa8c0f1e1e41ff4bce91e30699b352 qscxmlc: Don't compress the templates + d3ed5bcb3e1a4175d31333db71dbd52443b727c9 Bump version + db44c53e73479ee8ea98f911078b387735906f38 Bump version + fa25eb34fba4db8333d16ba7fc125860e3d0712a Doc: Replace example file lists with links to code.qt.io Change-Id: Ia4d35ddf3e896e01ce6f02e6cb5af1aebe3843ef Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | | | 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>
* | 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>
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | Change-Id: I0b247408f83afb75b9f04a6ff4c784ce73268aa8
* | 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
* | | 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.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>
* | 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.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>
* | 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.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.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>
* | 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.12' into 5.13Qt Forward Merge Bot2019-02-021-0/+25
|\| | | | | | | Change-Id: I0089485b4db9e61238fb0cc1bfd2fbe918d63ec2
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 11:38:11 +0000