aboutsummaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorIvan Komissarov <abbapoh@gmail.com>2020-01-05 14:48:16 +0300
committerIvan Komissarov <ABBAPOH@gmail.com>2020-01-14 14:18:41 +0000
commit7c31d4d375cff51b1f1318a05c7ded11c263448d (patch)
tree44049145078c7ca4e35b4e6accd60c36c5c1d9b7 /share
parent07a153da3958c96060b28a2fa376f035fe33a003 (diff)
Use an empty array for the qbs.targetOS if targetPlatform is undefined
Change-Id: I4bc1ff7cacb606e4baa9f2bfe59b8dca1b88e434 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
-rw-r--r--share/qbs/modules/cpp/UnixGCC.qbs2
-rw-r--r--share/qbs/modules/cpp/freebsd-gcc.qbs2
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/cpp/UnixGCC.qbs b/share/qbs/modules/cpp/UnixGCC.qbs
index e5b99cd98..68eacea3f 100644
--- a/share/qbs/modules/cpp/UnixGCC.qbs
+++ b/share/qbs/modules/cpp/UnixGCC.qbs
@@ -32,7 +32,7 @@ import qbs.File
GenericGCC {
condition: qbs.toolchain && qbs.toolchain.contains("gcc")
- && qbs.targetOS && qbs.targetOS.contains("unix")
+ && qbs.targetOS.contains("unix")
priority: -50
staticLibraryPrefix: "lib"
diff --git a/share/qbs/modules/cpp/freebsd-gcc.qbs b/share/qbs/modules/cpp/freebsd-gcc.qbs
index b5a4b89f3..929c4e557 100644
--- a/share/qbs/modules/cpp/freebsd-gcc.qbs
+++ b/share/qbs/modules/cpp/freebsd-gcc.qbs
@@ -31,7 +31,7 @@
import "freebsd.js" as FreeBSD
UnixGCC {
- condition: qbs.targetOS && qbs.targetOS.contains("freebsd") &&
+ condition: qbs.targetOS.contains("freebsd") &&
qbs.toolchain && qbs.toolchain.contains("gcc")
priority: 1