From e1cdda71f61c57bd615eb82217652dc7a55d7d48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daschuer@mixxx.org>
Date: Wed, 10 May 2023 01:58:41 +0200
Subject: [PATCH] [qttools] copy traget tools only if they exists. (#30442)

They do not exist if you crosscompile qt
---
 ports/qttools/portfile.cmake | 9 ++++++---
 ports/qttools/vcpkg.json     | 1 +
 versions/baseline.json       | 2 +-
 versions/q-/qttools.json     | 5 +++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ports/qttools/portfile.cmake b/ports/qttools/portfile.cmake
index e42f50ef46..bb46599a62 100644
--- a/ports/qttools/portfile.cmake
+++ b/ports/qttools/portfile.cmake
@@ -98,9 +98,12 @@ if(VCPKG_TARGET_IS_OSX)
         list(APPEND OSX_APP_FOLDERS qdbusviewer.app)
     endif()
     foreach(_appfolder IN LISTS OSX_APP_FOLDERS)
-        message(STATUS "Moving: ${_appfolder}")
-        file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}")
-        file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/")
+        # Folders are only existing in case of native builds 
+        if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}")
+            message(STATUS "Moving: ${_appfolder}")
+            file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}")
+            file(RENAME "${CURRENT_PACKAGES_DIR}/bin/${_appfolder}/" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/${_appfolder}/")
+        endif()    
     endforeach()
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
diff --git a/ports/qttools/vcpkg.json b/ports/qttools/vcpkg.json
index 849875d76b..4d3aba0551 100644
--- a/ports/qttools/vcpkg.json
+++ b/ports/qttools/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "qttools",
   "version": "6.5.0",
+  "port-version": 1,
   "description": "Qt Tools",
   "homepage": "https://www.qt.io/",
   "license": null,
diff --git a/versions/baseline.json b/versions/baseline.json
index e4e22d302e..b58292a28d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6798,7 +6798,7 @@
     },
     "qttools": {
       "baseline": "6.5.0",
-      "port-version": 0
+      "port-version": 1
     },
     "qttranslations": {
       "baseline": "6.5.0",
diff --git a/versions/q-/qttools.json b/versions/q-/qttools.json
index 08e13092e4..02c8cfb38d 100644
--- a/versions/q-/qttools.json
+++ b/versions/q-/qttools.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "98c6a3ef4410b89a77895592986355c43674a881",
+      "version": "6.5.0",
+      "port-version": 1
+    },
     {
       "git-tree": "1e559212d2b8a05e7e59a21a6fd035e7f0e05347",
       "version": "6.5.0",