diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-09-01 10:45:36 (GMT) |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-09-01 10:47:02 (GMT) |
| commit | 47ec2fd2193f56e02a402df4d0fa9f1b521d07fc (patch) | |
| tree | d4d0af46486c486b25253fde8d4550844dc66dd3 /tools/qdoc3/doc.cpp | |
| parent | 274619e086e6e9ebba6c383ffb837dc140c840e7 (diff) | |
| parent | cac60dcca5b4632173a8fe76a78cd2ec9bea5873 (diff) | |
| download | Qt-47ec2fd2193f56e02a402df4d0fa9f1b521d07fc.zip Qt-47ec2fd2193f56e02a402df4d0fa9f1b521d07fc.tar.gz Qt-47ec2fd2193f56e02a402df4d0fa9f1b521d07fc.tar.bz2 | |
Merge branch 4.8 into qt-4.8-from-4.7
Conflicts:
tools/qdoc3/ditaxmlgenerator.cpp
tools/qdoc3/htmlgenerator.cpp
Diffstat (limited to 'tools/qdoc3/doc.cpp')
| -rw-r--r-- | tools/qdoc3/doc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index 37f68f8..f1f1418 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE Q_GLOBAL_STATIC(QSet<QString>, null_Set_QString) Q_GLOBAL_STATIC(QStringList, null_QStringList) Q_GLOBAL_STATIC(QList<Text>, null_QList_Text) -Q_GLOBAL_STATIC(QStringMap, null_QStringMap) +//Q_GLOBAL_STATIC(QStringMap, null_QStringMap) Q_GLOBAL_STATIC(QStringMultiMap, null_QStringMultiMap) struct Macro @@ -1861,7 +1861,7 @@ void DocParser::startSection(Doc::Sections unit, int cmd) } -void DocParser::endSection(int unit, int endCmd) +void DocParser::endSection(int , int) // (int unit, int endCmd) { leavePara(); append(Atom::SectionRight, QString::number(currentSection)); |