summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/generator.cpp
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-08-10 22:45:54 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-08-10 22:45:54 (GMT)
commit6bb93ab2fd79ae0a04c826d9027503b644b6e374 (patch)
tree060d9765cf3f009c86fe6e421dac4ea8930d076e /tools/qdoc3/generator.cpp
parent40db84c97769141f3f2351de1b2d5c64904fe5c2 (diff)
parent6c3c9d812a730d5bc1bcd6261befe077a65be594 (diff)
downloadQt-6bb93ab2fd79ae0a04c826d9027503b644b6e374.zip
Qt-6bb93ab2fd79ae0a04c826d9027503b644b6e374.tar.gz
Qt-6bb93ab2fd79ae0a04c826d9027503b644b6e374.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'tools/qdoc3/generator.cpp')
-rw-r--r--tools/qdoc3/generator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index e92f53b..9538dfe 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -283,7 +283,7 @@ bool Generator::generateText(const Text& text,
bool Generator::generateQmlText(const Text& text,
const Node *relative,
CodeMarker *marker,
- const QString& qmlName)
+ const QString& /* qmlName */ )
{
const Atom* atom = text.firstAtom();
if (atom == 0)