Debugger: Use target not host architecture in QDateTime dumper

Task-number: QTCREATORBUG-11164

Change-Id: I83bd56f91c1e5342e1a755638c794dde7f5b345a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

4 files changed, 14 insertions, 7 deletions

diff --git a/share/qtcreator/debugger/dumper.py b/share/qtcreator/debugger/dumper.py
index 89c3b7b43d..5b61cbe22f 100644
--- a/share/qtcreator/debugger/dumper.py
+++ b/share/qtcreator/debugger/dumper.py
@@ -351,12 +351,6 @@ class DumperBase:
     #def toBlob(self, value):
     #    """Abstract"""
 
-    def isArmArchitecture(self):
-        return False
-
-    def isQnxTarget(self):
-        return False
-
     def is32bit(self):
         return self.ptrSize() == 4
 
diff --git a/share/qtcreator/debugger/gdbbridge.py b/share/qtcreator/debugger/gdbbridge.py
index f3bfe5a552..7f786e149d 100644
--- a/share/qtcreator/debugger/gdbbridge.py
+++ b/share/qtcreator/debugger/gdbbridge.py
@@ -892,6 +892,10 @@ class Dumper(DumperBase):
     def isQnxTarget(self):
         return 'qnx' in gdb.TARGET_CONFIG.lower()
 
+    def isWindowsTarget(self):
+        # We get i686-w64-mingw32
+        return 'mingw' in gdb.TARGET_CONFIG.lower()
+
     def qtVersionString(self):
         try:
             return str(gdb.lookup_symbol("qVersion")[0].value()())
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py
index b8ba285368..feda3ec82b 100644
--- a/share/qtcreator/debugger/lldbbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -429,6 +429,15 @@ class Dumper(DumperBase):
     def isStructType(self, typeobj):
         return typeobj.GetTypeClass() in (lldb.eTypeClassStruct, lldb.eTypeClassClass)
 
+    def isWindowsTarget(self):
+        return False
+
+    def isQnxTarget(self):
+        return False
+
+    def isArmArchitecture(self):
+        return False
+
     def qtVersionAndNamespace(self):
         for func in self.target.FindFunctions('qVersion'):
             name = func.GetSymbol().GetName()
diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py
index 7470d95d35..bcf231e4a5 100644
--- a/share/qtcreator/debugger/qttypes.py
+++ b/share/qtcreator/debugger/qttypes.py
@@ -249,7 +249,7 @@ def qdump__QDateTime(d, value):
     base = d.extractPointer(value)
     is32bit = d.is32bit()
     if qtVersion >= 0x050200:
-        if platform.system() in ("Microsoft", "Windows"):
+        if d.isWindowsTarget():
             msecsOffset = 8
             specOffset = 16
             offsetFromUtcOffset = 20