diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-28 15:53:02 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-01-29 10:43:58 +0100 |
commit | de095ff2d4f36b9cf5145f77bcb74592a0886592 (patch) | |
tree | d02513c2e091e497e6fd6ee5557b6029a6b51111 /src/app | |
parent | ddae0a77130e4264fd543aa1cb1a8c8e52dfe644 (diff) |
make the MinGW build of setup-qt work for non-admin users
We now embed a manifest in the MinGW build of qbs-setup-qt.
Task-number: QBS-275
Change-Id: Id984987a57850c0aed23a7c6852c15e447a2f096
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/qbs-setup-qt/qbs-setup-qt.exe.manifest | 13 | ||||
-rw-r--r-- | src/app/qbs-setup-qt/qbs-setup-qt.pro | 4 | ||||
-rw-r--r-- | src/app/qbs-setup-qt/qbs-setup-qt.qbs | 5 | ||||
-rw-r--r-- | src/app/qbs-setup-qt/qbs-setup-qt.rc | 4 |
4 files changed, 26 insertions, 0 deletions
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.exe.manifest b/src/app/qbs-setup-qt/qbs-setup-qt.exe.manifest new file mode 100644 index 000000000..a0b8dbac3 --- /dev/null +++ b/src/app/qbs-setup-qt/qbs-setup-qt.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-qt 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-qt/qbs-setup-qt.pro b/src/app/qbs-setup-qt/qbs-setup-qt.pro index 3f2cb8e06..2b87c04e2 100644 --- a/src/app/qbs-setup-qt/qbs-setup-qt.pro +++ b/src/app/qbs-setup-qt/qbs-setup-qt.pro @@ -10,3 +10,7 @@ SOURCES += \ HEADERS += \ setupqt.h \ ../shared/qbssettings.h + +mingw { + RC_FILE = qbs-setup-qt.rc +} diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.qbs b/src/app/qbs-setup-qt/qbs-setup-qt.qbs index 35de5aa7f..b432cd1f7 100644 --- a/src/app/qbs-setup-qt/qbs-setup-qt.qbs +++ b/src/app/qbs-setup-qt/qbs-setup-qt.qbs @@ -10,5 +10,10 @@ QbsApp { "setupqt.cpp", "setupqt.h" ] + Group { + name: "MinGW specific files" + condition: qbs.toolchain.contains("mingw") + files: ["qbs-setup-qt.rc"] + } } diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.rc b/src/app/qbs-setup-qt/qbs-setup-qt.rc new file mode 100644 index 000000000..ad2507e49 --- /dev/null +++ b/src/app/qbs-setup-qt/qbs-setup-qt.rc @@ -0,0 +1,4 @@ +#define RT_MANIFEST 24 +#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1 + +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "qbs-setup-qt.exe.manifest" |