From 95cc366cc9e7490bc08922321eb25baf8fbac289 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Nov 2022 07:45:34 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I014f655cbc4d43219ebb2fe0a1b7ff09d6c4ed75 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index abce6b5e..18a8e845 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 69fa64eb2417771e062bbebd399e43b735c2617b + ref: e2181524ffdc80f7c2da45c6408182ee7649ccf8 required: true ../tqtc-qtmultimedia: - ref: 36108c69b2f6ae3a3fc34a1d1719395e31ae5d76 + ref: a75f85afb56de6e97225a9f4e797e7f679c88d87 required: true ../tqtc-qtremoteobjects: - ref: 6c42d9ed7f3bf9aceec174ff2cb3b3f396f79b1d + ref: 3df7b5af4e04b485695afcdfda526958a33c7b95 required: true ../tqtc-qttools: - ref: 85ef8291b2ae9e333949468cbb294938fcc6a099 + ref: 6ea524f145e0f8e30dadd13a8aeec02d9d0a93d3 required: false -- cgit v1.2.3 From d6b4405b7e3cc3773b4e198f0ec6502b94dc9739 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Dec 2022 02:47:14 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: Ib9af3fbe6c4bdf125789efc6426e984f3aa34067 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 18a8e845..5d780bf2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: e2181524ffdc80f7c2da45c6408182ee7649ccf8 + ref: 2d698f4ccf303777bfd777f9b20ccad2f8bd932f required: true ../tqtc-qtmultimedia: - ref: a75f85afb56de6e97225a9f4e797e7f679c88d87 + ref: 50eec1b101860a448dab51ebedfff743f50cec60 required: true ../tqtc-qtremoteobjects: - ref: 3df7b5af4e04b485695afcdfda526958a33c7b95 + ref: 1d4f7612f82d5b5bb92edb80a152fce39ea3e143 required: true ../tqtc-qttools: - ref: 6ea524f145e0f8e30dadd13a8aeec02d9d0a93d3 + ref: c48640e2cb98704519b52619f5d586378a9d08f3 required: false -- cgit v1.2.3 From 6b97f331de7145aa6d9c4dc2c1d444bcbeebd811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Tue, 6 Dec 2022 11:05:53 +0100 Subject: Doc: Fix paths for Files property in qt_attribution.json files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I10bba78ffce32be9495d2490e9aea991be3691fe Reviewed-by: Jörg Bornemann (cherry picked from commit bbdf723ace753ccda30745ff8186a5156c42712a) Reviewed-by: Qt Cherry-pick Bot --- src/3rdparty/qt_attribution.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty/qt_attribution.json b/src/3rdparty/qt_attribution.json index e019dfc3..854898ee 100644 --- a/src/3rdparty/qt_attribution.json +++ b/src/3rdparty/qt_attribution.json @@ -3,7 +3,7 @@ "Name": "QFace", "QDocModule": "qtinterfaceframework", "QtUsage": "Used for qtivi autogeneration of interfaces.", - "Files": "qface ../doc/interfaceframework/src/template-syntax.qdoc ../doc/interfaceframework/src/idl-syntax.qdoc", + "Files": "qface ../interfaceframework/doc/src/ifcodegen/template-syntax.qdoc ../interfaceframework/doc/src/ifcodegen/idl-syntax.qdoc", "Description": "QFace is a generator framework based on a modern IDL.", "Homepage": "https://pelagicore.github.io/qface", -- cgit v1.2.3 From a74633f13d4a7e62a49a7582e95e84b7d335dd79 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Dec 2022 00:34:17 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I4ee31962a02a794ac2f9c625bf34f50ebe1ad933 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 5d780bf2..deb7d663 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 2d698f4ccf303777bfd777f9b20ccad2f8bd932f + ref: d0c4361d43b27311d5f64e1160027fd115799f62 required: true ../tqtc-qtmultimedia: - ref: 50eec1b101860a448dab51ebedfff743f50cec60 + ref: 27fb1c8b715e983677b100a8fb60b34205070158 required: true ../tqtc-qtremoteobjects: - ref: 1d4f7612f82d5b5bb92edb80a152fce39ea3e143 + ref: 36baad1a2769958a82c7c52e27d0940ceb5dcba9 required: true ../tqtc-qttools: - ref: c48640e2cb98704519b52619f5d586378a9d08f3 + ref: bad461aa97e56b264eaccbf8527ac091c93ccf1b required: false -- cgit v1.2.3 From 2aae151d5d919202621e4edffae0bd57d37b8dbd Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 13 Dec 2022 17:27:17 +0100 Subject: Fix calling initialize() twice in QIfMediaDeviceDiscoveryModel This caused the signals to be emitted twice as well and calling resetModel() a second time. resetModel() deleted all elements although it didn't own them and this caused a crash when calling resetModel() again with a list of dangling pointers. Change-Id: Iad0455e10867235aae2478704acdcb53fbce1930 Reviewed-by: Robert Griebl (cherry picked from commit 716c858a253e3abebc08a72b3426735f55ecd3e7) Reviewed-by: Qt Cherry-pick Bot --- src/ifmedia/qifmediadevicediscoverymodel.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/ifmedia/qifmediadevicediscoverymodel.cpp b/src/ifmedia/qifmediadevicediscoverymodel.cpp index 8846a460..4933e66a 100644 --- a/src/ifmedia/qifmediadevicediscoverymodel.cpp +++ b/src/ifmedia/qifmediadevicediscoverymodel.cpp @@ -77,7 +77,6 @@ void QIfMediaDeviceDiscoveryModelPrivate::resetModel(const QListbeginResetModel(); - qDeleteAll(m_deviceList); m_deviceList.clear(); m_deviceList = deviceList; q->endResetModel(); @@ -318,8 +317,6 @@ void QIfMediaDeviceDiscoveryModel::connectToServiceObject(QIfServiceObject *serv d, &QIfMediaDeviceDiscoveryModelPrivate::onDeviceRemoved); QIfAbstractFeatureListModel::connectToServiceObject(serviceObject); - - backend->initialize(); } /*! -- cgit v1.2.3 From 0f3be8d2fbf49522547c6aa5b2ffbcb49796aba0 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 12 Dec 2022 14:04:38 +0100 Subject: CMake: Fix IfVehicleFunctions to build with syncqt/cpp The headers generated by ifcodegen were not passed via target_sources in the generated/included cmake file, so syncqt didn't know it was supposed to create forwarding headers. Adjust the frontend template to pass the header files to target_sources. Fixes: QTBUG-109355 Change-Id: I50e0eb1d8cff959ba05294650758772bddc244a3 Reviewed-by: Dominik Holland (cherry picked from commit 3050a2a1e47325fb002386312ecc97c2c2e3222c) Reviewed-by: Alexandru Croitor --- src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl index 95f06db9..a66090d8 100644 --- a/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl +++ b/src/tools/ifcodegen/templates/frontend/CMakeLists.txt.tpl @@ -31,13 +31,20 @@ qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES {% for interface in module.interfaces %} + ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}.h + ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}_p.h ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}.cpp + ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backendinterface.h ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backendinterface.cpp {% endfor %} {% for struct in module.structs %} + ${CMAKE_CURRENT_LIST_DIR}/{{struct|lower}}.h ${CMAKE_CURRENT_LIST_DIR}/{{struct|lower}}.cpp {% endfor %} + ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}global.h + ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}.h ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}.cpp + ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}factory.h ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}factory.cpp ) -- cgit v1.2.3 From f56da7fe1879234bceff61518d4b320dc86bc752 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Dec 2022 09:13:27 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: Ie0f9e1feca17e0a4becc59fc66e16fb36e5db442 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index deb7d663..b98b6044 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: d0c4361d43b27311d5f64e1160027fd115799f62 + ref: 0cd389251201abb6b762e288b9929dfff9464f79 required: true ../tqtc-qtmultimedia: - ref: 27fb1c8b715e983677b100a8fb60b34205070158 + ref: 6715addd942537aebd011f6e985de637796471de required: true ../tqtc-qtremoteobjects: - ref: 36baad1a2769958a82c7c52e27d0940ceb5dcba9 + ref: dbf7fff68627e9e1e77a98dea2ecab1e737de4dd required: true ../tqtc-qttools: - ref: bad461aa97e56b264eaccbf8527ac091c93ccf1b + ref: 32a15e0c8eca176a6bb8c39027d5c664c951249f required: false -- cgit v1.2.3 From afad889b90f5158e4c535253d4db7ae4c0a270e7 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 14 Dec 2022 14:01:18 +0100 Subject: ifcodegen: Add all headers to target_sources when building with CMake This extends 3050a2a1e47325fb002386312ecc97c2c2e3222c to all other templates. Change-Id: Ibac0238ff789ec2bbe97e9b3e2763f77c3fb5566 Reviewed-by: Robert Griebl (cherry picked from commit 92e28e634a85b5fb8ed89ff04f0f9a8a55f2eb1b) Reviewed-by: Qt Cherry-pick Bot --- src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl | 2 ++ src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl | 2 ++ src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl | 1 + src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl | 3 +++ src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl | 1 + 5 files changed, 9 insertions(+) diff --git a/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl index 0c107feb..999b1dd4 100644 --- a/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl +++ b/src/tools/ifcodegen/templates/backend_qtro/CMakeLists.txt.tpl @@ -35,8 +35,10 @@ endif() qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES {% for interface in module.interfaces %} + ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}robackend.h ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}robackend.cpp {% endfor %} + ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}roplugin.h ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}roplugin.cpp ) diff --git a/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl index 546b86bf..059f0051 100644 --- a/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl +++ b/src/tools/ifcodegen/templates/backend_simulator/CMakeLists.txt.tpl @@ -31,8 +31,10 @@ qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES {% for interface in module.interfaces %} + ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backend.h ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backend.cpp {% endfor %} + ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}simulatorplugin.h ${CMAKE_CURRENT_LIST_DIR}/{{module.module_name|lower}}simulatorplugin.cpp ) diff --git a/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl index 43a07ca7..6c12e843 100644 --- a/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl +++ b/src/tools/ifcodegen/templates/server_qtro/CMakeLists.txt.tpl @@ -34,6 +34,7 @@ if (NOT TARGET Qt6::RemoteObjects OR NOT TARGET Qt6::IfRemoteObjectsHelperPrivat endif() qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES + ${CMAKE_CURRENT_LIST_DIR}/core.h ${CMAKE_CURRENT_LIST_DIR}/core.cpp ) diff --git a/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl index c8427c98..9f701e01 100644 --- a/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl +++ b/src/tools/ifcodegen/templates/server_qtro_simulator/CMakeLists.txt.tpl @@ -35,9 +35,12 @@ endif() qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES {% for interface in module.interfaces %} + ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backend.h ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}backend.cpp + ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}adapter.h ${CMAKE_CURRENT_LIST_DIR}/{{interface|lower}}adapter.cpp {% endfor %} + ${CMAKE_CURRENT_LIST_DIR}/core.h ${CMAKE_CURRENT_LIST_DIR}/core.cpp ${CMAKE_CURRENT_LIST_DIR}/main.cpp ) diff --git a/src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl b/src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl index 3585dd5c..c2ff6925 100644 --- a/src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl +++ b/src/tools/ifcodegen/templates/test/CMakeLists.txt.tpl @@ -31,6 +31,7 @@ qt6_set_ifcodegen_variable(${VAR_PREFIX}_SOURCES {% for interface in module.interfaces %} + ${CMAKE_CURRENT_LIST_DIR}/tst_{{interface|lower}}.h ${CMAKE_CURRENT_LIST_DIR}/tst_{{interface|lower}}.cpp {% endfor %} ${CMAKE_CURRENT_LIST_DIR}/main.cpp -- cgit v1.2.3 From 7a3ae5e364363dc20660b7d1609df07511de49f5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Dec 2022 08:37:07 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: Icaaf823fa40c030ce2e2d3432dd9df8ede010b3a Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index b98b6044..0c48c801 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 0cd389251201abb6b762e288b9929dfff9464f79 + ref: 7e7f24a8b7c7ce12d35312480c09cbe404dbfe8b required: true ../tqtc-qtmultimedia: - ref: 6715addd942537aebd011f6e985de637796471de + ref: 5645bc8f84048889d6f8c284afc27922dc574e6b required: true ../tqtc-qtremoteobjects: - ref: dbf7fff68627e9e1e77a98dea2ecab1e737de4dd + ref: 1e9e23c43e0f1119e9c3ecce045884fb90cf92e1 required: true ../tqtc-qttools: - ref: 32a15e0c8eca176a6bb8c39027d5c664c951249f + ref: 231a4af9914f1dac4e6e0593083d2ddf7ad64500 required: false -- cgit v1.2.3 From 6737e707988bdbdc0e754dc1380395eb01f9e101 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 23 Dec 2022 12:51:59 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I5ab5b457a0ded5b91bf08d20757e428cffb530e3 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 0c48c801..855655be 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 7e7f24a8b7c7ce12d35312480c09cbe404dbfe8b + ref: 10095014d175dae1843a5833d4499e880387f843 required: true ../tqtc-qtmultimedia: - ref: 5645bc8f84048889d6f8c284afc27922dc574e6b + ref: 64978f03bb9fbdc49b159085dfe4492ae2104ab6 required: true ../tqtc-qtremoteobjects: - ref: 1e9e23c43e0f1119e9c3ecce045884fb90cf92e1 + ref: e251589a6512812282b07541c8af1dad99e146e3 required: true ../tqtc-qttools: - ref: 231a4af9914f1dac4e6e0593083d2ddf7ad64500 + ref: 425c7e2766c08084c2147caf1802f5ae79034972 required: false -- cgit v1.2.3 From bd5eae4daa73810fd58905fc78e2afbb4dfad469 Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 22 Dec 2022 14:58:39 +0200 Subject: Bump version to 6.2.8 Change-Id: I25dd00e356efc5cfcc6e4329ae97658d08aac75e Reviewed-by: Dominik Holland --- .cmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cmake.conf b/.cmake.conf index f6f7fed3..55ff681c 100644 --- a/.cmake.conf +++ b/.cmake.conf @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.2.7") +set(QT_REPO_MODULE_VERSION "6.2.8") -- cgit v1.2.3 From 7bd6224810bc2d9fb8e12ccc76339dc4da2c8960 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 28 Dec 2022 11:55:46 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: Ief21d52a02faef373919fb47250a5ae90c4c35c3 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 855655be..7afd7e01 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 10095014d175dae1843a5833d4499e880387f843 + ref: 38e2430391ea64b1de7f9f083c5958a3fbd6d012 required: true ../tqtc-qtmultimedia: - ref: 64978f03bb9fbdc49b159085dfe4492ae2104ab6 + ref: e8424ae18f553b1922093396606af8abadd37652 required: true ../tqtc-qtremoteobjects: - ref: e251589a6512812282b07541c8af1dad99e146e3 + ref: 504a7c4a08f0c59ffc668a53e1b2917cf802d6fd required: true ../tqtc-qttools: - ref: 425c7e2766c08084c2147caf1802f5ae79034972 + ref: 51476d2142d17b63034da72d8c594a0fc6aa2e70 required: false -- cgit v1.2.3 From 5d708be2a9e9d5e7c43dc1ac5e643f232999cff2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Jan 2023 17:18:32 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I91d82548aaa4de3dffb60a05cf5351518a76a446 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 7afd7e01..d8422ce9 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 38e2430391ea64b1de7f9f083c5958a3fbd6d012 + ref: f3a153c361c1c5ac0ade8a84bd513f5dbe0eac50 required: true ../tqtc-qtmultimedia: - ref: e8424ae18f553b1922093396606af8abadd37652 + ref: 1c6080d3dbe591b0e1301948b59f10d4322e142e required: true ../tqtc-qtremoteobjects: - ref: 504a7c4a08f0c59ffc668a53e1b2917cf802d6fd + ref: d5acd32e96d367b5e39851ea4c73d9a44c031437 required: true ../tqtc-qttools: - ref: 51476d2142d17b63034da72d8c594a0fc6aa2e70 + ref: 612ecc70e4954223b936c89930a9a583da1fee43 required: false -- cgit v1.2.3 From 715b9d84ad3a6d7319c8c45ba565a71454ef35d4 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 10 Jan 2023 17:01:24 +0100 Subject: Fix deploy-virtualenv.bat to handle new python versions In newer python versions the dlls are not located in the Scripts folder. Without the dlls the created virtualenv is not fully relocatable. Also fixes some errors when the path contains some spaces. Change-Id: Iac9db12f411d39e9a6674bdc082da084ca8d0b35 Reviewed-by: Assam Boudjelthia (cherry picked from commit 8526131886e2d7e6853c8c2b95554dfbd3416010) Reviewed-by: Qt Cherry-pick Bot --- src/tools/ifcodegen/deploy-virtualenv.bat | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) mode change 100644 => 100755 src/tools/ifcodegen/deploy-virtualenv.bat diff --git a/src/tools/ifcodegen/deploy-virtualenv.bat b/src/tools/ifcodegen/deploy-virtualenv.bat old mode 100644 new mode 100755 index ebd53a2d..794662cf --- a/src/tools/ifcodegen/deploy-virtualenv.bat +++ b/src/tools/ifcodegen/deploy-virtualenv.bat @@ -78,15 +78,19 @@ IF NOT EXIST "%ORIG_LIB%" ( ) echo "copying files from %ORIG_LIB% to %VIRTUALENV_LIB%" -FOR /f %%i in (%SCRIPT%\deploy-virtualenv-files.txt) DO ( +FOR /f "usebackq" %%i in ("%SCRIPT%\deploy-virtualenv-files.txt") DO ( IF EXIST "%ORIG_LIB%%%i\" ( - IF NOT EXIST %VIRTUALENV_LIB%\%%i mkdir %VIRTUALENV_LIB%\%%i + IF NOT EXIST "%VIRTUALENV_LIB%\%%i" mkdir "%VIRTUALENV_LIB%\%%i" xcopy "%ORIG_LIB%%%i" "%VIRTUALENV_LIB%\%%i" /E /Q /H /Y >NUL 2>&1 ) else ( xcopy "%ORIG_LIB%%%i" "%VIRTUALENV_LIB%" /H /Q /Y >NUL 2>&1 ) ) +FOR %%F in ("%ORIG_PREFIX%\python*.dll") DO ( + xcopy "%%F" "%VIRTUALENV%\Scripts\" /E /Q /H /Y >NUL 2>&1 +) + IF EXIST %ORIG_PREFIX%\DLLs\ ( IF NOT EXIST %VIRTUALENV%\DLLs mkdir %VIRTUALENV%\DLLs xcopy "%ORIG_PREFIX%\DLLs" "%VIRTUALENV%\DLLs" /E /Q /H /Y >NUL 2>&1 -- cgit v1.2.3 From cd3162566586daecf209c4b4fdd79d58c7af1dc5 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 11 Jan 2023 14:05:19 +0100 Subject: doc: Fix all paths in the qt_attribution.json files Some of the files have been moved, but the attribution files were still pointing to the old location. Change-Id: I6c53e90802775bdad055f3dcf66f4c8124b708e7 Reviewed-by: Assam Boudjelthia (cherry picked from commit e7636163a3937847c130428fe8540250b8ed5d59) Reviewed-by: Qt Cherry-pick Bot --- src/3rdparty/virtualenv/qt_attribution.json | 6 +++--- src/interfaceframework/doc/src/qt_attribution.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/virtualenv/qt_attribution.json b/src/3rdparty/virtualenv/qt_attribution.json index 55c39185..f51d3bd3 100644 --- a/src/3rdparty/virtualenv/qt_attribution.json +++ b/src/3rdparty/virtualenv/qt_attribution.json @@ -1,9 +1,9 @@ { - "Id": "relocate-virtualenv", - "Name": "relocate-virtualenv", + "Id": "relocate_virtualenv", + "Name": "relocate_virtualenv", "QDocModule": "qtinterfaceframework", "QtUsage": "Used to make the python3 virtualen relocatable, needed for the ivigenerator", - "Path": "relocate-virtualenv.py", + "Files": "relocate_virtualenv.py", "Description": "A tool for creating isolated virtual python environments.", "Homepage": "https://virtualenv.pypa.io/en/stable/", diff --git a/src/interfaceframework/doc/src/qt_attribution.json b/src/interfaceframework/doc/src/qt_attribution.json index dfd776bf..99f02b62 100644 --- a/src/interfaceframework/doc/src/qt_attribution.json +++ b/src/interfaceframework/doc/src/qt_attribution.json @@ -3,7 +3,7 @@ "Name": "Jinja Documentation", "QDocModule": "interfaceframework", "QtUsage": "Used in the Documentation of the Jinja template language", - "Path": "template-syntax.qdoc", + "Files": "ifcodegen/template-syntax.qdoc", "Description": "Full featured template engine for python.", "Homepage": "http://jinja.pocoo.org/", -- cgit v1.2.3 From 2b9099c153c9340beb60bed773831823d31370aa Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 11 Jan 2023 16:46:25 +0100 Subject: Improve the deploy-virtualenv.bat to work with a python from the app store When python is installed from the Microsoft App Store the installation is split. Usually the created virtualenv indicates where the base_prefix is and we can use that to copy all needed files. With that special python version the virtualenv doesn't contain the base_prefix location and we don't know where to copy the files from. Instead of relying on the virtualenv config files, we now ask python itself about it's base_prefix. Fixes: QTBUG-109936 Change-Id: Ic2576f32fe01d50a2d575e3332ef2fc7124ca2d6 Reviewed-by: Robert Griebl Reviewed-by: Qt CI Bot (cherry picked from commit af1cce5cbb98b1b3d378693d4a0832aa99417486) Reviewed-by: Qt Cherry-pick Bot --- src/tools/ifcodegen/deploy-virtualenv.bat | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/src/tools/ifcodegen/deploy-virtualenv.bat b/src/tools/ifcodegen/deploy-virtualenv.bat index 794662cf..78962e1f 100755 --- a/src/tools/ifcodegen/deploy-virtualenv.bat +++ b/src/tools/ifcodegen/deploy-virtualenv.bat @@ -53,27 +53,14 @@ FOR %%F in (%VIRTUALENV_LIB%\python*) DO ( ) ) -IF EXIST %LIB_FOLDER%\orig-prefix.txt ( - SET /p ORIG_PREFIX=<%LIB_FOLDER%\orig-prefix.txt -) else ( - IF EXIST "%VIRTUALENV%\pyvenv.cfg" ( - FOR /f "tokens=1,2 delims==" %%a in (%VIRTUALENV%\pyvenv.cfg) DO ( - SET NAME=%%a - SET NAME=!NAME:~0,-1! - IF !NAME!==base-prefix ( - SET ORIG_PREFIX=%%b - SET ORIG_PREFIX=!ORIG_PREFIX:~1! - ) - ) - ) ELSE ( - echo "Neither %LIB_FOLDER%\orig-prefix.txt nor %VIRTUALENV%\pyvenv.cfg exists" - exit 1 - ) +START /b /wait %VIRTUALENV%\Scripts\python.exe -c "import sys; print(sys.base_prefix)" > sys_path.txt +FOR /f "delims= usebackq" %%i in ("sys_path.txt") DO ( + SET ORIG_PREFIX=%%i ) SET ORIG_LIB=%ORIG_PREFIX%\lib\%PYTHON_VERSION% IF NOT EXIST "%ORIG_LIB%" ( - echo "%ORIG_LIB% doesn't exist" + echo "Couldn't find python prefix folder. The virtualenv will not be fully functional." exit 1 ) @@ -88,7 +75,7 @@ FOR /f "usebackq" %%i in ("%SCRIPT%\deploy-virtualenv-files.txt") DO ( ) FOR %%F in ("%ORIG_PREFIX%\python*.dll") DO ( - xcopy "%%F" "%VIRTUALENV%\Scripts\" /E /Q /H /Y >NUL 2>&1 + copy "%%F" "%VIRTUALENV%\Scripts\" /Y >NUL 2>&1 ) IF EXIST %ORIG_PREFIX%\DLLs\ ( -- cgit v1.2.3 From 653574de9964103f042176949e0ac3317b8e7668 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 Jan 2023 04:32:23 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I50c595b1b8999bb3f87208584207a30e9a508705 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index d8422ce9..7b395db3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: f3a153c361c1c5ac0ade8a84bd513f5dbe0eac50 + ref: 0a01bd32762f240d44230cebfc8b0913de57f49a required: true ../tqtc-qtmultimedia: - ref: 1c6080d3dbe591b0e1301948b59f10d4322e142e + ref: 92b16eea294e77731d326b768e4ebe3ae1fac157 required: true ../tqtc-qtremoteobjects: - ref: d5acd32e96d367b5e39851ea4c73d9a44c031437 + ref: 11609353006f4d2dba131a46c0dd13f4f18a1bd7 required: true ../tqtc-qttools: - ref: 612ecc70e4954223b936c89930a9a583da1fee43 + ref: a8cf986b137bbe6d35b24cd012fa5b9d1b2c5558 required: false -- cgit v1.2.3 From 976572eae8bfce7305f2c0319ad909620c875752 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 26 Jan 2023 15:31:32 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I7a8b5242182a647f9a222b3276aa115d2c5737ca Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 7b395db3..13b4a85b 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 0a01bd32762f240d44230cebfc8b0913de57f49a + ref: a6b0fa3945144171e656f62eeb9d5e4aa7bc9a11 required: true ../tqtc-qtmultimedia: - ref: 92b16eea294e77731d326b768e4ebe3ae1fac157 + ref: 671eb1b895995b6a367dcaedf29cf8f91193b41d required: true ../tqtc-qtremoteobjects: - ref: 11609353006f4d2dba131a46c0dd13f4f18a1bd7 + ref: 9e52e37f28a8740e2e1ce34dc6b76597ef22e683 required: true ../tqtc-qttools: - ref: a8cf986b137bbe6d35b24cd012fa5b9d1b2c5558 + ref: 09de51559ee8d468fef03f7a40dbb8749aac5a6a required: false -- cgit v1.2.3 From 5029f71798387fba7efdda0b97d35cf088230f61 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 31 Jan 2023 22:27:23 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I8a53ddc61a1b3633125eb8551ac3f1742f3742a4 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 13b4a85b..ab2ea915 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: a6b0fa3945144171e656f62eeb9d5e4aa7bc9a11 + ref: d5b6f586f490414df87d5b65ab1a441e211a8972 required: true ../tqtc-qtmultimedia: - ref: 671eb1b895995b6a367dcaedf29cf8f91193b41d + ref: c2190ec0e8921b1232a01624f4c1e85cbc04677a required: true ../tqtc-qtremoteobjects: - ref: 9e52e37f28a8740e2e1ce34dc6b76597ef22e683 + ref: 6d91779616f44a168f339ad27328a5a4167073b7 required: true ../tqtc-qttools: - ref: 09de51559ee8d468fef03f7a40dbb8749aac5a6a + ref: 4c5aa40595e5b220a77fc8a1f90b9d916a0f6a69 required: false -- cgit v1.2.3 From ec31e724b8bb6123d70ca1b69518bf3e5d1a1e0b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 3 Feb 2023 13:30:27 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: Icd6cd3d61def99ce3cc380b02ebcd75e8a81ec94 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index ab2ea915..745456ce 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: d5b6f586f490414df87d5b65ab1a441e211a8972 + ref: 6ceabf0467f852666deb2e02533fe7687ffaef50 required: true ../tqtc-qtmultimedia: - ref: c2190ec0e8921b1232a01624f4c1e85cbc04677a + ref: 90f3c4f223fffa20185a9c77dab1ff2e888f29fa required: true ../tqtc-qtremoteobjects: - ref: 6d91779616f44a168f339ad27328a5a4167073b7 + ref: afd2b6d2207febee99e680af025c039751787088 required: true ../tqtc-qttools: - ref: 4c5aa40595e5b220a77fc8a1f90b9d916a0f6a69 + ref: b2f1698d7a65db45c4a05d400211aa8d45b25494 required: false -- cgit v1.2.3 From f537fd99e6fcff6bff7c25a035adf1d8343e4cdc Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 7 Feb 2023 15:17:36 +0100 Subject: ifcodegen: Fix windows virtualenv deployment Also copy the python.exe from the original installation into the virtualenv. The python.exe created by virtualenv seems to be special wrapper, which always forwards to the original installation. Fixes: QAA-1724 Change-Id: I7b175fc8416a895f4edc933adba6dd32f2985b87 Reviewed-by: Robert Griebl (cherry picked from commit 85166a8fcd8e46eb3129192bc3d35c5273e52474) Reviewed-by: Qt Cherry-pick Bot --- src/tools/ifcodegen/deploy-virtualenv.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/ifcodegen/deploy-virtualenv.bat b/src/tools/ifcodegen/deploy-virtualenv.bat index 78962e1f..952d94a9 100755 --- a/src/tools/ifcodegen/deploy-virtualenv.bat +++ b/src/tools/ifcodegen/deploy-virtualenv.bat @@ -74,7 +74,7 @@ FOR /f "usebackq" %%i in ("%SCRIPT%\deploy-virtualenv-files.txt") DO ( ) ) -FOR %%F in ("%ORIG_PREFIX%\python*.dll") DO ( +FOR %%F in ("%ORIG_PREFIX%\python*") DO ( copy "%%F" "%VIRTUALENV%\Scripts\" /Y >NUL 2>&1 ) -- cgit v1.2.3 From e76133ab7d57a40bb75f12b167df6090187f712f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 7 Feb 2023 18:04:36 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I3f930761a98714b232c804b38d3f8387182bfb48 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 745456ce..ef38d4ef 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 6ceabf0467f852666deb2e02533fe7687ffaef50 + ref: e5cfb56022281e38673b8910915a89395980c449 required: true ../tqtc-qtmultimedia: - ref: 90f3c4f223fffa20185a9c77dab1ff2e888f29fa + ref: c4ed75c59f447e424926b381dbed0e92e77a874b required: true ../tqtc-qtremoteobjects: - ref: afd2b6d2207febee99e680af025c039751787088 + ref: 1aac10b3b5bf2aa6fb0a172897f9430698963e68 required: true ../tqtc-qttools: - ref: b2f1698d7a65db45c4a05d400211aa8d45b25494 + ref: 8be2869fde346f27735942f078210f96e07f8793 required: false -- cgit v1.2.3 From 773b19055181d5dacd54aafbef332bef7c74bcec Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Feb 2023 08:30:11 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I75b05ec8b8f2d2640d60fac5f64740e2e5ca8749 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index ef38d4ef..29cb2262 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: e5cfb56022281e38673b8910915a89395980c449 + ref: 176e6eb8357535d19d3ca079c71b96915c1bef9c required: true ../tqtc-qtmultimedia: - ref: c4ed75c59f447e424926b381dbed0e92e77a874b + ref: c37858c5cca2299d0d6c06b14c7acc2c71c92e41 required: true ../tqtc-qtremoteobjects: - ref: 1aac10b3b5bf2aa6fb0a172897f9430698963e68 + ref: fcd2692b474d66b8ccdd9cbbfad618715367300d required: true ../tqtc-qttools: - ref: 8be2869fde346f27735942f078210f96e07f8793 + ref: b61c5738796524c77abebbd6d13c8ec565b3abaf required: false -- cgit v1.2.3 From 4a3c6b47ca839a05c7b9d5918ca5ab8415cd02cc Mon Sep 17 00:00:00 2001 From: Zoltan Gera Date: Tue, 14 Feb 2023 17:38:48 +0200 Subject: Fix improper handling of qmake variables when creating a virtualenv The qmake function $$first only accepts a variable and does not work on substituted strings. In the latter case, it returns an empty value. As a result PYTHONPATH became /site-packages without a proper lead-in path. Some platforms can handle this but on most a full path is expected. Change-Id: Ieb9e13369190036ed1806086dd93810df5921619 Reviewed-by: Robert Griebl (cherry picked from commit e1dbb23b2c965c8a3867e79fd3b1b99bf9524b1f) Reviewed-by: Zoltan Gera --- mkspecs/features/ifcodegen.prf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/ifcodegen.prf b/mkspecs/features/ifcodegen.prf index bccdef9b..474340ff 100644 --- a/mkspecs/features/ifcodegen.prf +++ b/mkspecs/features/ifcodegen.prf @@ -59,7 +59,8 @@ IF_TEMPLATE_PATH = $$[QT_INSTALL_DATA]/ifcodegen-templates exists($$VIRTUALENV_PATH) { equals(QMAKE_HOST.os, Windows) { PYTHON = $$VIRTUALENV_PATH/Scripts/python.exe - _LIB_FOLDER = $$files($$VIRTUALENV_PATH/lib/python*) + _LIB_FOLDERS = $$files($$VIRTUALENV_PATH/lib/python*) + _LIB_FOLDER = $$first(_LIB_FOLDERS) SITE_PACKAGES = $${_LIB_FOLDER}/site-packages # No space between the path and && otherwise python3 adds the space to the path @@ -68,7 +69,8 @@ exists($$VIRTUALENV_PATH) { ENV += set VIRTUAL_ENV=%PYTHONHOME%&& } else { PYTHON = $$VIRTUALENV_PATH/bin/python - _LIB_FOLDER = $$files($$VIRTUALENV_PATH/lib/python*) + _LIB_FOLDERS = $$files($$VIRTUALENV_PATH/lib/python*) + _LIB_FOLDER = $$first(_LIB_FOLDERS) SITE_PACKAGES = $${_LIB_FOLDER}/site-packages ENV += LD_LIBRARY_PATH="$$system_path($$VIRTUALENV_PATH/bin)" -- cgit v1.2.3 From ff84b86508079ee5b1d78f6b2eb15984b138d5c4 Mon Sep 17 00:00:00 2001 From: Robert Griebl Date: Tue, 14 Feb 2023 15:37:35 +0100 Subject: Fix the venv creation using Python 3.11 on Debian - re is not just re.py anymore - libssl is not a hard dependency anymore - the lib64 directory may not even be there to begin with Change-Id: I945f8edbb11f58278b42a6893214ff82e4f882fb Reviewed-by: Zoltan Gera Reviewed-by: Dominik Holland (cherry picked from commit 3ae219138f3b5bd0ec2b122bb3a19bd2cf0b358b) Reviewed-by: Qt Cherry-pick Bot --- src/tools/ifcodegen/deploy-virtualenv-files.txt | 1 + src/tools/ifcodegen/deploy-virtualenv.sh | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/tools/ifcodegen/deploy-virtualenv-files.txt b/src/tools/ifcodegen/deploy-virtualenv-files.txt index 97fec4cc..a5cf0f66 100644 --- a/src/tools/ifcodegen/deploy-virtualenv-files.txt +++ b/src/tools/ifcodegen/deploy-virtualenv-files.txt @@ -6,6 +6,7 @@ stat.py tarfile.py ntpath.py genericpath.py +re re.py types.py sre_*.py diff --git a/src/tools/ifcodegen/deploy-virtualenv.sh b/src/tools/ifcodegen/deploy-virtualenv.sh index 19cf3bd4..8e37b511 100755 --- a/src/tools/ifcodegen/deploy-virtualenv.sh +++ b/src/tools/ifcodegen/deploy-virtualenv.sh @@ -115,8 +115,10 @@ if [ "$PLATFORM" == "linux" ]; then echo "copying $LIBCRYPTO" cp -Lf "$LIBCRYPTO" "$VIRTUALENV/bin" LIBSSL=`ldd $HASHLIB | awk '{print $3}' | grep libssl` - echo "copying $LIBSSL" - cp -Lf "$LIBSSL" "$VIRTUALENV/bin" + if [ -e "$LIBSSL" ]; then + echo "copying $LIBSSL" + cp -Lf "$LIBSSL" "$VIRTUALENV/bin" + fi fi CTYPESLIB=`find $LIB_FOLDER/lib-dynload -iname '_ctypes.*'` if [[ -e "$CTYPESLIB" ]] ; then @@ -145,9 +147,15 @@ fi # some files might have wrong permissions, e.g. readonly chmod -R ug+rw $VIRTUALENV -if [ "$(readlink -- "$VIRTUALENV/lib64")" != "lib" ] ; then - cp -a "$VIRTUALENV/lib64"/* "$VIRTUALENV/lib/" - rm -rf "$VIRTUALENV/lib64" +if [ -e "$VIRTUALENV/lib64" ] ; then + if [ "$(readlink -- "$VIRTUALENV/lib64")" != "lib" ] ; then + cp -a "$VIRTUALENV/lib64"/* "$VIRTUALENV/lib/" + rm -rf "$VIRTUALENV/lib64" + cd "$VIRTUALENV" + ln -s lib lib64 + cd - + fi +else cd "$VIRTUALENV" ln -s lib lib64 cd - -- cgit v1.2.3 From 816e265141373e1d4903b471ae1a73a0ba13692a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Feb 2023 08:56:32 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I752d4fc41a290241b80a128790973742b1ee908e Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 29cb2262..7bccbf9d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 176e6eb8357535d19d3ca079c71b96915c1bef9c + ref: a619c76c2c141accf37bb3478718d9b48c6833f0 required: true ../tqtc-qtmultimedia: - ref: c37858c5cca2299d0d6c06b14c7acc2c71c92e41 + ref: 776d3febccec82c2808447249286878998cc38d2 required: true ../tqtc-qtremoteobjects: - ref: fcd2692b474d66b8ccdd9cbbfad618715367300d + ref: 1fbb2948a3bdc2fc36fad60ef76cb2062360488e required: true ../tqtc-qttools: - ref: b61c5738796524c77abebbd6d13c8ec565b3abaf + ref: ea038ff7e138bdeb99588bca25092e2d978e8d8d required: false -- cgit v1.2.3 From c89f1b2c4077fe998b55daf6b2312809339deda4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Feb 2023 19:47:19 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I34167222c377fb87cd44c8a3a88e6f8f374b9268 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 7bccbf9d..67f49d01 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: a619c76c2c141accf37bb3478718d9b48c6833f0 + ref: b20b2831bd81aff74e0dc4b664d6df9abb0f4eed required: true ../tqtc-qtmultimedia: - ref: 776d3febccec82c2808447249286878998cc38d2 + ref: 664195dd282382bedb6e4a062495387eb510e729 required: true ../tqtc-qtremoteobjects: - ref: 1fbb2948a3bdc2fc36fad60ef76cb2062360488e + ref: a93bdba7176d9fca070784aadd60cb53c9918ac3 required: true ../tqtc-qttools: - ref: ea038ff7e138bdeb99588bca25092e2d978e8d8d + ref: ef735b2568bea365f975c7d062474545c00e7da0 required: false -- cgit v1.2.3 From aa8575e2136744a41abf800c39332b4efb321c2e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 5 Mar 2023 20:30:04 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I9cceac658c928826e75def12ed6af37bc88e998b Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 67f49d01..ed0933a2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: b20b2831bd81aff74e0dc4b664d6df9abb0f4eed + ref: 7f04b610cb2c7214e5aba8a1709481dc4c8b306f required: true ../tqtc-qtmultimedia: - ref: 664195dd282382bedb6e4a062495387eb510e729 + ref: ede9835bbbf752366aaab4f14b20e1fb38017814 required: true ../tqtc-qtremoteobjects: - ref: a93bdba7176d9fca070784aadd60cb53c9918ac3 + ref: 5a58390bb32221ad8ea625095ab1dd3995b6721d required: true ../tqtc-qttools: - ref: ef735b2568bea365f975c7d062474545c00e7da0 + ref: 04686425d95e0ec9a02d47d446ae4b9026b922a6 required: false -- cgit v1.2.3 From fcd16187f733577ce334b3af334d21f21b37ec47 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Mar 2023 16:31:36 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I6533a4cdd6a09392975f713dc1441542884fc951 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index ed0933a2..3f9be4e4 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 7f04b610cb2c7214e5aba8a1709481dc4c8b306f + ref: cb0341c1b0797c91cc6d54cb997ce556cc927e4c required: true ../tqtc-qtmultimedia: - ref: ede9835bbbf752366aaab4f14b20e1fb38017814 + ref: 103a0e7c3c96f1d708459239bbbeede8836e59d5 required: true ../tqtc-qtremoteobjects: - ref: 5a58390bb32221ad8ea625095ab1dd3995b6721d + ref: 6dff66498463507f4a46ef5d3a0c7cfe3d97d7ee required: true ../tqtc-qttools: - ref: 04686425d95e0ec9a02d47d446ae4b9026b922a6 + ref: 627b125b78ca26d2b552c41b6f726a87877db6aa required: false -- cgit v1.2.3 From cb2c65a7bc4c460255da2aebe061f288e52e8738 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 13 Mar 2023 09:58:24 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I23da4dabd910572e0d085b234d871280ea1dc911 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 3f9be4e4..d3ccc4bc 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: cb0341c1b0797c91cc6d54cb997ce556cc927e4c + ref: 9b821b49cef736e14722f8473bc23dda1e0d58e0 required: true ../tqtc-qtmultimedia: - ref: 103a0e7c3c96f1d708459239bbbeede8836e59d5 + ref: 44ed1c6aab0d348cb8f799c354d1467966018187 required: true ../tqtc-qtremoteobjects: - ref: 6dff66498463507f4a46ef5d3a0c7cfe3d97d7ee + ref: 8ccda51b736c721729b92171ebd0ebea6308c311 required: true ../tqtc-qttools: - ref: 627b125b78ca26d2b552c41b6f726a87877db6aa + ref: 2f211bc8005a627aa0e6c4bd4cd925ad3f4e1052 required: false -- cgit v1.2.3 From 299169aa3755463d2269d59e423c7dad4d330706 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Mar 2023 22:04:58 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: Ibd93bcf36d9a16574d90fcd64fcbd0a5dd9e62c3 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index d3ccc4bc..d4a4a2a6 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 9b821b49cef736e14722f8473bc23dda1e0d58e0 + ref: e86f1d1c0d10c907ce4463089682c88aec35c66a required: true ../tqtc-qtmultimedia: - ref: 44ed1c6aab0d348cb8f799c354d1467966018187 + ref: e0ebfb321b353556f6fd63db07f379daee1278b0 required: true ../tqtc-qtremoteobjects: - ref: 8ccda51b736c721729b92171ebd0ebea6308c311 + ref: a2b769623ef322e0b213b36f77a802149d465e74 required: true ../tqtc-qttools: - ref: 2f211bc8005a627aa0e6c4bd4cd925ad3f4e1052 + ref: 6ccb958ee449e1858b2aadffeb080b602264cbb6 required: false -- cgit v1.2.3 From 272d10ebddb2ef95e8799e7a88ada5492f8b24f4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 22 Mar 2023 11:16:31 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: Iadbb5b72a9425b32e51b7348c4914809710c4f65 Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index d4a4a2a6..bad508e3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: e86f1d1c0d10c907ce4463089682c88aec35c66a + ref: 8cbb9c512fd17388833b1b77835e7c3991307e30 required: true ../tqtc-qtmultimedia: - ref: e0ebfb321b353556f6fd63db07f379daee1278b0 + ref: 7b7edc41bfcbd0d2a90d584e123e8c76a15689bc required: true ../tqtc-qtremoteobjects: - ref: a2b769623ef322e0b213b36f77a802149d465e74 + ref: 5f87182f0dccf7e76eef38c8bc8ab52d526df784 required: true ../tqtc-qttools: - ref: 6ccb958ee449e1858b2aadffeb080b602264cbb6 + ref: 7215cc2f9f30d2b3e25a6053c2baabe4ad58801f required: false -- cgit v1.2.3 From 8d22f9c9170f6188c81cabff14d61d3896a1a485 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 Mar 2023 08:45:02 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I3506b71f4bcafe3f1cab93aa6cf0ad891dd8884c Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index bad508e3..3fd0a9f3 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 8cbb9c512fd17388833b1b77835e7c3991307e30 + ref: b2b288680ab2bd5a59dd744a5bf17813c7aa6a4b required: true ../tqtc-qtmultimedia: - ref: 7b7edc41bfcbd0d2a90d584e123e8c76a15689bc + ref: 51eba2a7ea3ce03bb7f691ed4bfc83844abfc3f8 required: true ../tqtc-qtremoteobjects: - ref: 5f87182f0dccf7e76eef38c8bc8ab52d526df784 + ref: 47f7022ae33f4bd8df0272411637a91a02519623 required: true ../tqtc-qttools: - ref: 7215cc2f9f30d2b3e25a6053c2baabe4ad58801f + ref: 3456b74b505e4cfc2cc764e5e7093fbc0986e56b required: false -- cgit v1.2.3 From 0f40281c6494937d32d07d2819d40ed5bd09f5a7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 29 Mar 2023 08:19:43 +0000 Subject: Update dependencies on 'tqtc/lts-6.2' in qt/tqtc-qtinterfaceframework Change-Id: I5fa78a0a9d695f755f2dc5dae84e84aa8cb8d4eb Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index 3fd0a9f3..b3c87a26 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: b2b288680ab2bd5a59dd744a5bf17813c7aa6a4b + ref: a7df6331b29e44ed364fcd7297c4e1bc6ce2167c required: true ../tqtc-qtmultimedia: - ref: 51eba2a7ea3ce03bb7f691ed4bfc83844abfc3f8 + ref: 92848e037a6ded98a8bc4485cdad4a239685a342 required: true ../tqtc-qtremoteobjects: - ref: 47f7022ae33f4bd8df0272411637a91a02519623 + ref: ef95cf942559e22ad08a8709db2b622df2bdbee4 required: true ../tqtc-qttools: - ref: 3456b74b505e4cfc2cc764e5e7093fbc0986e56b + ref: ebfc89aa0b6a62a4fe17ed4a97c70518b8332dc1 required: false -- cgit v1.2.3 From e43fe49199e0cb6691d4decd009ad228db5f81b8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 26 Mar 2024 21:51:31 +0000 Subject: Update dependencies on 'tqtc/lts-6.2-opensource' in qt/tqtc-qtinterfaceframework Change-Id: I57090dbc8661ed210de557dc13b0ab0cee36452c Reviewed-by: Qt Submodule Update Bot --- dependencies.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.yaml b/dependencies.yaml index b5b04a2f..7fa8040e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,13 +1,13 @@ dependencies: ../tqtc-qtdeclarative: - ref: 302ab20d46280e11042f3896460c55d8b8146e41 + ref: 9919f58fce6329a233ca885188d0aba5f484e546 required: true ../tqtc-qtmultimedia: - ref: 644e97ff4a0115e9df2579a10367c2649892741f + ref: 34dc084899419ab704703a888dbffe119566eaca required: true ../tqtc-qtremoteobjects: - ref: 0a40b82d2ad0c2ce43946358ccdc9e56d4a386d7 + ref: 62e9b83d59deb21f57f11eba755a45e0555b0df8 required: true ../tqtc-qttools: - ref: 925864c123ba736618af49f4ee0d2ebb25aa403b + ref: 2819de71fc973e79aa9b1e44716636ab194108b1 required: false -- cgit v1.2.3