From 4e5af88a8c82620700ef47401c3e10b4db66f9dc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 26 Jul 2017 10:48:21 +0200 Subject: [PATCH] configure: fix detection of icu in static build don't complain about library inline sources which have 'builds' but no 'libs'. Task-number: QTBUG-62150 Change-Id: Ib215d438fc02ebdafde95f31cd48088b1bafc663 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_configure.prf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index dd96fb19366..afeb4f3d1d0 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -492,8 +492,8 @@ defineTest(qtConfSetupLibraries) { # overrides from the command line are accepted. defineTest(qtConfLibrary_inline) { lib = $$eval($${1}.library) - !defined($${1}.libs, var): \ - error("'inline' source in library '$$lib' does not specify 'libs'.") + !defined($${1}.libs, var):isEmpty($${1}.builds._KEYS_): \ + error("'inline' source in library '$$lib' specifies neither 'libs' nor 'builds'.") # if multiple libraries provide the same export, it makes sense # to make them recognize the same input variables.