summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2017-07-26 10:48:21 +0200
committerSimon Hausmann <simon.hausmann@qt.io>2017-08-15 10:55:35 +0000
commit4e5af88a8c82620700ef47401c3e10b4db66f9dc (patch)
tree0f3bb5d92c904ac41600fdd16e75ab577fcfa895 /mkspecs
parentad70f2ed20406775e3044c1d22528049b81b9c73 (diff)
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 <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/qt_configure.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf
index dd96fb1936..afeb4f3d1d 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.