1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configure: fix detection of icu in static build

Browse Source 
don't complain about library inline sources which have 'builds' but no
'libs'.

Task-number: QTBUG-62150
Change-Id: Ib215d438fc02ebdafde95f31cd48088b1bafc663
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Oswald Buddenhagen 2017-07-26 10:48:21 +02:00 committed by Simon Hausmann
parent ad70f2ed20
commit 4e5af88a8c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/features/qt_configure.prf
View File

@ -492,8 +492,8 @@ defineTest(qtConfSetupLibraries) {
# overrides from the command line are accepted. # overrides from the command line are accepted.
defineTest(qtConfLibrary_inline) { defineTest(qtConfLibrary_inline) {
lib = $$eval($${1}.library) lib = $$eval($${1}.library)
!defined($${1}.libs, var): \ !defined($${1}.libs, var):isEmpty($${1}.builds._KEYS_): \
error("'inline' source in library '$$lib' does not specify 'libs'.") error("'inline' source in library '$$lib' specifies neither 'libs' nor 'builds'.")
# if multiple libraries provide the same export, it makes sense # if multiple libraries provide the same export, it makes sense
# to make them recognize the same input variables. # to make them recognize the same input variables.