aboutsummaryrefslogtreecommitdiffstats
path: root/src/share
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2023-03-15 11:53:32 +0100
committerEike Ziller <eike.ziller@qt.io>2023-04-28 06:55:01 +0000
commitd172e59d6e9e5ef13f47dd1964f86950d35975ea (patch)
treea87f72f84ef91f4c3a375cadc9dd7acdf6c0df23 /src/share
parentb3df7c3cdb10f30a3255a716eec2c6e04f1d1d31 (diff)
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>
Diffstat (limited to 'src/share')
-rw-r--r--src/share/qtcreator/externaltools/lrelease.xml1
-rw-r--r--src/share/qtcreator/externaltools/lupdate.xml1
-rw-r--r--src/share/qtcreator/externaltools/qml.xml1
-rw-r--r--src/share/qtcreator/externaltools/qmlscene.xml1
4 files changed, 4 insertions, 0 deletions
diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml
index deb9aa0132..05ab83e115 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 2e885ef3ed..f0edc35a83 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 ec2cc5a9a7..ee7d5479a7 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 ff8751a7ed..09b780e521 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>