AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Don't include internal QML types

Browse Source 
QML types marked \internal were appearing in the
"All QML Types" list. These links were dead because
the pages for these internal types were not being
created, which was correct. Now these internal QML
types no longer appear in the list.

Task-number: QTBUG-34506
Change-Id: I1d005459e84ed9a2afae94b797b9d39aa3e517f3
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Martin Smith 2013-11-01 15:13:12 +01:00 committed by The Qt Project
parent 170da92d02
commit 0491a7a298
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/qdoc/main.cpp
View File

@ -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.
*/

4
src/tools/qdoc/qdocdatabase.cpp
View File

@ -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() &&

2
src/tools/qdoc/qdocdatabase.h
View File

@ -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_;