Merge branch 'stable' into dev

Change-Id: Icff019d74ae04c628a80f66aa478e4db40fae464

5 files changed, 12 insertions, 19 deletions

diff --git a/src/tools/qdoc/doc/config/qdoc.qdocconf b/src/tools/qdoc/doc/config/qdoc.qdocconf
index 6bbe934749..84e9689f50 100644
--- a/src/tools/qdoc/doc/config/qdoc.qdocconf
+++ b/src/tools/qdoc/doc/config/qdoc.qdocconf
@@ -20,7 +20,7 @@ tagfile = ../html/qdoc.tags
 qhp.projects            = QDoc
 
 qhp.QDoc.file                = qdoc.qhp
-qhp.QDoc.namespace           = qdoc.$QT_VERSION_TAG
+qhp.QDoc.namespace           = org.qt-project.qdoc.$QT_VERSION_TAG
 qhp.QDoc.virtualFolder       = qdoc
 qhp.QDoc.indexTitle          = QDoc Manual
 qhp.QDoc.indexRoot           =
diff --git a/src/tools/qdoc/node.cpp b/src/tools/qdoc/node.cpp
index c293d48673..028c0a0b2a 100644
--- a/src/tools/qdoc/node.cpp
+++ b/src/tools/qdoc/node.cpp
@@ -1440,7 +1440,6 @@ NamespaceNode::NamespaceNode(InnerNode *parent, const QString& name)
 ClassNode::ClassNode(InnerNode *parent, const QString& name)
     : InnerNode(Class, parent, name)
 {
-    hidden = false;
     abstract_ = false;
     qmlelement = 0;
     setPageType(ApiPage);
diff --git a/src/tools/qdoc/node.h b/src/tools/qdoc/node.h
index 4802b6de54..642bcec06a 100644
--- a/src/tools/qdoc/node.h
+++ b/src/tools/qdoc/node.h
@@ -440,9 +440,6 @@ public:
     const QList<RelatedClass> &derivedClasses() const { return derived; }
     const QList<RelatedClass> &ignoredBaseClasses() const { return ignoredBases; }
 
-    bool hideFromMainList() const { return hidden; }
-    void setHideFromMainList(bool value) { hidden = value; }
-
     QString serviceName() const { return sname; }
     void setServiceName(const QString& value) { sname = value; }
     QmlClassNode* qmlElement() { return qmlelement; }
@@ -456,7 +453,6 @@ private:
     QList<RelatedClass> bases;
     QList<RelatedClass> derived;
     QList<RelatedClass> ignoredBases;
-    bool hidden;
     bool abstract_;
     QString sname;
     QmlClassNode* qmlelement;
diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp
index 191da5caf8..30a9efaada 100644
--- a/src/tools/qdoc/qdocdatabase.cpp
+++ b/src/tools/qdoc/qdocdatabase.cpp
@@ -448,18 +448,16 @@ void QDocDatabase::findAllClasses(const InnerNode* node)
                         !(*c)->parent()->name().isEmpty())
                     className = (*c)->parent()->name()+"::"+className;
 
-                if (!(static_cast<const ClassNode *>(*c))->hideFromMainList()) {
-                    if ((*c)->status() == Node::Compat) {
-                        compatClasses_.insert(className, *c);
-                    }
-                    else if ((*c)->status() == Node::Obsolete) {
-                        obsoleteClasses_.insert(className, *c);
-                    }
-                    else {
-                        nonCompatClasses_.insert(className, *c);
-                        if ((*c)->status() == Node::Main)
-                            mainClasses_.insert(className, *c);
-                    }
+                if ((*c)->status() == Node::Compat) {
+                    compatClasses_.insert(className, *c);
+                }
+                else if ((*c)->status() == Node::Obsolete) {
+                    obsoleteClasses_.insert(className, *c);
+                }
+                else {
+                    nonCompatClasses_.insert(className, *c);
+                    if ((*c)->status() == Node::Main)
+                        mainClasses_.insert(className, *c);
                 }
 
                 QString serviceName = (static_cast<const ClassNode *>(*c))->serviceName();
diff --git a/src/tools/uic/qclass_lib_map.h b/src/tools/uic/qclass_lib_map.h
index 075b2d52e8..6859cd0cd4 100644
--- a/src/tools/uic/qclass_lib_map.h
+++ b/src/tools/uic/qclass_lib_map.h
@@ -313,7 +313,7 @@ QT_CLASS_LIB(QDeclarativePropertyValueInterceptor, QtDeclarative, qdeclarativepr
 QT_CLASS_LIB(QDeclarativePropertyValueSource, QtDeclarative, qdeclarativepropertyvaluesource.h)
 QT_CLASS_LIB(QDeclarativeScriptString, QtDeclarative, qdeclarativescriptstring.h)
 QT_CLASS_LIB(QDeclarativePropertyMap, QtDeclarative, qdeclarativepropertymap.h)
-QT_CLASS_LIB(QDeclarativeView, QtQuick1, qdeclarativeview.h)
+QT_CLASS_LIB(QDeclarativeView, QtDeclarative, qdeclarativeview.h)
 QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
 QT_CLASS_LIB(QMacGLCompatTypes, QtOpenGL, qgl.h)
 QT_CLASS_LIB(QMacCompatGLint, QtOpenGL, qgl.h)