Merge remote branch 'origin/2.0'

Conflicts:
	share/qtcreator/gdbmacros/dumper.py
	src/plugins/cppeditor/cpphoverhandler.cpp
	src/plugins/cppeditor/cpphoverhandler.h

diff --cc share/qtcreator/gdbmacros/dumper.py
index aa213be,8691296..6278d20
--- 1/share/qtcreator/gdbmacros/dumper.py
--- 2/share/qtcreator/gdbmacros/dumper.py
+++ b/share/qtcreator/gdbmacros/dumper.py
@@@ -830,10 -811,9 +830,10 @@@ def extractFields(type)
      #warn("TYPE 0: %s" % type)
      type = stripTypedefs(type)
      #warn("TYPE 1: %s" % type)
-     type2 = lookupType(str(type))
-     if not type2 is None:
-         type = type2
 +    # This fails for arrays. See comment in lookupType.
+     type0 = lookupType(str(type))
+     if not type0 is None:
+         type = type0
      #warn("TYPE 2: %s" % type)
      fields = type.fields()
      #warn("FIELDS: %s" % fields)
@@@ -863,9 -843,7 +863,8 @@@ class Item
  
  # This is a mapping from 'type name' to 'display alternatives'.
  
- qqDumpers = {}
  qqFormats = {}
 +qqNs = ""
  
  
  class SetupCommand(gdb.Command):

diff --cc share/qtcreator/gdbmacros/gdbmacros.py
index 1a91225,295dd4e..00f0f92
--- 1/share/qtcreator/gdbmacros/gdbmacros.py
--- 2/share/qtcreator/gdbmacros/gdbmacros.py
+++ b/share/qtcreator/gdbmacros/gdbmacros.py
@@@ -631,11 -614,9 +631,10 @@@ def qdump__QObject(d, item)
      d.putNumChild(4)
      if d.isExpanded(item):
        with Children(d):
-         d.putFields(item)
          # Parent and children.
 -        d.putItem(Item(d_ptr["parent"], item.iname, "parent", "parent"))
 -        d.putItem(Item(d_ptr["children"], item.iname, "children", "children"))
 +        if stripClassTag(str(item.value.type)) == d.ns + "QObject":
 +            d.putItem(Item(d_ptr["parent"], item.iname, "parent", "parent"))
 +            d.putItem(Item(d_ptr["children"], item.iname, "children", "children"))
  
          # Properties.
          with SubItem(d):

diff --cc src/plugins/qmljseditor/qmljseditorplugin.cpp
index 413bcb9,4afe431..c1ab527
--- 1/src/plugins/qmljseditor/qmljseditorplugin.cpp
--- 2/src/plugins/qmljseditor/qmljseditorplugin.cpp
+++ b/src/plugins/qmljseditor/qmljseditorplugin.cpp
@@@ -143,9 -126,10 +143,9 @@@ bool QmlJSEditorPlugin::initialize(cons
      Core::ActionContainer *menuQtQuick = am->createMenu(Constants::M_QTQUICK);
      menuQtQuick->menu()->setTitle(tr("Qt Quick"));
      mtools->addMenu(menuQtQuick);
-     m_actionPreview = new QAction("&Preview", this);
+     m_actionPreview = new QAction(tr("&Preview"), this);
  
 -    QList<int> toolsMenuContext = QList<int>()
 -                                  << core->uniqueIDManager()->uniqueIdentifier(QmlDesigner::Constants::C_QT_QUICK_TOOLS_MENU);
 +    Core::Context toolsMenuContext(QmlDesigner::Constants::C_QT_QUICK_TOOLS_MENU);
      Core::Command *cmd = addToolAction(m_actionPreview,  am, toolsMenuContext,
                     QLatin1String("QtQuick.Preview"), menuQtQuick, tr("Ctrl+Alt+R"));
      connect(cmd->action(), SIGNAL(triggered()), SLOT(openPreview()));