summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Namespace SSL symbols to prevent static linker errorsKarsten Heimrich2020-02-264-42/+51
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta1v5.15.0-alpha1Qt Forward Merge Bot2020-02-050-0/+0
|\|
| * Bump versionAlexandru Croitor2020-02-021-1/+1
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-281-0/+20
|\|
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-271-0/+20
| |\
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-131-0/+20
| |/
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-300-0/+0
|\|
| * Bump versionDaniel Smith2019-12-161-1/+1
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+18
|\|
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+18
| |\
| | * Add changes file for Qt 5.14.0v5.14.05.14.0Antti Kokko2019-12-041-0/+18
| |/
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-090-0/+0
|\|
| * 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
| |\
| | * 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
|/| | | | |/ /
| * | Fix compile issuesv5.14.0-beta2v5.14.0-beta1v5.14.0-alpha1Karsten Heimrich2019-09-189-10/+14
| * | 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
| |/| | | | |/
| | * 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
| | |/|
| | | * Revert "Fix compile error after we added SLES_12"Karsten Heimrich2019-08-286-119/+0
| | | * Revert "Fix gcc version check"Karsten Heimrich2019-08-281-2/+5
| | | * SLES12 compiler warning fixesAndrew O'Doherty2019-08-289-71/+73
* | | | 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
|/| | | | | |/ / /
| * | | Replace the deprecated setLinkLayerFrame() -> setCemi()Sona Kurazyan2019-09-032-2/+2
| * | | 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
| |/| | | | | |/ /
| | * | 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
| | |/| | | | | |/
| | | * Fix gcc version checkv5.12.55.12.5Karsten Heimrich2019-08-201-5/+2
| * | | Fix crash with index out of boundsKarsten Heimrich2019-08-283-6/+15
| * | | 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
| * | | | Implement device discovery on all available interfacesKarsten Heimrich2019-08-217-68/+479
| * | | | Minor reformating, no functional changeKarsten Heimrich2019-08-205-12/+11
| * | | | Refactor private implementation into their own source filesKarsten Heimrich2019-08-205-354/+415
| * | | | Introduce method to fetch interface from a discovery resultKarsten Heimrich2019-08-205-10/+46
| * | | | Fix crash accessing the device model with negative indexKarsten Heimrich2019-08-203-9/+27
| * | | | Fix sending multicast packages if local address was specifiedKarsten Heimrich2019-08-201-0/+3
| * | | | Fix setting socket options, works properly only in bound stateKarsten Heimrich2019-08-201-1/+1
| * | | | Add parent in QObject::connect callKarsten Heimrich2019-08-201-4/+4
* | | | | Bump versionKari Oikarinen2019-08-271-1/+1
| |/ / / |/| | |
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-246-0/+119
|\ \ \ \ | |/ / / |/| | |
| * | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-246-0/+119
|/| | | | |/ /
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-08-206-0/+119
| |\ \
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-206-0/+119
| |/| | | | |/
| | * Fix compile error after we added SLES_12Karsten Heimrich2019-08-196-0/+119