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

Also blacklist tst_QRawFont::unsupportedWritingSystem() and
tst_QGlyphRun::mixedScripts() on windows for now.

 Conflicts:
	qmake/generators/makefile.cpp
	src/corelib/itemmodels/qstringlistmodel.cpp
	src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h
	tests/auto/corelib/itemmodels/qstringlistmodel/tst_qstringlistmodel.cpp
	tests/auto/gui/text/qglyphrun/BLACKLIST
	tests/auto/gui/text/qrawfont/BLACKLIST

Task-number: QTBUG-72836
Change-Id: I10fea1493f0ae1a5708e1e48d0a4d7d6b76258b9

4 files changed, 20 insertions, 22 deletions

diff --git a/src/plugins/sqldrivers/configure.json b/src/plugins/sqldrivers/configure.json
index 4802d3b04d..cd20eef1df 100644
--- a/src/plugins/sqldrivers/configure.json
+++ b/src/plugins/sqldrivers/configure.json
@@ -39,9 +39,8 @@
     "libraries": {
         "db2": {
             "label": "DB2 (IBM)",
-            "test": {
-                "include": [ "sqlcli.h", "sqlcli1.h" ]
-            },
+            "test": {},
+            "headers": [ "sqlcli.h", "sqlcli1.h" ],
             "sources": [
                 { "libs": "-ldb2cli", "condition": "config.win32" },
                 { "libs": "-ldb2", "condition": "!config.win32" }
@@ -49,9 +48,8 @@
         },
         "ibase": {
             "label": "InterBase",
-            "test": {
-                "include": "ibase.h"
-            },
+            "test": {},
+            "headers": "ibase.h",
             "sources": [
                 { "libs": "-lgds32_ms", "condition": "config.win32" },
                 { "libs": "-lgds", "condition": "!config.win32" }
@@ -65,9 +63,9 @@
                     "#  include <windows.h>",
                     "#endif"
                 ],
-                "include": "mysql.h",
                 "main": "mysql_get_client_version();"
             },
+            "headers": "mysql.h",
             "sources": [
                 { "type": "mysqlConfig", "query": "--libs_r", "cleanlibs": true },
                 { "type": "mysqlConfig", "query": "--libs", "cleanlibs": true },
@@ -81,12 +79,12 @@
         "psql": {
             "label": "PostgreSQL",
             "test": {
-                "include": "libpq-fe.h",
                 "main": [
                     "PQescapeBytea(0, 0, 0);",
                     "PQunescapeBytea(0, 0);"
                 ]
             },
+            "headers": "libpq-fe.h",
             "sources": [
                 { "type": "pkgConfig", "args": "libpq" },
                 { "type": "psqlConfig" },
@@ -96,9 +94,8 @@
         },
         "tds": {
             "label": "TDS (Sybase)",
-            "test": {
-                "include": [ "sybfront.h", "sybdb.h" ]
-            },
+            "test": {},
+            "headers": [ "sybfront.h", "sybdb.h" ],
             "sources": [
                 { "type": "sybaseEnv", "libs": "-lNTWDBLIB", "condition": "config.win32" },
                 { "type": "sybaseEnv", "libs": "-lsybdb", "condition": "!config.win32" }
@@ -106,9 +103,8 @@
         },
         "oci": {
             "label": "OCI (Oracle)",
-            "test": {
-                "include": "oci.h"
-            },
+            "test": {},
+            "headers": "oci.h",
             "sources": [
                 { "libs": "-loci", "condition": "config.win32" },
                 { "libs": "-lclntsh", "condition": "!config.win32" }
@@ -122,12 +118,12 @@
                     "#  include <windows.h>",
                     "#endif"
                 ],
-                "include": [ "sql.h", "sqlext.h" ],
                 "main": [
                     "SQLHANDLE env;",
                     "SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &env);"
                 ]
             },
+            "headers": [ "sql.h", "sqlext.h" ],
             "sources": [
                 { "libs": "-lodbc32", "condition": "config.win32" },
                 { "libs": "-liodbc", "condition": "config.darwin" },
@@ -136,9 +132,8 @@
         },
         "sqlite2": {
             "label": "SQLite (version 2)",
-            "test": {
-                "include": "sqlite.h"
-            },
+            "test": {},
+            "headers": "sqlite.h",
             "sources": [
                 "-lsqlite"
             ]
@@ -147,9 +142,9 @@
             "label": "SQLite (version 3)",
             "export": "sqlite",
             "test": {
-                "include": "sqlite3.h",
                 "main": "sqlite3_open_v2(0, 0, 0, 0);"
             },
+            "headers": "sqlite3.h",
             "sources": [
                 { "type": "pkgConfig", "args": "sqlite3" },
                 "-lsqlite3"
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)
     }
diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
index bf0493b0c3..7ad9db1ea8 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
@@ -1060,8 +1060,10 @@ static QPSQLDriver::Protocol qMakePSQLVersion(int vMaj, int vMin)
     }
     case 10:
         return QPSQLDriver::Version10;
+    case 11:
+        return QPSQLDriver::Version11;
     default:
-        if (vMaj > 10)
+        if (vMaj > 11)
             return QPSQLDriver::UnknownLaterVersion;
         break;
     }
diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h
index 2873a9f851..7e1849d857 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql_p.h
+++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h
@@ -92,6 +92,7 @@ public:
         Version9_5 = 21,
         Version9_6 = 22,
         Version10 = 23,
+        Version11 = 24,
         UnknownLaterVersion = 100000
     };