From d4966a93640b5d8d479cd1eebaa14e73cc467e15 Mon Sep 17 00:00:00 2001
From: Topi Reinio <topi.reinio@digia.com>
Date: Thu, 2 May 2013 12:20:17 +0200
Subject: [PATCH] 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>
---
src/tools/qdoc/htmlgenerator.cpp | 6 ------
1 file changed, 6 deletions(-)
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index d5e079d910e..f74a1d2fa0a 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -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);
--
GitLab