Use Module.priority to choose the right cpp module instance

Replace the negating conditions in our cpp instances with module
priorities. This removes the need of knowing about all other more
specialized instances in more general instances.

Change-Id: I511ba11f2cb69ea1458b786a2db4309de8910ebf
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

9 files changed, 11 insertions, 3 deletions

diff --git a/share/qbs/modules/cpp/LinuxGCC.qbs b/share/qbs/modules/cpp/LinuxGCC.qbs
index a25445565..32c45eaad 100644
--- a/share/qbs/modules/cpp/LinuxGCC.qbs
+++ b/share/qbs/modules/cpp/LinuxGCC.qbs
@@ -32,8 +32,9 @@ import qbs 1.0
 import qbs.Process
 
 UnixGCC {
-    condition: qbs.targetOS.contains('linux') && !qbs.targetOS.contains("android") &&
+    condition: qbs.targetOS.contains('linux') &&
                qbs.toolchain && qbs.toolchain.contains('gcc')
+    priority: 1
 
     targetVendor: "pc"
     targetSystem: "linux"
diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs
index a21f56f2a..cc82a5031 100644
--- a/share/qbs/modules/cpp/android-gcc.qbs
+++ b/share/qbs/modules/cpp/android-gcc.qbs
@@ -40,6 +40,7 @@ LinuxGCC {
 
     condition: qbs.targetOS.contains("android") &&
                qbs.toolchain && qbs.toolchain.contains("gcc")
+    priority: 2
     rpaths: ['$ORIGIN']
 
     property string toolchainDir: {
diff --git a/share/qbs/modules/cpp/freebsd-gcc.qbs b/share/qbs/modules/cpp/freebsd-gcc.qbs
index c0106495f..724f242ff 100644
--- a/share/qbs/modules/cpp/freebsd-gcc.qbs
+++ b/share/qbs/modules/cpp/freebsd-gcc.qbs
@@ -34,6 +34,7 @@ import "freebsd.js" as FreeBSD
 UnixGCC {
     condition: qbs.targetOS && qbs.targetOS.contains("freebsd") &&
                qbs.toolchain && qbs.toolchain.contains("gcc")
+    priority: 1
 
     targetSystem: "freebsd" + (qbs.hostOS.contains("freebsd") ? FreeBSD.hostKernelRelease() : "")
 
diff --git a/share/qbs/modules/cpp/genericunix-gcc.qbs b/share/qbs/modules/cpp/genericunix-gcc.qbs
index fa43a3c79..5e6a158c6 100644
--- a/share/qbs/modules/cpp/genericunix-gcc.qbs
+++ b/share/qbs/modules/cpp/genericunix-gcc.qbs
@@ -31,6 +31,6 @@
 import qbs 1.0
 
 UnixGCC {
-    condition: qbs.targetOS && !qbs.targetOS.containsAny(['darwin', 'freebsd', 'linux', 'qnx']) &&
-               qbs.toolchain && qbs.toolchain.contains('gcc') && !qbs.toolchain.contains('mingw')
+    condition: qbs.targetOS && qbs.targetOS.contains("unix") &&
+               qbs.toolchain && qbs.toolchain.contains('gcc')
 }
diff --git a/share/qbs/modules/cpp/ios-gcc.qbs b/share/qbs/modules/cpp/ios-gcc.qbs
index 12f3907b6..408bc3aec 100644
--- a/share/qbs/modules/cpp/ios-gcc.qbs
+++ b/share/qbs/modules/cpp/ios-gcc.qbs
@@ -36,6 +36,7 @@ import qbs.ModUtils
 import qbs.Utilities
 
 DarwinGCC {
+    priority: 1
     condition: qbs.targetOS.contains('ios') &&
                qbs.toolchain && qbs.toolchain.contains('gcc')
 
diff --git a/share/qbs/modules/cpp/macos-gcc.qbs b/share/qbs/modules/cpp/macos-gcc.qbs
index bb1f79054..e2c930c80 100644
--- a/share/qbs/modules/cpp/macos-gcc.qbs
+++ b/share/qbs/modules/cpp/macos-gcc.qbs
@@ -33,6 +33,7 @@ import qbs.ModUtils
 import qbs.Utilities
 
 DarwinGCC {
+    priority: 1
     condition: qbs.targetOS.contains('macos') &&
                qbs.toolchain && qbs.toolchain.contains('gcc')
 
diff --git a/share/qbs/modules/cpp/qnx-qcc.qbs b/share/qbs/modules/cpp/qnx-qcc.qbs
index 7fcd16548..ade6bba78 100644
--- a/share/qbs/modules/cpp/qnx-qcc.qbs
+++ b/share/qbs/modules/cpp/qnx-qcc.qbs
@@ -36,6 +36,7 @@ UnixGCC {
 
     condition: qbs.targetOS.contains("qnx") &&
                qbs.toolchain && qbs.toolchain.contains("qcc")
+    priority: 1
 
     distributionIncludePaths: FileInfo.joinPaths(qnx.targetDir, "usr", "include")
 
diff --git a/share/qbs/modules/cpp/tvos-gcc.qbs b/share/qbs/modules/cpp/tvos-gcc.qbs
index d3d7f0a3c..ae4dd5c5b 100644
--- a/share/qbs/modules/cpp/tvos-gcc.qbs
+++ b/share/qbs/modules/cpp/tvos-gcc.qbs
@@ -31,6 +31,7 @@
 import qbs
 
 DarwinGCC {
+    priority: 1
     condition: qbs.targetOS.contains('tvos') &&
                qbs.toolchain && qbs.toolchain.contains('gcc')
 
diff --git a/share/qbs/modules/cpp/watchos-gcc.qbs b/share/qbs/modules/cpp/watchos-gcc.qbs
index c3edd86a5..c8bd0a55d 100644
--- a/share/qbs/modules/cpp/watchos-gcc.qbs
+++ b/share/qbs/modules/cpp/watchos-gcc.qbs
@@ -32,6 +32,7 @@
 import qbs
 
 DarwinGCC {
+    priority: 1
     condition: qbs.targetOS.contains('watchos') &&
                qbs.toolchain && qbs.toolchain.contains('gcc')