diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /src/sql | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'src/sql')
| -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) } |