1 files changed, 20 insertions, 34 deletions
diff --git a/src/plugins/sqldrivers/configure.pri b/src/plugins/sqldrivers/configure.pri
index 24954e9514..be6a930e52 100644
--- a/src/plugins/sqldrivers/configure.pri
+++ b/src/plugins/sqldrivers/configure.pri
@@ -1,29 +1,16 @@
 # custom tests
 
-defineReplace(filterLibraryPath) {
-    str = $${1}
-    for (l, QMAKE_DEFAULT_LIBDIRS): \
-        str -= "-L$$l"
-
-    return($$str)
-}
-
 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)
+        !qtConfResolvePathLibs($${1}.libs, $$libdir, -lpq): \
+            return(false)
         qtRunLoggedCommand("$$pg_config --includedir", includedir)|return(false)
-        libdir -= $$QMAKE_DEFAULT_LIBDIRS
-        libs =
-        !isEmpty(libdir): libs += "-L$$libdir"
-        libs += "-lpq"
-        $${1}.libs = $$libs
-        includedir -= $$QMAKE_DEFAULT_INCDIRS
-        $${1}.includedir = $$includedir
-        export($${1}.libs)
-        export($${1}.includedir)
+        !qtConfResolvePathIncs($${1}.includedir, $$includedir, $$2): \
+            return(false)
         return(true)
     }
     qtLog("pg_config not found.")
@@ -34,8 +21,9 @@ defineTest(qtConfLibrary_psqlEnv) {
     # Respect PSQL_LIBS if set
     PSQL_LIBS = $$getenv(PSQL_LIBS)
     !isEmpty(PSQL_LIBS) {
-        eval($${1}.libs = $$PSQL_LIBS)
-        export($${1}.libs)
+        eval(libs = $$PSQL_LIBS)
+        !qtConfResolveLibs($${1}.libs, $$libs): \
+            return(false)
     } else {
         !qtConfLibrary_inline($$1, $$2): \
             return(false)
@@ -45,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)
@@ -58,7 +46,6 @@ defineTest(qtConfLibrary_mysqlConfig) {
         qtRunLoggedCommand("$$mysql_config $$query", libs)|return(false)
         qtRunLoggedCommand("$$mysql_config --include", includedir)|return(false)
         eval(libs = $$libs)
-        libs = $$filterLibraryPath($$libs)
         # -rdynamic should not be returned by mysql_config, but is on RHEL 6.6
         libs -= -rdynamic
         equals($${1}.cleanlibs, true) {
@@ -69,16 +56,15 @@ defineTest(qtConfLibrary_mysqlConfig) {
             }
             libs = $$cleanlibs
         }
-        $${1}.libs = $$libs
+        !qtConfResolveLibs($${1}.libs, $$libs): \
+            return(false)
         eval(rawincludedir = $$includedir)
         rawincludedir ~= s/^-I//g
         includedir =
         for (id, rawincludedir): \
             includedir += $$clean_path($$id)
-        includedir -= $$QMAKE_DEFAULT_INCDIRS
-        $${1}.includedir = $$includedir
-        export($${1}.libs)
-        export($${1}.includedir)
+        !qtConfResolvePathIncs($${1}.includedir, $$includedir, $$2): \
+            return(false)
         return(true)
     }
     qtLog("mysql_config not found.")
@@ -86,14 +72,14 @@ defineTest(qtConfLibrary_mysqlConfig) {
 }
 
 defineTest(qtConfLibrary_sybaseEnv) {
-    libs =
+    libdir =
     sybase = $$getenv(SYBASE)
     !isEmpty(sybase): \
-        libs += "-L$${sybase}/lib"
-    eval(libs += $$getenv(SYBASE_LIBS))
-    !isEmpty(libs) {
-        $${1}.libs = $$libs
-        export($${1}.libs)
-    }
+        libdir += $${sybase}/lib
+    eval(libs = $$getenv(SYBASE_LIBS))
+    isEmpty(libs): \
+        libs = $$eval($${1}.libs)
+    !qtConfResolvePathLibs($${1}.libs, $$libdir, $$libs): \
+        return(false)
     return(true)
 }