summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-03-25 14:52:04 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-03-25 14:53:02 (GMT)
commitdfbabeca0cb8a9efdb6758c228700eeb5996652c (patch)
tree42598fd46dbde25acb47953d3f75799ccfd2e4ea /tools
parent1e6c23469ea78f6ff5a3a546c08ae22a5ba79356 (diff)
downloadQt-dfbabeca0cb8a9efdb6758c228700eeb5996652c.zip
Qt-dfbabeca0cb8a9efdb6758c228700eeb5996652c.tar.gz
Qt-dfbabeca0cb8a9efdb6758c228700eeb5996652c.tar.bz2
Fix warnings and build on mingw
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/generator.cpp4
-rw-r--r--tools/qdoc3/node.cpp6
2 files changed, 5 insertions, 5 deletions
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 0c6497b..0e90615 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -1194,12 +1194,12 @@ void Generator::appendSortedQmlNames(Text& text,
QMap<QString,Text> classMap;
int index = 0;
-#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
+#ifdef DEBUG_MULTIPLE
qDebug() << "Generator::appendSortedQmlNames():" << base->name() << "is inherited by...";
#endif
for (int i = 0; i < subs.size(); ++i) {
Text t;
-#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
+#ifdef DEBUG_MULTIPLE
qDebug() << " " << subs[i]->name();
#endif
appendFullName(t, subs[i], base, marker);
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index d60ff73..0d27937 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -1297,7 +1297,7 @@ QmlClassNode::QmlClassNode(InnerNode *parent,
*/
QmlClassNode::~QmlClassNode()
{
-#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
+#ifdef DEBUG_MULTIPLE
qDebug() << "Deleting QmlClassNode:" << name();
#endif
}
@@ -1334,7 +1334,7 @@ QString QmlClassNode::fileBase() const
void QmlClassNode::addInheritedBy(const QString& base, Node* sub)
{
inheritedBy.insert(base,sub);
-#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
+#ifdef DEBUG_MULTIPLE
qDebug() << "QmlClassNode::addInheritedBy(): insert" << base << sub->name() << inheritedBy.size();
#endif
}
@@ -1347,7 +1347,7 @@ void QmlClassNode::subclasses(const QString& base, NodeList& subs)
subs.clear();
if (inheritedBy.count(base) > 0) {
subs = inheritedBy.values(base);
-#ifdef DEBUG_MULTIPLE QDOCCONF_FILES
+#ifdef DEBUG_MULTIPLE
qDebug() << "QmlClassNode::subclasses():" << inheritedBy.count(base) << base
<< "subs:" << subs.size() << "total size:" << inheritedBy.size();
#endif