From b75980d7f5b25ef11879305517a4036af0e324cf Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 16 Nov 2012 14:08:49 +0100 Subject: qdoc: Handle scripts exactly like styles The values of the scripts variable in the qdocconf file must now be paths that are relative to the location of the qdocconf file, just like for styles. They can be absolute paths, of course, but if they are relative, they must be relative to the qdocconf file containing the scripts variable. Task-number: QTBUG-27878 Change-Id: Iec12d1937ca9db540a2aa5e378fadc60de0a2d8c Reviewed-by: Jerome Pasion --- src/tools/qdoc/generator.cpp | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/tools/qdoc/generator.cpp') diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 9026573ed6..882af2a2f3 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -1548,26 +1548,14 @@ void Generator::initialize(const Config &config) } // Documentation template handling - QStringList searchDirs; - QString templateDir = config.getPath((*g)->format() + Config::dot + CONFIG_TEMPLATEDIR); - if (templateDir.isEmpty()) - templateDir = "."; - searchDirs.append(templateDir); - QStringList noExts; - QStringList scripts = config.getCleanPathList((*g)->format()+Config::dot+CONFIG_SCRIPTS); + QStringList scripts = config.getPathList((*g)->format()+Config::dot+CONFIG_SCRIPTS); e = scripts.constBegin(); while (e != scripts.constEnd()) { - QString userFriendlyFilePath; - QString filePath = Config::findFile(config.lastLocation(), - scriptFiles, - searchDirs, - *e, - noExts, - userFriendlyFilePath); + QString filePath = *e; if (!filePath.isEmpty()) Config::copyFile(config.lastLocation(), filePath, - userFriendlyFilePath, + filePath, (*g)->outputDir() + "/scripts"); ++e; } -- cgit v1.2.3