summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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>
* | / Add changes file for Qt 5.15.0Antti Kokko2020-04-221-0/+18
|/ / | | | | | | | | Change-Id: I29f5c7209bcbd6873591588e7c5f0dbe868a1059 Reviewed-by: Karsten Heimrich <karsten.heimrich@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>
* | 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.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.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
| | |
* | | 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>
| | | * Revert "Fix gcc version check"Karsten Heimrich2019-08-281-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ee2f01020005b1baa63de918be1dc75ae581f7b1. A parent commit introduced a compilation fix that makes this patchset superfluous. Enables the SLES12 target. Change-Id: I8028104cf5fafb23bf3dea3c551659f807d65044 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | | * SLES12 compiler warning fixesAndrew O'Doherty2019-08-289-71/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed some compilation issues: 1. error: declaration of ... shadows a member of 'this' Function parameters named equally as member functions. 2. warning: missing initializer for member Change-Id: Ibe55c244cdf224f0ab6e62db0e2fde98b80ac0da Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-0523-418/+974
|\ \ \ \
| * | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-0523-418/+974
|/| | | | | |/ / / | | | | | | | | Change-Id: I573251c84151c29558c1edbbb8c394661f577b63
| * | | Replace the deprecated setLinkLayerFrame() -> setCemi()Sona Kurazyan2019-09-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: I8f5fa1fa5dfd162ae1be126b2356c1c3ee129b44 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-031-5/+2
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-031-5/+2
| |/| | | | | |/ / | | | | | | | | Change-Id: I7c4fc83b843f16c3d4044aef8180f54e75d9420d
| | * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-281-5/+2
| | |\ \
| | | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-281-5/+2
| | |/| | | | | |/ | | | | | | | | Change-Id: Ibf38b44cce020fb3b891c182e0246b43f58d20ff
| | | * Fix gcc version checkv5.12.55.12.5Karsten Heimrich2019-08-201-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The former commit disabled also some supported platforms running clang, this commit should fix the version check. Change-Id: I9fd61a322895ca867a4483b5f7aa2763637d972b Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | Fix crash with index out of boundsKarsten Heimrich2019-08-283-6/+15
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibd7c4b6eef6ca08ad5ad51aa9a16aa6bf4a85288 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | | Merge dev into 5.14Kari Oikarinen2019-08-276-0/+119
| |\ \ \
| * | | | Fix fetching the host address used to discover KNXnet/Ip devicesKarsten Heimrich2019-08-215-13/+35
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4b54757023346817a18782346303b6801d0e2c8d Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | | Implement device discovery on all available interfacesKarsten Heimrich2019-08-217-68/+479
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifbe8ea3611d08e63751ee714c6cf40044ff37e1b Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | | Minor reformating, no functional changeKarsten Heimrich2019-08-205-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I17c16c1e57fa4fbd71f0dc064515bc447b394d67 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | | Refactor private implementation into their own source filesKarsten Heimrich2019-08-205-354/+415
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I688dbe79d48991da25da7d9b4c3c7e3f4135c9d6 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | | Introduce method to fetch interface from a discovery resultKarsten Heimrich2019-08-205-10/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iade4ea527e1bc2e47c2211b5b887431661284a12 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | | Fix crash accessing the device model with negative indexKarsten Heimrich2019-08-203-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifb1a5fee3e9f2f629f16902bd5fd3b6051c3c4f8 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | | Fix sending multicast packages if local address was specifiedKarsten Heimrich2019-08-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib2175964b00500bb579263af1863a1c72c5be1b9 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | | Fix setting socket options, works properly only in bound stateKarsten Heimrich2019-08-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I549dcfab173b66e8aace012f4b87bb41897ccc5d Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| * | | | Add parent in QObject::connect callKarsten Heimrich2019-08-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6253a45625ca27ed89c648e585714dc147f50467 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | | | | Bump versionKari Oikarinen2019-08-271-1/+1
| |/ / / |/| | | | | | | | | | | Change-Id: Id2e5eb1e6f05a5adc80105339f95e192196f737b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 02:48:04 +0000