From b754b2815d342334f335816b901c051940954942 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 26 Aug 2016 21:10:56 +0200 Subject: 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 --- configure.pri | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'configure.pri') 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") -- cgit v1.2.3