Merge remote-tracking branch 'origin/5.8' into 5.9

Conflicts:
	configure.json
	mkspecs/win32-icc/qmake.conf

Change-Id: Ibf40546b024d644c7d9ed490bee15b82597f4d3f

3 files changed, 13 insertions, 3 deletions

diff --git a/src/sql/configure.pri b/src/sql/configure.pri
index a8bc09e524..05794582e9 100644
--- a/src/sql/configure.pri
+++ b/src/sql/configure.pri
@@ -67,8 +67,11 @@ defineTest(qtConfLibrary_mysqlConfig) {
             libs = $$cleanlibs
         }
         $${1}.libs = "$$val_escape(libs)"
-        eval(includedir = $$includedir)
-        includedir ~= s/^-I//g
+        eval(rawincludedir = $$includedir)
+        rawincludedir ~= s/^-I//g
+        includedir =
+        for (id, rawincludedir): \
+            includedir += $$clean_path($$id)
         includedir -= $$QMAKE_DEFAULT_INCDIRS
         $${1}.includedir = "$$val_escape(includedir)"
         export($${1}.libs)
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 9932fb75e3..8166613e53 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -55,6 +55,11 @@ QT_BEGIN_NAMESPACE
 
 typedef QSqlTableModelSql Sql;
 
+QSqlTableModelPrivate::~QSqlTableModelPrivate()
+{
+
+}
+
 /*! \internal
     Populates our record with values.
 */
diff --git a/src/sql/models/qsqltablemodel_p.h b/src/sql/models/qsqltablemodel_p.h
index 4a79d5db36..3b64cdfa47 100644
--- a/src/sql/models/qsqltablemodel_p.h
+++ b/src/sql/models/qsqltablemodel_p.h
@@ -58,7 +58,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QSqlTableModelPrivate: public QSqlQueryModelPrivate
+class Q_AUTOTEST_EXPORT QSqlTableModelPrivate: public QSqlQueryModelPrivate
 {
     Q_DECLARE_PUBLIC(QSqlTableModel)
 
@@ -69,6 +69,8 @@ public:
           strategy(QSqlTableModel::OnRowChange),
           busyInsertingRows(false)
     {}
+    ~QSqlTableModelPrivate();
+
     void clear();
     virtual void clearCache();
     QSqlRecord record(const QVector<QVariant> &values) const;