summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionv5.13.25.13.25.13Frederik Gladhorn2019-10-141-1/+1
|
* 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.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>
* | 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
|/| | | |/ | | | | Change-Id: Ic1afa77f59f6bd2c906f71d2f660d0fc3bd3a91d
| * Fix compile error after we added SLES_12Karsten Heimrich2019-08-196-0/+119
| | | | | | | | | | | | Task-number: QTBUG-77666 Change-Id: I263e98558ece3fb9fbafeba515b80b51169a03b3 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | 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
|/| | | |/ | | | | Change-Id: I121776dd854786b67aae85689de526a80f3c9e37
| * Build fixKarsten Heimrich2019-07-242-3/+3
| | | | | | | | | | | | | | * fix wrong path delimiter Change-Id: I99a15238a7ef0bc190375e410dc4da3a62ee34bc Reviewed-by: Karsten Heimrich <karsten.heimrich@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: I62525b8514d9b1a085006d71946b07e7dbf718f6
| * Bump versionFrederik Gladhorn2019-07-011-1/+1
| |
* | Bump versionFrederik Gladhorn2019-07-011-1/+1
| |
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-281-0/+4
|\ \
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-271-0/+4
|/| | | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I76e5aaf1e66094967c9c32b4cc1512a3934e3c0a
| * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+5
| |\
| | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+5
| |/| | | | | | | | | | Change-Id: If26222ac0c8122825468a5b7cf71ce95579fbad2
| | * Add a DEFINEFUNC8 declaration for the QT_LINKED_OPENSSL case5.12.4Andy Shaw2019-06-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This Fixes a build issue when you build Qt statically and it uses OpenSSL linked in, DEFINEFUNC8 is needed for one of the symbols but it is not declared in this case, it's only declared for the dynamic case. Change-Id: I9d4f80679a0199653030d27657ebaf7f1f44d67b Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| | * Bump versionv5.12.4Frederik Gladhorn2019-05-231-1/+1
| |/
* | Remove deprecated QLatin1LiteralKarsten Heimrich2019-06-143-3/+3
| | | | | | | | | | Change-Id: I337ba4765007dd70d3b526c7bd9909b1e18fe57a Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Make sure we properly shutdown a secure sessionKarsten Heimrich2019-05-071-1/+27
| | | | | | | | | | Change-Id: I7525139c1a589cb1feed3102ef7ed2709da587ac Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Fix using wrong index into secure configuration listKarsten Heimrich2019-05-073-4/+3
| | | | | | | | | | | | Change-Id: Ifa36b43d62272faa83286d4de11f231536a109d8 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Set the serial number (MAC address) for the interface in useKarsten Heimrich2019-05-203-15/+27
| | | | | | | | | | | | Change-Id: I653db24390cc6278c8d09570eb1c729d54d23afa Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Fix missing discoverer update on network interface changeKarsten Heimrich2019-05-093-0/+24
| | | | | | | | | | Change-Id: I13c4033468dd2947111f150775f5208e1c0e53e7 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Fix typoKarsten Heimrich2019-06-053-11/+11
| | | | | | | | | | Change-Id: I06afbe1ba090becfad7620e5bd8deaac35c9f030 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Introduce tunneling feature example and documentationv5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Karsten Heimrich2019-05-0416-7/+1741
| | | | | | | | | | Change-Id: I8d082546f4fb62b3a7a3bc6622df7e24d9459d86 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Introduce local device management examplev5.13.0-beta3Karsten Heimrich2019-04-1711-7/+1344
| | | | | | | | | | | | Change-Id: I472d40f5941d4c90c07ffcc8ab61b85665c0d932 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Doc: Fix doc configurationLeena Miettinen2019-04-171-1/+2
| | | | | | | | | | | | | | | | | | Add navigation homepage to create a link to the Qt for Automation docs. Add dependencies to qtgui and qtwidgets to create links to classes in those modules used in the Qt KNX examples. Change-Id: I0e062db08781f6e999f318cbcb542c40d6b35e1d Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Doc: Fix example code generationKarsten Heimrich2019-04-171-19/+8
| | | | | | | | | | Change-Id: If8b397308a8607368fcd3bdff782ab9fecc4071b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Document the newly introduced group communication exampleKarsten Heimrich2019-04-152-0/+158
| | | | | | | | | | | | Change-Id: I03351a725cee9db6ca33b4ed692f5695ba882421 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Introduce new example mainly targeting KNX group communicationKarsten Heimrich2019-04-1510-1/+1224
| | | | | | | | | | Change-Id: Ic50c0ff4fcf6cd25faa86ba9353b6b9b4059ee3e Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Fix missing DPT type registrationKarsten Heimrich2019-04-151-0/+1
| | | | | | | | | | Change-Id: I820ec535dc187b03935906700eb8cb47c7417482 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Fix bug that prevents continuous discovery (wrong timer started)Karsten Heimrich2019-04-151-1/+1
| | | | | | | | | | Change-Id: I0f75230ad7173afca6d1cbe672264adfae79bd59 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Minor optimizationKarsten Heimrich2019-04-151-1/+1
| | | | | | | | | | | | | | | | Do not fetch the values out of a server info HPAI just to recreate it in the next function based on the given values. Change-Id: Ia4e3e0258d2b9b14a00462c2d00f4fcd16201b10 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Introduce functionality to inform about description response timeoutsKarsten Heimrich2019-04-153-0/+12
| | | | | | | | | | Change-Id: I9c67c8d26de1ee84db432f69c782bc22126d8f8a Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Fix crash after the connection was immediately droppedKarsten Heimrich2019-04-151-2/+5
| | | | | | | | | | | | | | | | | | If the connection was dropped immediately after write datagram due to an error, the timers and socket would be cleared and we where accessing a null pointer. Change-Id: I75c7aec9a7caed8edafb95d50465e3527a32dad6 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Fix reverse default valuesKarsten Heimrich2019-04-152-1/+13
| | | | | | | | | | Change-Id: I17e7e8ea519d4f4eaa45c03a8875f4f90ce090cd Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Doc: Fix typo in link targetKarsten Heimrich2019-04-121-1/+1
| | | | | | | | | | Change-Id: Ib09834bbe67584a904362ba41430580ef9f4671c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Fix documentation, seems to be a copy & paste errorKarsten Heimrich2019-04-121-16/+19
| | | | | | | | | | Change-Id: Id6ff49d28be9c9d97eabc7e3e448953a499e2509 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Fix warning SSL warning if OpenSSL was not loadedv5.13.0-beta2Karsten Heimrich2019-04-051-1/+2
| | | | | | | | | | | | | | | | Fixes the following superfluous warning: qt.network.ssl: QSslSocket: cannot call unresolved function EVP_PKEY_free Change-Id: I86d2b36f28778d39bf4dd85dbec1ab09100bbb3f Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-010-0/+0
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I044ad2f468cc1e85a37811f39dacdef78db3224f
| * Bump versionv5.12.35.12.3Kari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: I2c722f03bcbd7ac21f4a1f70a0afe114ddd5c1c8
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-1/+1
| |\ | | | | | | | | | Change-Id: Ic04bd8b6abf8eda1042f1682b3979e18ec120c51
| | * Bump version from 5.12.1 to 5.12.2v5.12.25.12.2Jani Heikkinen2019-03-011-1/+1
| |/ | | | | | | | | Change-Id: Ice88ba2d11710b445c606c80e54aecb8277b4719 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-05 20:39:29 +0000