From a14f26234bd669785f01349fbaacad7e73b78790 Mon Sep 17 00:00:00 2001
From: Marcel Krems <m.krems@software-vision.eu>
Date: Tue, 17 Dec 2013 07:57:08 +0100
Subject: Move QSqlError private members into a pimpl class.

This allows us to add new members without breaking BC.

Change-Id: I59236cd5eeacdcfc490849a18b3bdf70d7a501bf
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
---
 src/sql/kernel/qsqlerror.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/sql/kernel/qsqlerror.h')

diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h
index 39c4cda958..0efe0e07b0 100644
--- a/src/sql/kernel/qsqlerror.h
+++ b/src/sql/kernel/qsqlerror.h
@@ -47,6 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
+class QSqlErrorPrivate;
 
 class Q_SQL_EXPORT QSqlError
 {
@@ -83,10 +84,16 @@ public:
 #endif
 
 private:
-    QString driverError;
-    QString databaseError;
-    ErrorType errorType;
-    int errorNumber;
+    // ### Qt6: Keep the pointer and remove the rest.
+    QString unused1;
+    QString unused2;
+    union {
+          QSqlErrorPrivate *d;
+          struct {
+              ErrorType unused3;
+              int unused4;
+          } unused5;
+      };
 };
 
 #ifndef QT_NO_DEBUG_STREAM
-- 
cgit v1.2.3