From d90db0f136d727f8e6b9a566eee3eae80cd7d81e Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Wed, 3 Aug 2016 12:32:48 +0200
Subject: rewrite makespec verification with qmake based system

cleaner, and covers windows as well.

Change-Id: I0e884909a3f49610fab750ba1ef6112f43e5d5d1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
---
 configure.json | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'configure.json')

diff --git a/configure.json b/configure.json
index 5874d8abaa..181fe8aa09 100644
--- a/configure.json
+++ b/configure.json
@@ -785,7 +785,8 @@
 
     "testTypeDependencies": {
         "linkerSupportsFlag": [ "use_gold_linker" ],
-        "compile": [ "shared", "use_gold_linker", "compiler-flags", "gcc-sysroot", "qmakeargs" ],
+        "verifySpec": [ "shared", "use_gold_linker", "compiler-flags", "gcc-sysroot", "qmakeargs" ],
+        "compile": [ "verifyspec" ],
         "detectPkgConfig": [ "cross_compile" ],
         "library": [ "pkg-config" ],
         "getPkgConfigVariable": [ "pkg-config" ],
@@ -800,6 +801,11 @@
     },
 
     "tests": {
+        "verifyspec": {
+            "description": "valid makespec",
+            "type": "verifySpec",
+            "test": "common/verifyspec"
+        },
         "architecture": {
             "description": "target architecture",
             "type": "architecture",
@@ -1301,6 +1307,10 @@
                 "pkgConfig"
             ]
         },
+        "verifyspec": {
+            "description": "Have valid makespec",
+            "condition": "tests.verifyspec"
+        },
 
         "developer-build": {
             "description": "Developer build",
-- 
cgit v1.2.1