summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.15.0v5.15.0-rc2v5.15.0-rc1v5.15.05.15.0Antti Kokko2020-04-231-0/+18
| | | | | Change-Id: Ifd1bd7adf291dd673b1d6dbd216a2e1aa19d0479 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.15' into 5.15.0Qt Forward Merge Bot2020-04-225-28/+46
|\ | | | | | | Change-Id: I638abad86131fed44e1b5d2c7bb540db97a492ae
| * Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-211-0/+20
| |\ | | | | | | | | | Change-Id: Ide9287db2ce434dc25558f8183bf3785cfec731e
| | * Merge remote-tracking branch 'origin/5.14.2' into 5.145.14Qt Forward Merge Bot2020-04-211-0/+20
| | |\ | | | | | | | | | | | | Change-Id: Ibc0df0ef43e7171e12f8aa20fa099c8da6e31403
| | | * Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-171-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Iea7651b8f84e7133605826b9562ab31a81ccee7c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-04-184-28/+26
|/| | | | |/ / | | | | | | Change-Id: I041cf94ca9ba6d61ae0ab5cb996617b872634485
| * | Update certificate and private key for the opcuaviewer exampleJannis Voelker2020-04-174-28/+26
| | | | | | | | | | | | | | | | | | | | | The old certificate was expired, the new certificate is valid until april 2030. Change-Id: I118d669b904f79a4632339f0ae260f182ea257d4 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta4v5.15.0-beta3v5.15.0-beta2Jani Heikkinen2020-03-165-5/+5
|\| | | | | | | | | | | Change-Id: I812717d1cc5302cdaad64897bf5b3a890710a04d
| * | Merge remote-tracking branch 'origin/5.14.2' into 5.14Jani Heikkinen2020-03-165-5/+5
| |\| | | | | | | | | | Change-Id: I479a37eaa6d802cdcfa2010ffdc10e242e8e18ad
| | * Revert "Prospective build fix for MinGW"Maurice Kalinowski2020-03-165-5/+5
| |/ | | | | | | | | | | | | | | | | | | | | This reverts commit 58a4d5b54968bdcd042113a1a5200db7e6f7547b. The design changes for MinGW caused some regressions, which needed to be reverted. The same applies for this patch. Task-number: QTBUG-82868 Change-Id: I11ede47795e019037927fe5a0966e791ba5fe82f Reviewed-by: Simon Hausmann <simon.hausmann@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: I84d5b2807fc90d51f81d2239ab1436010261c9bd
| * Bump versionAlexandru Croitor2020-02-021-1/+1
| |
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-012-4/+22
|\| | | | | | | Change-Id: I21a09f9e3e10d10acdca8f6b7e33388abfc075b8
| * Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-272-4/+22
| |\ | | | | | | | | | Change-Id: Ic690d7bfa462b385f83a640a56d43dc92444c826
| | * Add changes file for Qt 5.14.1v5.14.15.14.1Antti Kokko2020-01-151-0/+20
| | | | | | | | | | | | | | | | | | Change-Id: If3aba0dd86f0137b8db2e7eb07b8e2d690fa1418 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| | * Fix -no-gui buildsFrank Meerkötter2020-01-151-4/+2
| |/ | | | | | | | | | | Fixes: QTBUG-81352 Change-Id: I136fa2b445a41bde6f8d49dd988b48ea80e29e19 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: Idee1e798799825d56758d4235d34c34e3e758e96
| * Bump versionDaniel Smith2019-12-161-1/+1
| |
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+24
|\| | | | | | | Change-Id: I971042f2708d8f962fa3bd77e140c1229754431b
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+24
| |\ | | | | | | | | | Change-Id: I83e12321d81aca21dcf9f37c985ddb03d0f84c59
| | * Add changes file for Qt 5.14.0v5.14.05.14.0Antti Kokko2019-12-031-0/+24
| | | | | | | | | | | | | | | Change-Id: I1bbdf4fb3f4a509cfad177cd4e958b141df09c0b Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-261-1/+1
|\| | | | | | | | | | | Change-Id: I4f71f8d178ffdb09962182f8e8ffdd82ac4b3fa6
| * | Fix incorrect environment variable usage in the documentationAndy Shaw2019-11-251-1/+1
| |/ | | | | | | | | | | Change-Id: I475aead2b541b082532432db1117288d87b9b1ba Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-1951-13/+8749
|\| | | | | | | Change-Id: I387a9d5936a8fa82e545602f08323e87f3b37f00
| * Fix broken pkiConfig example codev5.14.0-rc2v5.14.0-rc1Frank Meerkötter2019-11-151-6/+6
| | | | | | | | | | | | | | | | Reviewed-by: Rainer Keller <Rainer.Keller@qt.io> Change-Id: I5713c7844e74a6ecacd5c437aa67f118ae4108a9 (cherry picked from commit b7274d71da506acca2f9397970cce2177545215e) Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| * GDS client supportRainer Keller2019-11-1512-1/+2933
| | | | | | | | | | Change-Id: Ic71663684a51f15835bc1ea541a1ea751bf02099 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
| * Do not build manual testsRainer Keller2019-11-141-2/+1
| | | | | | | | | | | | | | | | If they are built together with the autotests they are also going to be executed, which is not what manual tests are designed for. Change-Id: I2c0355627fe6b900983b54a192576f014023f33d Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| * Add support for generating X509 Certificate Signing RequestsRainer Keller2019-11-1237-4/+5809
| | | | | | | | | | Change-Id: I6e69d38ff9285a3b7f84b7470fdd7a80505c4f2b Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-120-0/+0
|\| | | | | | | Change-Id: I2e81903080878ed532775c393e4d231b24d4d801
| * Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-050-0/+0
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifcd9b2701c091103e316ed94010540dda70c79fa
| | * Bump versionv5.13.25.13.25.13Frederik Gladhorn2019-10-141-1/+1
| | |
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-056-42/+1
|\| | | | | | | | | | | Change-Id: I196ec9f3c041fa028bce63e8adee415db1dd8e97
| * | Remove technology preview statementRainer Keller2019-11-046-42/+1
| | | | | | | | | | | | | | | | | | | | | All classes related to secure connections are out of technology preview state. Change-Id: I27b9db38a2d6890a40d5087dac25c3ff827dee1e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-2923-1009/+1138
|\| | | | | | | | | | | Change-Id: I9edeaa0fe7421a38ce27b7c20490d1433afaadad
| * | Derive UACPP_LIBDIR from UACPP_PREFIXv5.14.0-beta2Joerg Bornemann2019-10-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Since we switched to relative library paths again in Qt 5.14.0 we must set UACPP_LIBDIR properly to make the -l linker options work. Change-Id: If879f19a324b82a8717aa96d0bd800dc49e40b20 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
| * | Fix warning about unused variableRainer Keller2019-10-101-0/+2
| | | | | | | | | | | | | | | Change-Id: Ifd46da5cbf993cae7f66389a1222c5ddb1a604f7 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| * | Update open62541 to the v1.0 releaseJannis Voelker2019-10-105-898/+965
| | | | | | | | | | | | | | | Change-Id: I37626bb2ef698e4e3ecda7841ae9b22db39a38bb Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-054-17/+66
| |\| | | | | | | | | | Change-Id: I92083b35010c0172ec3265cf4f788a5ba25cf5cb
| | * Fix GUID binary encoder endiannessRainer Keller2019-10-022-4/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | The OPC-UA standard defines in part 6 chapter 5.2.2.6 that integer parts of a GUID have to be transferred in little endian order. Change-Id: I2082ecef414572d87cd5586fc4ea9f5f8887a4aa Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| | * Revert "Fix endianness of GUID node ids"Rainer Keller2019-10-022-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Transferring integers in big endian format is wrong. The OPC-UA standard specifies in part 6 section 5.2.2.2 all values to be encoded in little endian order. This reverts commit 073b305d7f80b952c0d0858115fc102edd0339b4. Change-Id: I75ceeeeda6a629a6551465d6f428b1ee57b32db3 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| * | Remove unused includesv5.14.0-beta1Rainer Keller2019-10-024-4/+0
| | | | | | | | | | | | | | | Change-Id: Icff5207423aab9ab264ec281484b941da62b7969 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| * | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-282-8/+13
| |\ \
| | * | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-282-8/+13
| |/| | | | |/ | | | | | | Change-Id: I67615256ceb680abb23bb8c63cd5e2af845965c9
| | * Fix endianess of GUID node idsRainer Keller2019-09-262-8/+13
| | | | | | | | | | | | | | | Change-Id: I948bd4bb6a58874c6d2cc9737777a08c0f214648 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| * | Prospective build fix for MinGWv5.14.0-alpha1Simon Hausmann2019-09-235-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit 4d289edb14aeb4976218cc306bfc514e37521b82 in qtbase, debug-and-release is not unconditional on Windows anymore -- it's off for MinGW. Therefore path tricks to get out of a debug/ or release/ folder need to be guarded with the feature. Task-number: QTBUG-78704 Change-Id: Idd1e9c1eae4696cd0322d4d991e92b7f1309fec3 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | opcuaviewer: Add a command line parameter for the initial urlFriedemann Kleint2019-09-184-6/+17
| | | | | | | | | | | | | | | | | | | | | Use QCommandLineParser to obtain the parameter. Change-Id: I770610df7046d7f4bd34ebb4d3fa2706e587439c Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
| * | opcuaviewer: Fix some clang warningsFriedemann Kleint2019-09-187-70/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix uninitialized member variables - Remove unused variable - Use multi-arg version of QString::arg() - Fix a number of else after return; replace by switch - Fix static method invocation - Make protected member variables private - Pass classes by const ref - Remove C-style casts Change-Id: I7668c28492db7fc2970077f2043bb3ebc3f2fc82 Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
| * | opcuaviewer: Refactor some codeFriedemann Kleint2019-09-182-22/+31
| | | | | | | | | | | | | | | | | | | | | | | | - Use static constants for the icon pixmaps - Refactor the formatting of lists not to create a list first Change-Id: I3df309ea8c13cedd1ac8236fff1a0c9b06a39b1f Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-177-178/+332
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-177-178/+332
|/| | | | |/ / | | | | | | Change-Id: I28eeda3aa97a1e2064b483e9af820d6945dce3dd
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 06:43:09 +0000