Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/corelib/io/qurl.cpp
	src/gui/kernel/qwindow.cpp
	src/tools/moc/generator.cpp
	src/widgets/kernel/qwidget_qpa.cpp
	src/widgets/styles/qstyle.h
	src/widgets/widgets/qtabbar.cpp
	tests/auto/corelib/codecs/utf8/tst_utf8.cpp

Change-Id: Ia457228d6f684ec8184e13e8fcc9d25857b1751e

1 files changed, 13 insertions, 1 deletions

diff --git a/src/tools/qdoc/cppcodemarker.cpp b/src/tools/qdoc/cppcodemarker.cpp
index aea8ed2119..165a235a86 100644
--- a/src/tools/qdoc/cppcodemarker.cpp
+++ b/src/tools/qdoc/cppcodemarker.cpp
@@ -1258,8 +1258,20 @@ QList<Section> CppCodeMarker::qmlSections(const QmlClassNode* qmlClassNode,
                 NodeList::ConstIterator c = qcn->childNodes().begin();
                 while (c != qcn->childNodes().end()) {
                     if ((*c)->subType() == Node::QmlPropertyGroup) {
+                        bool attached = false;
                         const QmlPropGroupNode* pgn = static_cast<const QmlPropGroupNode*>(*c);
-                        if (pgn->isAttached())
+                        NodeList::ConstIterator C = pgn->childNodes().begin();
+                        while (C != pgn->childNodes().end()) {
+                            if ((*C)->type() == Node::QmlProperty) {
+                                const QmlPropertyNode* pn = static_cast<const QmlPropertyNode*>(*C);
+                                if (pn->isAttached()) {
+                                    attached = true;
+                                    break;
+                                }
+                            }
+                            ++C;
+                        }
+                        if (attached)
                             insert(qmlattachedproperties,*c,style,Okay);
                         else
                             insert(qmlproperties,*c,style,Okay);