From 09e2fc43ab10e6cdf8a9d9121bf93262f9e6a73e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 16 May 2017 19:40:21 +0200 Subject: [PATCH] fix configure PSQL_*= being ignored make qtConfLibrary_psqlEnv() fall back to qtConfLibrary_inline() if $PSQL_LIBS is not set. Task-number: QTBUG-59521 Change-Id: Ie293e8bfaa3e113ede166243b345833973cc66f8 Reviewed-by: Joerg Bornemann --- src/sql/configure.pri | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/sql/configure.pri b/src/sql/configure.pri index 05794582e9e..9fb957291fd 100644 --- a/src/sql/configure.pri +++ b/src/sql/configure.pri @@ -36,6 +36,9 @@ defineTest(qtConfLibrary_psqlEnv) { !isEmpty(PSQL_LIBS) { $${1}.libs = $$PSQL_LIBS export($${1}.libs) + } else { + !qtConfLibrary_inline($$1): \ + return(false) } return(true) }