From 0f9e2baa1b9d6c6dd15185c45b1520bbe9b69a0e Mon Sep 17 00:00:00 2001
From: hjk <hjk@theqtcompany.com>
Date: Tue, 10 Nov 2015 20:42:30 +0100
Subject: [PATCH] Debugger: Adjust QFileInfo dumper for Qt 5.7 on Linux 32 bit

Change-Id: Idb14d81aa3546af0e7a21922fbb6d551ecbc1b06
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
---
 share/qtcreator/debugger/qttypes.py |  7 ++++++-
 tests/auto/debugger/tst_offsets.cpp | 12 +++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 133d1604a96..6f3685375a4 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -422,7 +422,12 @@ def qdump__QFile(d, value):
     # 9fc0965 and a373ffcd change the layout of the private structure
     qtVersion = d.qtVersion()
     is32bit = d.is32bit()
-    if qtVersion >= 0x050500:
+    if qtVersion >= 0x050600:
+        if d.isWindowsTarget():
+            offset = 164 if is32bit else 248
+        else:
+            offset = 168 if is32bit else 248
+    elif qtVersion >= 0x050500:
         if d.isWindowsTarget():
             offset = 164 if is32bit else 248
         else:
diff --git a/tests/auto/debugger/tst_offsets.cpp b/tests/auto/debugger/tst_offsets.cpp
index 1b507cbb0f3..62eb3b740b6 100644
--- a/tests/auto/debugger/tst_offsets.cpp
+++ b/tests/auto/debugger/tst_offsets.cpp
@@ -83,7 +83,17 @@ void tst_offsets::offsets_data()
         QFilePrivate *p = 0;
         QTestData &data = QTest::newRow("QFilePrivate::fileName")
                 << int((char *)&p->fileName - (char *)p);
-        if (qtVersion >= 0x50500)
+        if (qtVersion >= 0x50600)
+#ifdef Q_OS_WIN
+#   ifdef Q_CC_MSVC
+            data << 176 << 248;
+#   else // MinGW
+            data << 164 << 248;
+#   endif
+#else
+            data << 168 << 248;
+#endif
+        else if (qtVersion >= 0x50500)
 #ifdef Q_OS_WIN
 #   ifdef Q_CC_MSVC
             data << 176 << 248;