diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-26 13:17:21 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-30 13:24:11 +0000 |
commit | 03247666ee7e91a65e9230de77f05c35ab39f425 (patch) | |
tree | 44122a2b09456efe7f9351f33311b9da50e882f3 | |
parent | 7e97d360a360da9ee097e5e5d0ec82728b3f76b1 (diff) |
make qtConfOutputVar() a tad less cryptic
don't use variables where the value is known.
Change-Id: I3ec21441c5b7ee0b028f8f72e05d9e40e6192ecf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | mkspecs/features/qt_configure.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index a9e5b00763..726e13f118 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1344,15 +1344,15 @@ defineTest(qtConfOutputVar) { equals(modifier, assign) { !isEmpty(config.output.$${output}.append.$${name})|!isEmpty(config.output.$${output}.remove.$${name}): \ error("Trying to assign variable '$$name' in '$$output', which has already appended or removed parts.") - config.output.$${output}.$${modifier}.$${name} = $$value + config.output.$${output}.assign.$${name} = $$value } else: equals(modifier, append) { contains(config.output.$${output}.remove.$${name}, $$value): \ error("Trying to append removed '$$value' to variable '$$name' in '$$output'.") - config.output.$${output}.$${modifier}.$${name} += $$value + config.output.$${output}.append.$${name} += $$value } else: equals(modifier, remove) { contains(config.output.$${output}.append.$${name}, $$value): \ error("Trying to remove appended '$$value' to variable '$$name' in '$$output'.") - config.output.$${output}.$${modifier}.$${name} += $$value + config.output.$${output}.remove.$${name} += $$value } else { error("Invalid modifier '$$modifier' passed to qtConfOutputVar.") } |