Merge remote-tracking branch 'origin/3.0'

Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352

share/qtcreator/debugger/lldbbridge.py

@@ -185,6 +185,13 @@ def impl_SBValue__getitem__(value, index):
         return value.GetChildAtIndex(index)
     return value.GetChildMemberWithName(index)
 
+def impl_SBValue__deref(value):
+    result = value.Dereference()
+    if result.IsValid():
+        return result
+    result = value.CreateValueFromExpression(None, '*' + value.get_expr_path())
+    return result
+
 lldb.SBValue.__add__ = impl_SBValue__add__
 lldb.SBValue.__sub__ = impl_SBValue__sub__
 lldb.SBValue.__le__ = impl_SBValue__le__
@@ -196,7 +203,7 @@ lldb.SBValue.__long__ = lambda self: long(self.GetValue(), 0)
 
 lldb.SBValue.code = lambda self: self.GetTypeClass()
 lldb.SBValue.cast = lambda self, typeObj: self.Cast(typeObj)
-lldb.SBValue.dereference = lambda self: self.Dereference()
+lldb.SBValue.dereference = impl_SBValue__deref
 lldb.SBValue.address = property(lambda self: self.GetAddress())
 
 lldb.SBType.pointer = lambda self: self.GetPointerType()
@@ -625,10 +632,11 @@ class Dumper(DumperBase):
         self.remoteChannel_ = args.get('remoteChannel', '')
         self.platform_ = args.get('platform', '')
 
-        if self.sysRoot_:
-            self.debugger.SetCurrentPlatformSDKRoot(self.sysRoot_)
         if self.platform_:
             self.debugger.SetCurrentPlatform(self.platform_)
+        # sysroot has to be set *after* the platform
+        if self.sysRoot_:
+            self.debugger.SetCurrentPlatformSDKRoot(self.sysRoot_)
         self.target = self.debugger.CreateTarget(self.executable_, None, None, True, error)
         self.importDumpers()