diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-04-01 09:16:33 +0300 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-04-01 09:16:33 +0300 |
| commit | 18e4cf290048726933bb5cf487e947e65b3550a6 (patch) | |
| tree | 9e5024b21dbc18cfb8740fc3cda07804aa1470a4 /src/plugins/sqldrivers/configure.pri | |
| parent | ae5db669e8989fe793949346d8061c67e5ec31cd (diff) | |
| parent | 9e97d64ccd27adcb2053c90cfbcafaef68e53893 (diff) | |
Merge 5.12 into 5.12.3
Change-Id: I76905e3540585c3be221b89453c725828b05940b
Diffstat (limited to 'src/plugins/sqldrivers/configure.pri')
| -rw-r--r-- | src/plugins/sqldrivers/configure.pri | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/sqldrivers/configure.pri b/src/plugins/sqldrivers/configure.pri index 84c8114c7b..be6a930e52 100644 --- a/src/plugins/sqldrivers/configure.pri +++ b/src/plugins/sqldrivers/configure.pri @@ -2,7 +2,7 @@ defineTest(qtConfLibrary_psqlConfig) { pg_config = $$config.input.psql_config - isEmpty(pg_config): \ + isEmpty(pg_config):!cross_compile: \ pg_config = $$qtConfFindInPath("pg_config") !win32:!isEmpty(pg_config) { qtRunLoggedCommand("$$pg_config --libdir", libdir)|return(false) @@ -33,7 +33,7 @@ defineTest(qtConfLibrary_psqlEnv) { defineTest(qtConfLibrary_mysqlConfig) { mysql_config = $$config.input.mysql_config - isEmpty(mysql_config): \ + isEmpty(mysql_config):!cross_compile: \ mysql_config = $$qtConfFindInPath("mysql_config") !isEmpty(mysql_config) { qtRunLoggedCommand("$$mysql_config --version", version)|return(false) |