summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use QEXPECT_FAIL to get the test pass for Qt6HEADdevKarsten Heimrich2019-10-014-0/+6
* 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
| |\ |/ /
| * Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"5.15Alexandru 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-beta1v5.14.0-alpha15.14Karsten 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"5.13Qt 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"5.12Karsten 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.15' into dev"Qt Forward Merge Bot2019-09-173-7/+4
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-09-173-7/+4
| |\ \ \ \ \ |/ / / / / / | | _ / / / | | / / /
| * | | | 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
* | | | | Merge "Merge remote-tracking branch 'origin/5.14' into dev"Qt Forward Merge Bot2019-08-2920-411/+970
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge remote-tracking branch 'origin/5.14' into devQt Forward Merge Bot2019-08-2920-411/+970
| |\ \ \ \ |/ / / / / | | _ / / | | / /
| * | | 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
* | | Sync with changes from dev branchKarsten Heimrich2019-07-252-178/+195
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Alex Blasche2019-07-253-3/+7
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devAlex Blasche2019-07-253-3/+7
| |\ \ \ |/ / / / | | _ / | | /
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"v5.13.15.13.1Alex Blasche2019-07-252-3/+3
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Alex Blasche2019-07-252-3/+3
| | |\ \ | |/ / / | | | _
| | * Build fixKarsten Heimrich2019-07-242-3/+3
| * | 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
| | |\ \ | |/ / / | | | _