Merge remote-tracking branch 'origin/5.12' into 5.12.1

 Conflicts:
	src/widgets/kernel/qtooltip.cpp

Change-Id: Ic2f9a425359050eb56b3a4e5162cf5e3447058c8

1 files changed, 2 insertions, 2 deletions

diff --git a/src/plugins/sqldrivers/configure.pri b/src/plugins/sqldrivers/configure.pri
index 747a47e7b8..84c8114c7b 100644
--- a/src/plugins/sqldrivers/configure.pri
+++ b/src/plugins/sqldrivers/configure.pri
@@ -9,7 +9,7 @@ defineTest(qtConfLibrary_psqlConfig) {
         !qtConfResolvePathLibs($${1}.libs, $$libdir, -lpq): \
             return(false)
         qtRunLoggedCommand("$$pg_config --includedir", includedir)|return(false)
-        !qtConfResolvePathIncs($${1}.includedir, $$includedir): \
+        !qtConfResolvePathIncs($${1}.includedir, $$includedir, $$2): \
             return(false)
         return(true)
     }
@@ -63,7 +63,7 @@ defineTest(qtConfLibrary_mysqlConfig) {
         includedir =
         for (id, rawincludedir): \
             includedir += $$clean_path($$id)
-        !qtConfResolvePathIncs($${1}.includedir, $$includedir): \
+        !qtConfResolvePathIncs($${1}.includedir, $$includedir, $$2): \
             return(false)
         return(true)
     }