aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2020-07-16 14:39:49 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2020-08-06 14:23:29 +0000
commit1d9803b7f69454ee13b1fa06d34616282a92d995 (patch)
tree8d6c1c9e2f6007d6533cba3b1edcac464d74ad5f /src
parent2ebe1e5bf9c8cc2f4b97a1cf8a1edc97257de15f (diff)
Fix MinGW build
Change-Id: I9894098b05004bb99273e091e3d1821f88d7c4af Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/app/qbs-setup-android/qbs-setup-android.qbs7
-rw-r--r--src/app/qbs-setup-qt/qbs-setup-qt.qbs7
-rw-r--r--src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs7
3 files changed, 18 insertions, 3 deletions
diff --git a/src/app/qbs-setup-android/qbs-setup-android.qbs b/src/app/qbs-setup-android/qbs-setup-android.qbs
index edadd5dd1..949c07c45 100644
--- a/src/app/qbs-setup-android/qbs-setup-android.qbs
+++ b/src/app/qbs-setup-android/qbs-setup-android.qbs
@@ -12,6 +12,11 @@ QbsApp {
Group {
name: "MinGW specific files"
condition: qbs.toolchain.contains("mingw")
- files: ["qbs-setup-android.exe.manifest", "qbs-setup-android.rc"]
+ files: "qbs-setup-android.rc"
+ Group {
+ name: "qbs-setup-android manifest"
+ files: "qbs-setup-android.exe.manifest"
+ fileTags: [] // the manifest is referenced by the rc file
+ }
}
}
diff --git a/src/app/qbs-setup-qt/qbs-setup-qt.qbs b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
index f4cd9d6b8..44f2b7f05 100644
--- a/src/app/qbs-setup-qt/qbs-setup-qt.qbs
+++ b/src/app/qbs-setup-qt/qbs-setup-qt.qbs
@@ -12,7 +12,12 @@ QbsApp {
Group {
name: "MinGW specific files"
condition: qbs.toolchain.contains("mingw")
- files: ["qbs-setup-qt.exe.manifest", "qbs-setup-qt.rc"]
+ files: "qbs-setup-qt.rc"
+ Group {
+ name: "qbs-setup-qt manifest"
+ files: "qbs-setup-qt.exe.manifest"
+ fileTags: [] // the manifest is referenced by the rc file
+ }
}
}
diff --git a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
index 554891fc4..3bc72700f 100644
--- a/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
+++ b/src/app/qbs-setup-toolchains/qbs-setup-toolchains.qbs
@@ -27,6 +27,11 @@ QbsApp {
Group {
name: "MinGW specific files"
condition: qbs.toolchain.contains("mingw")
- files: ["qbs-setup-toolchains.exe.manifest", "qbs-setup-toolchains.rc"]
+ files: "qbs-setup-toolchains.rc"
+ Group {
+ name: "qbs-setup-toolchains manifest"
+ files: "qbs-setup-toolchains.exe.manifest"
+ fileTags: [] // the manifest is referenced by the rc file
+ }
}
}