qdoc: Make extraimages behave like styles and scripts
authorMartin Smith <martin.smith@digia.com>
Wed, 5 Dec 2012 11:09:51 +0000 (12:09 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 5 Dec 2012 18:31:10 +0000 (19:31 +0100)
This configuration variable now assumes its values,
if relative, are relative to the config file that
contains the extraimages variable.

Task-number: QTBUG-28307
Change-Id: I9b34d1f456b31e36ac77401b957b68cd10590376
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
src/tools/qdoc/generator.cpp

index 50687d8..d9aed3e 100644 (file)
@@ -1529,9 +1529,9 @@ void Generator::initialize(const Config &config)
         if (outputFormats.contains((*g)->format())) {
             currentGenerator_ = (*g);
             (*g)->initializeGenerator(config);
-            QStringList extraImages = config.getCleanPathList((*g)->format() +
-                                                              Config::dot +
-                                                              CONFIG_EXTRAIMAGES);
+            QStringList extraImages = config.getPathList((*g)->format() +
+                                                         Config::dot +
+                                                         CONFIG_EXTRAIMAGES);
             QStringList::ConstIterator e = extraImages.constBegin();
             while (e != extraImages.constEnd()) {
                 QString filePath = *e;