Merge remote branch 'origin/2.0'

Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/projectexplorer/customwizard/customwizardparameters.cpp

share/qtcreator/gdbmacros/dumper.py

@@ -1360,6 +1360,13 @@ class Dumper:
         except:
             hasMetaObject = False
 
+        # Is this derived from QObject?
+        try:
+            item.value['staticMetaObject']
+            hasMetaObject = True
+        except:
+            hasMetaObject = False
+
         #warn(" STRIPPED: %s" % nsStrippedType)
         #warn(" DUMPERS: %s" % (nsStrippedType in qqDumpers))