From d172e59d6e9e5ef13f47dd1964f86950d35975ea Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 15 Mar 2023 11:53:32 +0100
Subject: [PATCH] External tools: Fall back to active project's Qt

for the Qt related external tools, if there is no open document with a
project.

Change-Id: I1d059d70e5163921a8d98b6a93224aef1fbf1743
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/share/qtcreator/externaltools/lrelease.xml | 1 +
 src/share/qtcreator/externaltools/lupdate.xml  | 1 +
 src/share/qtcreator/externaltools/qml.xml      | 1 +
 src/share/qtcreator/externaltools/qmlscene.xml | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml
index deb9aa0132c..05ab83e115f 100644
--- a/src/share/qtcreator/externaltools/lrelease.xml
+++ b/src/share/qtcreator/externaltools/lrelease.xml
@@ -11,6 +11,7 @@
     <order>2</order>
     <executable>
         <path>%{CurrentDocument:Project:QT_INSTALL_BINS}/lrelease</path>
+        <path>%{ActiveProject:QT_INSTALL_BINS}/lrelease</path>
         <path>lrelease</path>
         <arguments>%{CurrentDocument:Project:FilePath}</arguments>
         <workingdirectory>%{CurrentDocument:Project:Path}</workingdirectory>
diff --git a/src/share/qtcreator/externaltools/lupdate.xml b/src/share/qtcreator/externaltools/lupdate.xml
index 2e885ef3ed4..f0edc35a833 100644
--- a/src/share/qtcreator/externaltools/lupdate.xml
+++ b/src/share/qtcreator/externaltools/lupdate.xml
@@ -11,6 +11,7 @@
     <order>1</order>
     <executable>
         <path>%{CurrentDocument:Project:QT_INSTALL_BINS}/lupdate</path>
+        <path>%{ActiveProject:QT_INSTALL_BINS}/lupdate</path>
         <path>lupdate</path>
         <arguments>%{CurrentDocument:Project:FilePath}</arguments>
         <workingdirectory>%{CurrentDocument:Project:Path}</workingdirectory>
diff --git a/src/share/qtcreator/externaltools/qml.xml b/src/share/qtcreator/externaltools/qml.xml
index ec2cc5a9a7b..ee7d5479a74 100644
--- a/src/share/qtcreator/externaltools/qml.xml
+++ b/src/share/qtcreator/externaltools/qml.xml
@@ -11,6 +11,7 @@
     <order>1</order>
     <executable>
         <path>%{CurrentDocument:Project:QT_INSTALL_BINS}/qml</path>
+        <path>%{ActiveProject:QT_INSTALL_BINS}/qml</path>
         <path>qml</path>
         <arguments>%{CurrentDocument:FilePath}</arguments>
         <workingdirectory>%{CurrentDocument:Path}</workingdirectory>
diff --git a/src/share/qtcreator/externaltools/qmlscene.xml b/src/share/qtcreator/externaltools/qmlscene.xml
index ff8751a7ed5..09b780e521f 100644
--- a/src/share/qtcreator/externaltools/qmlscene.xml
+++ b/src/share/qtcreator/externaltools/qmlscene.xml
@@ -11,6 +11,7 @@
     <order>1</order>
     <executable>
         <path>%{CurrentDocument:Project:QT_INSTALL_BINS}/qmlscene</path>
+        <path>%{ActiveProject:QT_INSTALL_BINS}/qmlscene</path>
         <path>qmlscene</path>
         <arguments>%{CurrentDocument:FilePath}</arguments>
         <workingdirectory>%{CurrentDocument:Path}</workingdirectory>