diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-16 19:40:21 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-05-31 12:57:19 +0000 |
| commit | 09e2fc43ab10e6cdf8a9d9121bf93262f9e6a73e (patch) | |
| tree | ca078e50bc8eb168cd9ed9bae1760cfd136ad0d4 /src | |
| parent | 5afde92bd76421a49b9eb76e6071b32fd3ca41df (diff) | |
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 <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/sql/configure.pri | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/sql/configure.pri b/src/sql/configure.pri index 05794582e9..9fb957291f 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) } |