From 9c76047b076ef143a0bb53f4d41d5071a3f509ed Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Mon, 27 Apr 2020 13:24:19 +0200
Subject: [PATCH] Instruction selection fix for qemu cross-builds

When building for qemu, the target "os" is still set to Linux, so try to
detect qemu by looking at the version field.

Change-Id: I7c66cdb29a47a44d5b8a394977136139fc646155
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
---
 .../coin_module_build_template_v2.yaml        | 22 ++++++++++++++-----
 .../coin_qtbase_build_template_v2.yaml        | 22 ++++++++++++++-----
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/coin/instructions/coin_module_build_template_v2.yaml b/coin/instructions/coin_module_build_template_v2.yaml
index a05b4ba915..8fa5729590 100644
--- a/coin/instructions/coin_module_build_template_v2.yaml
+++ b/coin/instructions/coin_module_build_template_v2.yaml
@@ -6,13 +6,23 @@ instructions:
       - !include "{{qt/qtbase}}/cmake_module_build_instructions.yaml"
       - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
     enable_if:
-      condition: property
-      property: host.os
-      equals_property: target.os
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_property: target.os
+        - condition: property
+          property: target.osVersion
+          not_equals_value: QEMU
   - type: Group
     instructions:
       - !include "{{qt/qtbase}}/cmake_cross_compilation_module_build_instructions.yaml"
     disable_if:
-      condition: property
-      property: host.os
-      equals_property: target.os
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_property: target.os
+        - condition: property
+          property: target.osVersion
+          not_equals_value: QEMU
diff --git a/coin/instructions/coin_qtbase_build_template_v2.yaml b/coin/instructions/coin_qtbase_build_template_v2.yaml
index de7a5b8e11..433b326e25 100644
--- a/coin/instructions/coin_qtbase_build_template_v2.yaml
+++ b/coin/instructions/coin_qtbase_build_template_v2.yaml
@@ -6,13 +6,23 @@ instructions:
       - !include "{{qt/qtbase}}/cmake_qtbase_build_instructions.yaml"
       - !include "{{qt/qtbase}}/cmake_build_and_upload_test_artifacts.yaml"
     enable_if:
-      condition: property
-      property: host.os
-      equals_property: target.os
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_property: target.os
+        - condition: property
+          property: target.osVersion
+          not_equals_value: QEMU
   - type: Group
     instructions:
       - !include "{{qt/qtbase}}/cmake_cross_compilation_qtbase_build_instructions.yaml"
     disable_if:
-      condition: property
-      property: host.os
-      equals_property: target.os
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_property: target.os
+        - condition: property
+          property: target.osVersion
+          not_equals_value: QEMU