diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-03 12:32:48 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-18 17:10:52 +0000 |
| commit | d90db0f136d727f8e6b9a566eee3eae80cd7d81e (patch) | |
| tree | ff60b68d6e6cb517fa712efc02cd3b266b3aa699 /configure.json | |
| parent | 97b856b78859861f16304debad29889f691d9eb7 (diff) | |
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>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 12 |
1 files changed, 11 insertions, 1 deletions
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", |