Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (35 commits)
  Doc: Added a config file for creating Simplified Chinese docs directly.
  Doc: add a few lines about bearer managment to "What's New" page.
  Fix the SIMD implementations of QString::toLatin1()
  Update of the QScriptValue autotest suite.
  New data set for QScriptValue autotest generator.
  Autotest: make tst_qchar run out-of-source too
  Autotest: add a test for roundtrips through toLatin1/fromLatin1
  Implement toLatin1_helper with Neon
  QRegExp::pos() should return -1 for empty/non-matching captures
  Revert "qdoc:	Finished "Inherited by" list for QML elements."
  Revert "qdoc:	List new QML elements in \sincelist for What's New page."
  Add the Unicode normalisation properties.
  Autotest: add a test for QDBusPendingCallWatcher use in threads
  Doc: placeholders for new feature highlights.
  doc: mark as reimplemented.
  Update of the QScriptValue autotest suite.
  New autotests cases for QScriptValue autotests generator.
  QScriptValue autotest generator templates change.
  Fix license template.
  QScriptValue::isQMetaObject crash fix.
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index d9e9c3b..021d64a 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -1034,7 +1034,7 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
     else if (command == COMMAND_QMLINHERITS) {
         setLink(node, Node::InheritsLink, arg);
         if (node->subType() == Node::QmlClass) {
-            QmlClassNode::addInheritedBy(arg,node);
+            QmlClassNode::addInheritedBy(arg,node->name());
         }
    }
     else if (command == COMMAND_QMLDEFAULT) {