diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-08-18 13:18:38 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-08-18 13:18:38 (GMT) |
| commit | bb4eea4f9d7dc66c87374dea3cdd5fcfd1b68bad (patch) | |
| tree | bc9f0e86545e7fad2ebeeb1037ed2eec840b2744 /tools/qdoc3 | |
| parent | 7ca3a7e431e53250446c1b3f95db344e6b183f89 (diff) | |
| download | Qt-bb4eea4f9d7dc66c87374dea3cdd5fcfd1b68bad.zip Qt-bb4eea4f9d7dc66c87374dea3cdd5fcfd1b68bad.tar.gz Qt-bb4eea4f9d7dc66c87374dea3cdd5fcfd1b68bad.tar.bz2 | |
qdoc3: Updates for QTBUG-20776; include fileToOpen path.
Task-number: QTBUG-20776
Diffstat (limited to 'tools/qdoc3')
| -rw-r--r-- | tools/qdoc3/htmlgenerator.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp index 9846eb9..e79e180 100644 --- a/tools/qdoc3/htmlgenerator.cpp +++ b/tools/qdoc3/htmlgenerator.cpp @@ -4532,7 +4532,9 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element) if (baseName.toLower() == ename) { if (!usedNames.contains(fileName)) { writer.writeStartElement("fileToOpen"); - writer.writeCharacters(fileName); + if (file.startsWith("demos/")) + file = file.mid(6); + writer.writeCharacters(file); writer.writeEndElement(); // fileToOpen usedNames.insert(fileName); } @@ -4541,7 +4543,9 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element) fileName.toLower().endsWith("main.qml")) { if (!usedNames.contains(fileName)) { writer.writeStartElement("fileToOpen"); - writer.writeCharacters(fileName); + if (file.startsWith("demos/")) + file = file.mid(6); + writer.writeCharacters(file); writer.writeEndElement(); // fileToOpen usedNames.insert(fileName); } |