From 8861b82f9ef59fa871adc86552012cd90eee6e09 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Date: Thu, 24 Nov 2016 18:41:57 +0100
Subject: move qdevice.pri creation to qmake-based configure system

Change-Id: I06540c3b6d98303bd9a218feedfb529993477ed6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
---
 configure.json | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index 537a6ff526..59358180d0 100644
--- a/configure.json
+++ b/configure.json
@@ -73,7 +73,7 @@
             "debug-and-release": { "type": "boolean", "name": "debug_and_release" },
             "developer-build": "void",
             "device": "string",
-            "device-option": "string",
+            "device-option": "addString",
             "force-asserts": { "type": "boolean", "name": "force_asserts" },
             "force-debug-info": { "type": "boolean", "name": "force_debug_info" },
             "force-pkg-config": { "type": "void", "name": "pkg-config" },
@@ -189,9 +189,9 @@
 
     "testTypeDependencies": {
         "linkerSupportsFlag": [ "use_gold_linker" ],
-        "verifySpec": [ "shared", "use_gold_linker", "compiler-flags", "gcc-sysroot", "qmakeargs" ],
+        "verifySpec": [ "shared", "use_gold_linker", "compiler-flags", "gcc-sysroot", "qmakeargs", "commit" ],
         "compile": [ "verifyspec" ],
-        "detectPkgConfig": [ "cross_compile" ],
+        "detectPkgConfig": [ "cross_compile", "machineTuple" ],
         "library": [ "pkg-config" ],
         "getPkgConfigVariable": [ "pkg-config" ],
         "neon": [ "architecture" ]
@@ -202,6 +202,10 @@
     },
 
     "tests": {
+        "machineTuple": {
+            "label": "machine tuple",
+            "type": "machineTuple"
+        },
         "verifyspec": {
             "label": "valid makespec",
             "type": "verifySpec",
@@ -419,7 +423,14 @@
 
     "features": {
         "prepare": {
-            "output": [ "preparePaths" ]
+            "output": [ "prepareOptions", "preparePaths" ]
+        },
+        "machineTuple": {
+            "condition": "!config.linux || config.android || tests.machineTuple",
+            "output": [ "machineTuple" ]
+        },
+        "commit": {
+            "output": [ "commitOptions" ]
         },
         "android-style-assets": {
             "label": "Android Style Assets",
-- 
cgit v1.2.3