From 9de71796c1e13a241f540da7c38134227cef1d73 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Thu, 2 Aug 2012 12:12:30 +0200 Subject: [PATCH] Add support for modular docs in QHelpGenerator. Very cool. Change-Id: Ic3332a4a780fb357138545117e78be641d2ea14f Reviewed-by: Lars Knoll --- src/assistant/help/qhelpgenerator.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/assistant/help/qhelpgenerator.cpp b/src/assistant/help/qhelpgenerator.cpp index 17d7d74..9445133 100644 --- a/src/assistant/help/qhelpgenerator.cpp +++ b/src/assistant/help/qhelpgenerator.cpp @@ -284,12 +284,8 @@ void QHelpGenerator::cleanupDB() void QHelpGenerator::writeTree(QDataStream &s, QHelpDataContentItem *item, int depth) { - QString fReference = QDir::cleanPath(item->reference()); - if (fReference.startsWith(QLatin1String("./"))) - fReference = fReference.mid(2); - s << depth; - s << fReference; + s << item->reference(); s << item->title(); foreach (QHelpDataContentItem *i, item->children()) writeTree(s, i, depth+1); @@ -510,11 +506,6 @@ bool QHelpGenerator::insertFiles(const QStringList &files, const QString &rootPa int i = 0; foreach (const QString &file, files) { const QString fileName = QDir::cleanPath(file); - if (fileName.startsWith(QLatin1String("../"))) { - emit warning(tr("The referenced file %1 must be inside or within a " - "subdirectory of (%2). Skipping it.").arg(fileName).arg(rootPath)); - continue; - } QFile fi(rootPath + QDir::separator() + fileName); if (!fi.exists()) { -- 2.7.4