summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionHEADdev6.2.06.2Jani Heikkinen2021-05-241-1/+1
|
* Bump versionPaul Wicking2020-12-111-1/+1
|
* Compile fix, update qtbase dependency6.0.0Karsten Heimrich2020-11-093-4/+4
| | | | | Change-Id: Ic80537d02f8bf1ea19356dad5e4ea07992db7fa9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add changes file for Qt 5.15.1Antti Kokko2020-08-251-0/+20
| | | | | | | Change-Id: I2d0f9cb3054b3fe10d8c34a28cebf31189354abd Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit d6148a65aeff1cb2060f0e3e462541bb1ff5219b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Merge zip changes from latest qtbase devKarsten Heimrich2020-08-181-20/+19
| | | | | | Change-Id: I489291177832124a0b757ec3301b0367bf49cb78 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Fix build after QStringRef removalKarsten Heimrich2020-08-183-9/+11
| | | | | Change-Id: Ic38a711951f7f62386c68793bc545f854eb01368 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Qt6: Use QList instead of QVectorKarsten Heimrich2020-06-2677-265/+265
| | | | | | Task-number: QTBUG-84469 Change-Id: Id66666566358282eae6e3b9349fd86d03c960453 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Fix size_t warningsKarsten Heimrich2020-06-262-2/+2
| | | | | Change-Id: I84e154fe62f14a7df98c550a0a86ff69d3ba2034 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Replace QTextCodec with QStringDecoderKarsten Heimrich2020-06-261-6/+6
| | | | | | Task-number: QTBUG-75665 Change-Id: I2afdb3ec181f63775f77de70a5de8541f6a8a94f Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-06-121-0/+18
|\ | | | | | | Change-Id: I4f55e28b076b35f98e6ed55f632bf28f16dd29b2
| * Merge remote-tracking branch 'origin/5.15.0' into 5.15Qt Forward Merge Bot2020-05-141-0/+18
| |\ | | | | | | | | | Change-Id: Ib314efe52cafdaebbb7de5f2bfea139588414ffe
| | * 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: I2c4db38d019710d351dfdd0334662f1095649462
| | * Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
| | | | | | | | | | | | | | | Change-Id: I29f5c7209bcbd6873591588e7c5f0dbe868a1059 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Qt6: Port QtKnx to QStringViewKarsten Heimrich2020-06-1012-54/+54
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-84319 Change-Id: I1f09e79d67b03f8e340b0e6cef84a1d7f5bc8613 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* | | Add missing dependencies.yaml fileKarsten Heimrich2020-06-101-0/+4
| | | | | | | | | | | | | | | Change-Id: I14cdf91763d8d5c7e4883864a14b6babab88f740 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Qt6: Fix build with latest dev branchKarsten Heimrich2020-06-1014-26/+17
| | | | | | | | | | | | | | | Change-Id: Ic214e72b2c7b915dcc4c69af36c34044fb103e87 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-256-42/+91
|\| | | | | | | | | | | Change-Id: I7325d45ee50247f4df317748811070f982d25392
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ \ | | |/ | |/| | | | Change-Id: Ic4f75cd7311a6eab8d6371e7227ecfd7e2890df1
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: I2710c05dceeae3e2022c918d0c0a8cd3033c1376
| | | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-171-0/+20
| | |/ | | | | | | | | | | | | Change-Id: I15ddf832d8d33517b94a05d36e1d7ac50870b80a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Qt Forward Merge Bot2020-02-294-42/+51
| |\| | | | | | | | | | Change-Id: I1b2651e6bc510f2b42c1666c7b254dd24e9dfece
| | * Namespace SSL symbols to prevent static linker errorsKarsten Heimrich2020-02-264-42/+51
| | | | | | | | | | | | | | | | | | Change-Id: I8c04a56eca9fc6e75894f37676cc9517c2e89441 Fixes: QTBUG-82352 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I32b1793dc57654853d458fe42e92c4c74761ccd3
| | * Bump versionAlexandru Croitor2020-02-021-1/+1
| | |
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
| |\| | | | | | | | | | Change-Id: Ic21b7f1a60d2527650ac7359bbd20acbe47628c3
| | * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Id628aaff3556c291f39a4eadb815958393feee3b
| | | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-131-0/+20
| | |/ | | | | | | | | | | | | Change-Id: I5cd41c3da96c6361a87750845e38d37d833ee62c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Qt6 compile fixKarsten Heimrich2020-04-2125-27/+33
| | | | | | | | | | | | | | | Change-Id: Iad6a4fa302ca7c79abd030866876b6df3b818652 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-310-0/+0
|\| | | | | | | | | | | Change-Id: I7375c8438b2d91399aae12316c3b8d3f89f53b16
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
| |\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I223f69d86405299707b01205e95a217075d911f7
| | * Bump versionDaniel Smith2019-12-161-1/+1
| | |
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-12-171-0/+18
|\| | | | | | | | | | | Change-Id: Ibcc9b736d6756b9db22f0040478ee3c608c018d5
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
| |\| | | | | | | | | | Change-Id: I39518f86ac4280c94dc2e4502274877889f6d821
| | * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| | |\ | | | | | | | | | | | | Change-Id: I6b8022b3ce775358139c2fdf55ba459f17206285
| | | * Add changes file for Qt 5.14.0v5.14.05.14.0Antti Kokko2019-12-041-0/+18
| | |/ | | | | | | | | | | | | Change-Id: If79621ed6a004ea8807ecf5e857b904f40ec1ab8 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-120-0/+0
|\| | | | | | | | | | | Change-Id: Iabf07bb405417b6ac319b44b85d6ea717161a59d
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-090-0/+0
| |\| | | | | | | | | | Change-Id: Ife6c059439b3ff6cd0f717a1c7f163275b1a1e17
| | * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-rc2v5.14.0-rc1v5.14.0-beta3Qt Forward Merge Bot2019-11-050-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4e1bab09bb84a15cb0cabed58b073ecd9eba0bcb
| | | * Bump versionv5.13.25.13.25.13Frederik Gladhorn2019-10-141-1/+1
| | | |
* | | | Use QEXPECT_FAIL to get the test pass for Qt6Karsten Heimrich2019-10-014-0/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic41610c43605ca25f9ae53653d9ba169165116b8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.15' into dev"Alexandru Croitor2019-09-1823-198/+89
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.15' into devAlexandru Croitor2019-09-1823-198/+89
|/| | | | | |/ / / | | | | | | | | Change-Id: Id03c87be8d4bfdd4277482f926fcf5078a73ae19
| * | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Alexandru Croitor2019-09-1823-198/+89
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.14' into 5.15Alexandru Croitor2019-09-1823-198/+89
| |/| | | | | |/ / | | | | | | | | Change-Id: Iee1b996790a63bd78cbc8297970ab1e822120779
| | * | Fix compile issuesv5.14.0-beta2v5.14.0-beta1v5.14.0-alpha1Karsten Heimrich2019-09-189-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * missing namespace * use right constructor Change-Id: I8e76cf4250af5519c9c4888db34ddfd6471ffec4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Lucie Gerard <lucie.gerard@qt.io>
| | * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-1715-188/+75
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-1715-188/+75
| | |/| | | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/knx/core/qknxbytearray.h Change-Id: Ieb8bfa6f4adc4f566ae80874df522ab555c4d943
| | | * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-0815-187/+73
| | | |\
| | | | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-0815-187/+73
| | | |/| | | | | | | | | | | | | | | | Change-Id: I26ffad9bd368c9f16b9c6850cfc739bd35ec1141
| | | | * Revert "Fix compile error after we added SLES_12"Karsten Heimrich2019-08-286-119/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 29d53975d559c9d2acce78167bacbe384e2d825a. A parent commit introduced a compilation fix that makes this patchset superfluous. Enables the SLES12 target. Change-Id: Ie66b6400956f5a918b031d9007f6df276c331750 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 16:25:49 +0000