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

Change-Id: Id96d4076610366a7cc66c8d8382ca25c33eaa71d

1 files changed, 7 insertions, 6 deletions

diff --git a/src/sql/drivers/psql/qsql_psql_p.h b/src/sql/drivers/psql/qsql_psql_p.h
index 6f60a2a34f..a20b9de3ef 100644
--- a/src/sql/drivers/psql/qsql_psql_p.h
+++ b/src/sql/drivers/psql/qsql_psql_p.h
@@ -68,15 +68,15 @@ typedef struct pg_result PGresult;
 QT_BEGIN_NAMESPACE
 
 class QPSQLResultPrivate;
-class QPSQLDriverPrivate;
 class QPSQLDriver;
 class QSqlRecordInfo;
 
 class QPSQLResult : public QSqlResult
 {
-    friend class QPSQLResultPrivate;
+    Q_DECLARE_PRIVATE(QPSQLResult)
+
 public:
-    QPSQLResult(const QPSQLDriver* db, const QPSQLDriverPrivate* p);
+    QPSQLResult(const QPSQLDriver* db);
     ~QPSQLResult();
 
     QVariant handle() const;
@@ -96,13 +96,14 @@ protected:
     QVariant lastInsertId() const;
     bool prepare(const QString& query);
     bool exec();
-
-private:
-    QPSQLResultPrivate *d;
 };
 
+class QPSQLDriverPrivate;
+
 class Q_EXPORT_SQLDRIVER_PSQL QPSQLDriver : public QSqlDriver
 {
+    friend class QPSQLResultPrivate;
+
     Q_OBJECT
 public:
     enum Protocol {