From aaa3fda1adaaa61ee7f075026ba3e92a6f1ee66e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kai=20K=C3=B6hne?= <kai.koehne@qt.io>
Date: Wed, 10 Mar 2021 11:22:43 +0100
Subject: [PATCH] Adapt locations of rcc and uic for Qt 6.1

They are now found in libexec, not bin.

Task-number: QTBUG-88791
Change-Id: I34a13034833117f2360fdbbf41c54bbf2cfb55da
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/plugins/qtsupport/baseqtversion.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 7b3fd99d118..c2d37968b25 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -1040,11 +1040,16 @@ QString BaseQtVersionPrivate::findHostBinary(HostBinaries binary) const
         switch (binary) {
         case Designer:
         case Linguist:
-        case Rcc:
-        case Uic:
         case QScxmlc:
             baseDir = q->hostBinPath().toString();
             break;
+        case Rcc:
+        case Uic:
+            if (q->qtVersion() >= QtVersionNumber(6, 1))
+                baseDir = q->hostLibexecPath().toString();
+            else
+                baseDir = q->hostBinPath().toString();
+            break;
         default:
             // Can't happen
             Q_ASSERT(false);