3 files changed, 5 insertions, 3 deletions
diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp
index ffaef904b7..398d188464 100644
--- a/src/tools/qdoc/main.cpp
+++ b/src/tools/qdoc/main.cpp
@@ -362,7 +362,7 @@ static void processQdocconfFile(const QString &fileName)
      */
     QDocDatabase* qdb = QDocDatabase::qdocDB();
     qdb->setVersion(config.getString(CONFIG_VERSION));
-
+    qdb->setShowInternal(config.getBool(CONFIG_SHOWINTERNAL));
     /*
       By default, the only output format is HTML.
      */
diff --git a/src/tools/qdoc/qdocdatabase.cpp b/src/tools/qdoc/qdocdatabase.cpp
index f2ecb02a2f..1011a3ac97 100644
--- a/src/tools/qdoc/qdocdatabase.cpp
+++ b/src/tools/qdoc/qdocdatabase.cpp
@@ -62,7 +62,7 @@ QDocDatabase* QDocDatabase::qdocDB_ = NULL;
   It constructs a singleton Tree object with this
   qdoc database pointer.
  */
-QDocDatabase::QDocDatabase()
+QDocDatabase::QDocDatabase() : showInternal_(false)
 {
     tree_ = new Tree(this);
 }
@@ -423,7 +423,7 @@ void QDocDatabase::findAllClasses(const InnerNode* node)
 {
     NodeList::const_iterator c = node->childNodes().constBegin();
     while (c != node->childNodes().constEnd()) {
-        if ((*c)->access() != Node::Private) {
+        if ((*c)->access() != Node::Private && (!(*c)->isInternal() || showInternal_)) {
             if ((*c)->type() == Node::Class && !(*c)->doc().isEmpty()) {
                 QString className = (*c)->name();
                 if ((*c)->parent() &&
diff --git a/src/tools/qdoc/qdocdatabase.h b/src/tools/qdoc/qdocdatabase.h
index 5786fa0664..4decba5f79 100644
--- a/src/tools/qdoc/qdocdatabase.h
+++ b/src/tools/qdoc/qdocdatabase.h
@@ -200,6 +200,7 @@ class QDocDatabase
     void insertOpenNamespace(const QString& path) { openNamespaces_.insert(path); }
     FunctionNode* findNodeInOpenNamespace(const QStringList& parentPath, const FunctionNode* clone);
     Node* findNodeInOpenNamespace(QStringList& path, Node::Type type, Node::SubType subtype);
+    void setShowInternal(bool value) { showInternal_ = value; }
 
     /* debugging functions */
     void printModules() const;
@@ -220,6 +221,7 @@ class QDocDatabase
 
  private:
     static QDocDatabase*    qdocDB_;
+    bool                    showInternal_;
     QString                 version_;
     QDocMultiMap            masterMap_;
     Tree*                   tree_;