summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-07-171-2/+2
| | | | | Change-Id: Iadbd021ad3325b8129be9b9776da4462c9673c17 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-07-141-2/+2
| | | | | Change-Id: I486ea10400d13c8b72a687bc725f987ee72305eb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-07-131-2/+2
| | | | | Change-Id: I6356a37a30c790a3467801b5c317658b6de3924a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-06-221-2/+2
| | | | | Change-Id: I0cf333e5343f4dafeccc872a059b6517820908a9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-06-151-2/+2
| | | | | Change-Id: Ifa560466252de28dfbb5c1e044abe3a58fd7f126 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.3Jani Heikkinen2023-06-151-1/+1
| | | | | Change-Id: If5510a557b944f69a7a733caf8136dbd2c57a82a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-06-131-2/+2
| | | | | Change-Id: I6291a0fffe212be80035a9ff3209623cd217cd28 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-06-121-2/+2
| | | | | Change-Id: Ib9da78d9391adf02866c7baffada8b23e5c94cb3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-06-091-2/+2
| | | | | Change-Id: I4f9fe0bea748ce66f2ea534b27f8063b9e7b6619 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-06-071-2/+2
| | | | | Change-Id: I80aed14603f9b364f8850c67389181c409290cfa Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove the manual undef of the min/max macros, or def NOMINMAXAmir Masoud Abdol2023-06-061-5/+0
| | | | | | | | | | | | We now add NOMINMAX to PlatformCommonInternal target which will be linked to everything else, so min/max will not be defined upon the inclusion of `windows.h`, or other headers. Change-Id: I9cb208c081c4db51060e345d5a6feb6204aea862 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 8b1ce54608bfa1379f2df68cd9dde5c9b902a7f9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove conanfile.pyTor Arne Vestbø2023-06-061-31/+0
| | | | | | | | | | The conan experiment has ended, and the file is only bitrotting nowadays. Change-Id: I4f16c1919ebe6584188dee97f497bb14c3337847 Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit ed31a84fa4b08f892725b9c9327c0867eabdf76f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-06-061-2/+2
| | | | | Change-Id: Id164c76ebbe3a5ac81d589c4ad5a0901b12103dd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-311-2/+2
| | | | | Change-Id: I7c8cca1af03d99b08dfebe8f0e91e0264a038a4d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-291-2/+2
| | | | | Change-Id: I3b91da2b561df8cce2f18fab7497466bcd61f1c4 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-251-2/+2
| | | | | Change-Id: Ifb9695a3c2a41457e8a6b49bcb918c45eb88deca Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-241-2/+2
| | | | | Change-Id: I2a94a563631726748766daaf97e8fca24c0025d0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-231-2/+2
| | | | | Change-Id: I48699d8d46e1acbf04b263e10e698bbd52140634 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-221-2/+2
| | | | | Change-Id: Iffd6c0a1cc290aa290917de9d2e603abefaade66 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-191-2/+2
| | | | | Change-Id: I652cb43ac1ef8b14338fcb083d4310e2c896725f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-161-2/+2
| | | | | Change-Id: Ic6e2d8a2ccbf0ae933d7d7ae3cd363a12c32b8c3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-121-2/+2
| | | | | Change-Id: I0b1b340fb66aff81e1c01eb2df687f0cd703843d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add the use of the qt_internal_project_setup functionAlexey Edelev2023-05-091-0/+1
| | | | | | | | | | The function sets the required CMake variables and policies. Task-number: QTBUG-112685 Change-Id: I49df26cc6b60e28d855206ee04434cfee8b10e56 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> (cherry picked from commit 699cd3dd3421b0e348d2e995204d6a289ff7ba66) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-031-2/+2
| | | | | Change-Id: I68e88d569dfbbfa886d10bd8518524989e586b58 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.2Jani Heikkinen2023-05-031-1/+1
| | | | | Change-Id: If57cafbd7dcc4a199a521abfdf9478e4f2a1ac77 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-05-011-2/+2
| | | | | Change-Id: I1fee9511bef36477711cee848f257c5df823ac47 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-04-281-2/+2
| | | | | Change-Id: Ic7a29ffac2758d66b522ffe47ddc60d575bbdea7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-04-261-2/+2
| | | | | Change-Id: I9bf860bfa68d87ef826e46671ab124c25288b4bc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-04-201-2/+2
| | | | | Change-Id: I2f944c843dc40a63521a1ccc5f966c50cdfe3f20 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-04-191-2/+2
| | | | | Change-Id: I98943b376767a8c2c17fef6b8142be838d040752 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-04-171-2/+2
| | | | | Change-Id: I0a2494faa4ac039b57b6968d3eea5e2e3679f7bd Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-04-131-2/+2
| | | | | Change-Id: I532fb690857dd426aaf5cc6575c3c1f20a24bc48 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-04-121-2/+2
| | | | | Change-Id: I97dae70fc883d21d1e423bebb440ac181d9051ac Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-04-031-2/+2
| | | | | Change-Id: I0005e18ff0c0046d400acd5683c7a48f902cf24d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Bump version to 6.5.1Jani Heikkinen2023-04-041-1/+1
| | | | | Change-Id: I293d53fd40e54c81a2203354b243d70e486bd3c8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-241-2/+2
| | | | | Change-Id: Ibe996c2580549e0f9aa35c3d4be7def422a8a9f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-221-2/+2
| | | | | Change-Id: I1f94c11317b06dd94001f5aed010ec54f0bc2a48 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-161-2/+2
| | | | | Change-Id: I8f8064ffce0288405502337b29206a3499d3b02e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-111-2/+2
| | | | | Change-Id: If1119866c03bab34bfb764c71c2a33133ec83110 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-081-2/+2
| | | | | Change-Id: Ib18b0828c55f9072af3ae73e1a79577a696aec59 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-031-2/+2
| | | | | Change-Id: Ia3f08a4ce6f773cb237962e14710980af232ffcb Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-021-2/+2
| | | | | Change-Id: I42d00e26d0f83090d4afc2d094b459916e0d2641 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-03-011-2/+2
| | | | | Change-Id: I1dcffa30ee6f82b23aec6e69fc45822bed95629c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* OpcuaViewer: Don't locate files relative to binaryKai Köhne2023-02-245-54/+73
| | | | | | | | | | | | | | | | | The logic to locate files relative to the binary is fragile. It is currently broken for CMake on Windows, and not actually implemented in qmake. Furthermore, it requires the binary directory to be writable at runtime, because additional folders will be created there. Instead, embed the files via qrc, and extract them at runtime into AppLocalDataLocation, which we know we can read/write to. Fixes: QTBUG-109097 Change-Id: Ia6994339f4eba94ee6ef0cd82eadcc72563b7d47 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit ddfe3639386c235d50a54c46071983525ed3a645) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-02-231-2/+2
| | | | | Change-Id: If7b4975f0a8f93602f7b46139f610e869d9bac9c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on '6.5' in qt/qtopcuav6.5.0-beta3Qt Submodule Update Bot2023-02-171-2/+2
| | | | | Change-Id: I51b2136694f4e6eae46246bf13f153ebf6169ee7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Also update the version information hereFrank Meerkötter2023-02-141-1/+1
| | | | | | | We pulled in open62541 1.3.4 for the 6.5 release Change-Id: Icad578676cbb36b8955730ec54dd5edfc5feccab Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
* Update dependencies on '6.5' in qt/qtopcuaQt Submodule Update Bot2023-02-101-2/+2
| | | | | Change-Id: Ide7badf35bc3f9009e11b92e5fecbb3d67c78e6d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-1019-140/+12
| | | | | | | | Change-Id: I17b48757cf0de6b123c96db4dfc7d227c6384071 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit ebe129654a9c5170e121c7d294310af031696c17) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix CMake Unity (Jumbo) buildsFriedemann Kleint2023-02-022-0/+9
| | | | | | | | | | | Add missing header guards and exclude problematic source file. Task-number: QTBUG-109394 Change-Id: I170824448de8b030b444ce9a5d9b15eeca145a22 Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io> Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com> (cherry picked from commit 3adfac4a7ae2d55ac64b39cd80c876826abb08c5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 07:07:11 +0000