1 files changed, 16 insertions, 8 deletions
diff --git a/src/tools/qdoc/cppcodeparser.cpp b/src/tools/qdoc/cppcodeparser.cpp
index b08c6f901c..d8367b3e09 100644
--- a/src/tools/qdoc/cppcodeparser.cpp
+++ b/src/tools/qdoc/cppcodeparser.cpp
@@ -689,9 +689,11 @@ Node* CppCodeParser::processTopicCommand(const Doc& doc,
         return node;
     }
     else if (command == COMMAND_EXAMPLE) {
-        ExampleNode* en = new ExampleNode(tree_->root(), arg);
-        createExampleFileNodes(en);
-        return en;
+        if (Config::generateExamples) {
+            ExampleNode* en = new ExampleNode(tree_->root(), arg);
+            createExampleFileNodes(en);
+            return en;
+        }
     }
     else if (command == COMMAND_EXTERNALPAGE) {
         return new FakeNode(tree_->root(), arg, Node::ExternalPage, Node::ArticlePage);
@@ -937,7 +939,7 @@ Node *CppCodeParser::processTopicCommandGroup(const Doc& doc,
         if (splitQmlPropertyArg(doc,(*arg),type,module,element,property)) {
             QmlClassNode* qmlClass = tree_->findQmlClassNode(module,element);
             if (qmlClass) {
-                qmlPropGroup = new QmlPropGroupNode(qmlClass,property,attached);
+                qmlPropGroup = new QmlPropGroupNode(qmlClass,property); //,attached);
             }
         }
         if (qmlPropGroup) {
@@ -950,7 +952,7 @@ Node *CppCodeParser::processTopicCommandGroup(const Doc& doc,
             }
             if (correspondingProperty) {
                 bool writableList = type.startsWith("list") && correspondingProperty->dataType().endsWith('*');
-                qmlPropNode->setWritable(writableList || correspondingProperty->isWritable());
+                qmlPropNode->setReadOnly(!(writableList || correspondingProperty->isWritable()));
             }
             ++arg;
             while (arg != args.end()) {
@@ -961,7 +963,7 @@ Node *CppCodeParser::processTopicCommandGroup(const Doc& doc,
                                                                        attached);
                     if (correspondingProperty) {
                         bool writableList = type.startsWith("list") && correspondingProperty->dataType().endsWith('*');
-                        qmlPropNode->setWritable(writableList || correspondingProperty->isWritable());
+                        qmlPropNode->setReadOnly(!(writableList || correspondingProperty->isWritable()));
                     }
                 }
                 ++arg;
@@ -1117,7 +1119,14 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
         }
         else if (node->type() == Node::Fake && node->subType() == Node::QmlPropertyGroup) {
             QmlPropGroupNode* qpgn = static_cast<QmlPropGroupNode*>(node);
-            qpgn->setDefault();
+            NodeList::ConstIterator p = qpgn->childNodes().begin();
+            while (p != qpgn->childNodes().end()) {
+                if ((*p)->type() == Node::QmlProperty) {
+                    QmlPropertyNode* qpn = static_cast<QmlPropertyNode*>(*p);
+                    qpn->setDefault();
+                }
+                ++p;
+            }
         }
     }
     else if (command == COMMAND_QMLREADONLY) {
@@ -1127,7 +1136,6 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
         }
         else if (node->type() == Node::Fake && node->subType() == Node::QmlPropertyGroup) {
             QmlPropGroupNode* qpgn = static_cast<QmlPropGroupNode*>(node);
-            qpgn->setReadOnly(1);
             NodeList::ConstIterator p = qpgn->childNodes().begin();
             while (p != qpgn->childNodes().end()) {
                 if ((*p)->type() == Node::QmlProperty) {