whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Standardize paths used in example and demo manifest files 

There is no longer any difference in install directories between demos
and examples (QT_INSTALL_DEMOS is obsolete and points to the same dir
as QT_INSTALL_EXAMPLES for compatibility). This change removes any
special handling of demos' paths used in manifest xml, enabling the
demos to be visible in Creator welcome mode as well.

Change-Id: I5afdf578a42d001fab05979d3ea1102fd52b51da
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
bb10
Topi Reinio 2013-05-02 12:20:17 +02:00 committed by The Qt Project
parent 83315ce8b2
commit d4966a9364
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/qdoc/htmlgenerator.cpp
View File

@ -4117,8 +4117,6 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element)
if (child->subType() == Node::File) {
QString file = child->name();
if (file.endsWith(".pro") || file.endsWith(".qmlproject")) {
if (file.startsWith("demos/"))
file = file.mid(6);
proFiles << file;
}
}
@ -4233,8 +4231,6 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element)
if (baseName.compare(ename, Qt::CaseInsensitive) == 0) {
if (!usedNames.contains(fileName)) {
writer.writeStartElement("fileToOpen");
if (file.startsWith("demos/"))
file = file.mid(6);
writer.writeCharacters(examplesPath + file);
writer.writeEndElement(); // fileToOpen
usedNames.insert(fileName);
@ -4244,8 +4240,6 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element)
fileName.toLower().endsWith("main.qml")) {
if (!usedNames.contains(fileName)) {
writer.writeStartElement("fileToOpen");
if (file.startsWith("demos/"))
file = file.mid(6);
writer.writeCharacters(examplesPath + file);
writer.writeEndElement(); // fileToOpen
usedNames.insert(fileName);