diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-11-16 15:13:52 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-13 18:56:34 +0000 |
| commit | ab0cc3055d3d1f0faa98f96a7e8ae58b6ef6461a (patch) | |
| tree | ba14bef85165e3dadaac1b46f5c6cd8a734ececf /configure.json | |
| parent | 8861b82f9ef59fa871adc86552012cd90eee6e09 (diff) | |
move all target spec handling to qmake-based configure system
we pull this feat off by booting configure with a dummy spec. the proper
spec gets loaded subsequently.
note that it was necessary to move the cache loading after processing
the early checks (from which the spec handling is triggered). this is
just fine, as the cache is needed only by tests, which are forbidden at
this stage by definition.
Change-Id: I5120e25a8bf05fb8cc5485fd93cf6387301089aa
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'configure.json')
| -rw-r--r-- | configure.json | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/configure.json b/configure.json index 59358180d0..77f956ed1a 100644 --- a/configure.json +++ b/configure.json @@ -423,7 +423,7 @@ "features": { "prepare": { - "output": [ "prepareOptions", "preparePaths" ] + "output": [ "prepareSpec", "prepareOptions", "preparePaths" ] }, "machineTuple": { "condition": "!config.linux || config.android || tests.machineTuple", @@ -984,6 +984,11 @@ "earlyReport": [ { + "type": "fatal", + "condition": "input.xplatform != '' && input.device != ''", + "message": "Cannot specify both -xplatform and -device." + }, + { "condition": "!features.prepare", "comment": "This is not an actual report - instead, it activates the early setup." }, |