diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-28 15:47:52 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-28 15:47:52 +0200 |
| commit | 811edc5952caf265a4c56b52933165830838dab1 (patch) | |
| tree | 787ef28916e4799083aa1b7e0d5076a35d130eca /src/app | |
| parent | 40787b4d077eea1211f43d9f247c560957bd6887 (diff) | |
| parent | 0f647796788494947632c0874931e4d84bccad46 (diff) | |
Merge 1.9 into master
Change-Id: I5320b7c62d6a80089df75c2caca79c15602c01e5
Diffstat (limited to 'src/app')
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"] + } } |