summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/tools/qdoc/generator.cpp18
1 files changed, 3 insertions, 15 deletions
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;
}