Doc: Simplify qtbase qdocconfs.

We should be using the global qdocconf for the common variables. This
change also allows you to just specify -installdir without using a
templatedir.

Change-Id: I207d279d9b5199212e896fc5ccab5c212b1896c6
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp
index 323737f700..9bde42bae2 100644
--- a/src/tools/qdoc/generator.cpp
+++ b/src/tools/qdoc/generator.cpp
@@ -1648,9 +1648,16 @@ void Generator::initialize(const Config &config)
             QString templateDir = config.getString(
                         (*g)->format() + Config::dot + CONFIG_TEMPLATEDIR);
 
+            QStringList searchDirs;
             if (!templateDir.isEmpty()) {
+                searchDirs.append(templateDir);
+            }
+            if (!Config::installDir.isEmpty()) {
+                searchDirs.append(Config::installDir);
+            }
+
+            if (!searchDirs.isEmpty()) {
                 QStringList noExts;
-                QStringList searchDirs = QStringList() << templateDir;
                 QStringList scripts =
                         config.getCleanPathList((*g)->format()+Config::dot+CONFIG_SCRIPTS);
                 e = scripts.constBegin();
@@ -1671,10 +1678,6 @@ void Generator::initialize(const Config &config)
                     ++e;
                 }
 
-                if (!Config::installDir.isEmpty()) {
-                    searchDirs.append(Config::installDir);
-                }
-
                 QStringList styles =
                         config.getCleanPathList((*g)->format()+Config::dot+CONFIG_STYLESHEETS);
                 e = styles.constBegin();