summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bump version to 5.12.12 5.12.125.12Jani Heikkinen2021-10-041-1/+1
|
* Bump version5.12.11Jani Heikkinen2020-11-061-1/+1
|
* Add changes file for Qt 5.12.10Antti Kokko2020-10-161-0/+28
| | | | | | | Change-Id: I4c94a56c5cd3c0d76014f5d8d34c0a0b5f41dfac Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 1e3510bf14942bd1b1134a52700e0ca06cbbf5d8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionJani Heikkinen2020-10-141-1/+1
|
* Merge remote-tracking branch 'origin/5.12.9' into 5.12Qt Forward Merge Bot2020-06-171-0/+20
|\ | | | | | | Change-Id: I25508c9d765e81953554cfc4a4b607db1a87291a
| * Add changes file for Qt 5.12.9v5.12.95.12.9Antti Kokko2020-06-041-0/+20
|/ | | | | Change-Id: Idd38c547ce1d017bea5da7de6a6445545965e3ed Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionAlexandru Croitor2020-04-221-1/+1
|
* Merge remote-tracking branch 'origin/5.12.8' into 5.12Qt Forward Merge Bot2020-04-141-0/+20
|\ | | | | | | Change-Id: Id26ba9b71d37953550f997910a47ff49f93c3ffe
| * Add changes file for Qt 5.12.8v5.12.85.12.8Antti Kokko2020-03-171-0/+20
|/ | | | | Change-Id: Ibe5262e6bc3a98696f10fe90b5388ffe53f153cf Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/5.12.7' into 5.12Qt Forward Merge Bot2020-01-311-0/+20
|\ | | | | | | Change-Id: I30029e21fa87e59663f6b288f1a46596bde8ca72
| * Add changes file for Qt 5.12.7v5.12.75.12.7Antti Kokko2020-01-181-0/+20
| | | | | | | | | | Change-Id: I4e55dcb075422ca226e0ac3ed0c14ac9ea48ede9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Bump versionAlexandru Croitor2020-01-281-1/+1
|/
* Bump versionFrederik Gladhorn2019-11-071-1/+1
|
* Bump versionv5.12.65.12.6Frederik Gladhorn2019-10-301-1/+1
|
* 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>
* 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 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>
* Build fixKarsten Heimrich2019-07-242-3/+3
| | | | | | | * fix wrong path delimiter Change-Id: I99a15238a7ef0bc190375e410dc4da3a62ee34bc Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* Bump versionFrederik Gladhorn2019-07-011-1/+1
|
* 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
|/
* 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>
* Exclude webassemblyv5.12.1Karsten Heimrich2019-01-281-0/+1
| | | | | Change-Id: I1d378059dbfb6eabaca3f2c4e040361672a1844b Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix compile issue with VS2017 (Part 2)Karsten Heimrich2019-01-151-0/+8
| | | | | Change-Id: I3b27eab8d3ddf7fcafb0cc0b8718ae7e0921726d Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix compile issue with VS2017 (Part 1)Karsten Heimrich2019-01-151-2/+8
| | | | | Change-Id: Ib3caa48b74c2e18817b774e700afe9571e0476c3 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Bump version from 5.12.0 to 5.12.1Jani Heikkinen2019-01-091-1/+1
| | | | | Change-Id: Ic73d5e94ee3c087f153101a73aef28aee9571fdf Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix some minor warnings spotted by clangKarsten Heimrich2018-12-113-15/+9
| | | | | Change-Id: Idd2d3aa9b202957e03917923784c2348ed371c0b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix some minor warningsKarsten Heimrich2018-12-103-25/+26
| | | | | | | | | | * move variable into sub scope * avoid using a expression repeatedly * global variable shadows local variable * testing against null is superfluous without std::nothrow Change-Id: I86a3388fa46b8847a7604d8362dd08784b5f1e9f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* Fix broken implementation of KNX SRP block structuresKarsten Heimrich2018-12-102-50/+107
| | | | | | | | | * adapt auto test * fix wrong size values * fix wrong header types Change-Id: I669a39e051365ae4a719b2ede30fae595797830d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Deprecate enum value with typo, add some minor documentationKarsten Heimrich2018-12-102-3/+8
| | | | | | Change-Id: I84029901352a490b1976338c0ce16c2236273fa9 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-rc2v5.12.0-rc1v5.12.0Qt Forward Merge Bot2018-11-160-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I3e2e55394e7383379165812559e20951991d8c8f
| * Bump version number from 5.11.2 to 5.11.3v5.11.35.11Jani Heikkinen2018-11-161-1/+1
| | | | | | | | | | Change-Id: I8160edb88e5dd513cd425aa9c9fecb32577e26df Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Fix CMake unit testsv5.12.0-beta4Andrew O'Doherty2018-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | Before failed with: ../qtknx/tests/auto/cmake/build/module_includes/main.cpp: In function int main(int, char**): ../qtknx/tests/auto/cmake/build/module_includes/main.cpp:10:10: error: expected primary-expression before localQKnx QKnx localQKnx; Change-Id: I8fc28676d06e592680d4d26835c4e33df28c25f9 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Linux qmake compiler detection for qtknx not workingAndrew O'Doherty2018-11-057-127/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Running configuration tests... Checking for Minimum compiler version... no Done running configuration tests. Configure summary: Qt KNX: Minimum compiler version detected ...... no Task-number: QTBUG-67157 Change-Id: I3a12e8aea25a162c01f033880ca87c0c41c9a6e8 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Fix KNX project parsing for ETS version >= 5.6.*Karsten Heimrich2018-10-267-32/+170
| | | | | | | | | | | | Task-number: QTBUG-70667 Change-Id: I626755acdbfa7f5bd2f187b5b3fee79346efa0c7 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Expand autotest QKnxNetIpDeviceConfigurationAcknowledgeAndrew O'Doherty2018-10-251-0/+51
| | | | | | | | | | Change-Id: I18187a48d3443b4f3af7139bd10070936f8ec9bc Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Extend tst_QKnxNetIpConnectionStateResponseAndrew O'Doherty2018-10-251-0/+46
| | | | | | | | | | Change-Id: I4a5db66b44ce5c2753d2b4451c8b3b63e9bc26f2 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Extend tst_QKnxNetIpConnectionStateRequestAndrew O'Doherty2018-10-251-0/+64
| | | | | | | | | | Change-Id: I91bce8038477769ceadaf9c07f841c6aa839e0f1 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Extend autotest tst_QKnxNetIpDescriptionRequestAndrew O'Doherty2018-10-251-0/+51
| | | | | | | | | | Change-Id: Ia40e8afee1edfc1d5a240e6f7352475ddc9a0453 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Extend autotest tst_QKnxNetIpRoutingLostMessageAndrew O'Doherty2018-10-251-0/+58
| | | | | | | | | | Change-Id: Ib87a430fc74bf3dafd5be7413c7879419dd58ea2 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Extend autotest tst_QKnxNetIpTunnelingRequestAndrew O'Doherty2018-10-251-1/+97
| | | | | | | | | | Change-Id: Ieaa2a0510ea786fdb0191cb0658563012660b7f2 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Extend autotest tst_QKnxNetIpTunnelingAcknowledgeAndrew O'Doherty2018-10-251-1/+83
| | | | | | | | | | Change-Id: I476c5cd44d0919f8bd58ef0e402ad0b057432272 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Add missing includeSamuli Piippo2018-10-241-0/+1
| | | | | | | | | | Change-Id: I42e42215110d1bcb5a44547a058d8748f3c240c5 Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* | Remove core, gui, etc. dependency from configure testKarsten Heimrich2018-10-221-0/+2
| | | | | | | | | | | | Task-number: QTBUG-67157 Change-Id: I63aa1a7b03964a88bd6fc99597815655aad2ba2a Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 11:06:39 +0000