diff options
author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-26 21:10:56 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-09-15 08:24:00 +0000 |
commit | b754b2815d342334f335816b901c051940954942 (patch) | |
tree | 8c51eb3d20a19ca558de24c6a86816cf1ced5562 /configure.pri | |
parent | 2d3c73fcfe7a93cb46190e8e82410fe93145dbe0 (diff) |
rename description => label in configure.json
"description" suggests something slightly longer.
this may seem like a gratuitous change, but the upcoming replacement of
the old feature system clarifies makes it seem much less so.
Change-Id: Ibe702e01cb146b59127bf1f990b4acaef1c61d55
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.pri')
-rw-r--r-- | configure.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index d68c7dcf7b..e20ccd8bf4 100644 --- a/configure.pri +++ b/configure.pri @@ -66,7 +66,7 @@ defineReplace(qtConfFunc_crossCompile) { defineTest(qtConfTest_architecture) { !qtConfTest_compile($${1}): \ - error("Could not determine $$eval($${1}.description). See config.log for details.") + error("Could not determine $$eval($${1}.label). See config.log for details.") test = $$eval($${1}.test) test_out_dir = $$shadowed($$QMAKE_CONFIG_TESTS_DIR/$$test) @@ -77,13 +77,13 @@ defineTest(qtConfTest_architecture) { else: android:exists($$test_out_dir/libarch.so): \ content = $$cat($$test_out_dir/libarch.so, blob) else: \ - error("$$eval($${1}.description) detection binary not found.") + error("$$eval($${1}.label) detection binary not found.") arch_magic = ".*==Qt=magic=Qt== Architecture:([^\\0]*).*" subarch_magic = ".*==Qt=magic=Qt== Sub-architecture:([^\\0]*).*" !contains(content, $$arch_magic)|!contains(content, $$subarch_magic): \ - error("$$eval($${1}.description) detection binary does not contain expected data.") + error("$$eval($${1}.label) detection binary does not contain expected data.") $${1}.arch = $$replace(content, $$arch_magic, "\\1") $${1}.subarch = $$replace(content, $$subarch_magic, "\\1") |