Add Windows UAC fix to qbs-setup-android and qbs-setup-toolchains

It was only applied to qbs-setup-qt, but missing from the others.

Change-Id: I3f2dd63c717d9117a8699fc76bac93e573cad60c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>

4 files changed, 27 insertions, 0 deletions

diff --git a/src/app/qbs-setup-android/qbs-setup-android.exe.manifest b/src/app/qbs-setup-android/qbs-setup-android.exe.manifest
new file mode 100644
index 000000000..6b425b152
--- /dev/null
+++ b/src/app/qbs-setup-android/qbs-setup-android.exe.manifest
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <!-- Make sure Windows UAC does not believe qbs-setup-android is an installer. -->
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
+    <security>
+      <requestedPrivileges>
+        <requestedExecutionLevel
+          level="asInvoker"
+          uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>
diff --git a/src/app/qbs-setup-android/qbs-setup-android.qbs b/src/app/qbs-setup-android/qbs-setup-android.qbs
index 0eb67f9c5..edadd5dd1 100644
--- a/src/app/qbs-setup-android/qbs-setup-android.qbs
+++ b/src/app/qbs-setup-android/qbs-setup-android.qbs
@@ -9,4 +9,9 @@ QbsApp {
         "commandlineparser.h",
         "main.cpp",
     ]
+    Group {
+        name: "MinGW specific files"
+        condition: qbs.toolchain.contains("mingw")
+        files: ["qbs-setup-android.exe.manifest", "qbs-setup-android.rc"]
+    }
 }
diff --git a/src/app/qbs-setup-android/qbs-setup-android.rc b/src/app/qbs-setup-android/qbs-setup-android.rc
new file mode 100644
index 000000000..20cd1ab11
--- /dev/null
+++ b/src/app/qbs-setup-android/qbs-setup-android.rc
@@ -0,0 +1,4 @@
+#define RT_MANIFEST 24
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "qbs-setup-android.exe.manifest"
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
index 3536b51db..1b7cb6526 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
@@ -14,4 +14,9 @@ QbsApp {
         "xcodeprobe.cpp",
         "xcodeprobe.h",
     ]
+    Group {
+        name: "MinGW specific files"
+        condition: qbs.toolchain.contains("mingw")
+        files: ["qbs-setup-toolchains.exe.manifest", "qbs-setup-toolchains.rc"]
+    }
 }