diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/generator.cpp | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 882af2a2f3..2854aedbbe 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -1528,21 +1528,14 @@ void Generator::initialize(const Config &config) if (outputFormats.contains((*g)->format())) { currentGenerator_ = (*g); (*g)->initializeGenerator(config); - QStringList extraImages = - config.getCleanPathList(CONFIG_EXTRAIMAGES+Config::dot+(*g)->format()); + QStringList extraImages = config.getCleanPathList((*g)->format() + + Config::dot + + CONFIG_EXTRAIMAGES); QStringList::ConstIterator e = extraImages.constBegin(); while (e != extraImages.constEnd()) { - QString userFriendlyFilePath; - QString filePath = Config::findFile(config.lastLocation(), - imageFiles, - imageDirs, - *e, - imgFileExts[(*g)->format()], - userFriendlyFilePath); + QString filePath = *e; if (!filePath.isEmpty()) - Config::copyFile(config.lastLocation(), - filePath, - userFriendlyFilePath, + Config::copyFile(config.lastLocation(), filePath, filePath, (*g)->outputDir() + "/images"); ++e; } @@ -1553,9 +1546,7 @@ void Generator::initialize(const Config &config) while (e != scripts.constEnd()) { QString filePath = *e; if (!filePath.isEmpty()) - Config::copyFile(config.lastLocation(), - filePath, - filePath, + Config::copyFile(config.lastLocation(), filePath, filePath, (*g)->outputDir() + "/scripts"); ++e; } @@ -1565,9 +1556,7 @@ void Generator::initialize(const Config &config) while (e != styles.constEnd()) { QString filePath = *e; if (!filePath.isEmpty()) - Config::copyFile(config.lastLocation(), - filePath, - filePath, + Config::copyFile(config.lastLocation(), filePath, filePath, (*g)->outputDir() + "/style"); ++e; } |