From 6326746d226fa55175a83d6b197630d75cd6a9cb Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Fri, 9 Nov 2012 15:33:02 +0100
Subject: qdoc: better copying of .css files

This fix searches for the css files specified in the
stylesheets variable. It searches for them in the
directory specified as the templatedir. It copies
them into the style subdirectory of the outputdir.

It also tests QT_INSTALL_DOCS before setting it to
the library info. If it was set on the command line,
it is not set from the library info.

This change also includes some debug code, which
will be removed after testing.

Task-number: QTBUG-27878
Change-Id: I7a9469b840e13b966aca44b99aebba102e5d4f0c
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
---
 src/tools/qdoc/generator.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/tools/qdoc/generator.cpp')

diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp
index 67e18b45dd..b728aa363a 100644
--- a/src/tools/qdoc/generator.cpp
+++ b/src/tools/qdoc/generator.cpp
@@ -1548,10 +1548,10 @@ void Generator::initialize(const Config &config)
             // Documentation template handling
             QStringList searchDirs;
             QString templateDir = config.getString((*g)->format() + Config::dot + CONFIG_TEMPLATEDIR);
+            qDebug() << "TEMPLATEDIR:" << templateDir << (*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);
             e = scripts.constBegin();
@@ -1573,6 +1573,10 @@ void Generator::initialize(const Config &config)
             }
 
             QStringList styles = config.getCleanPathList((*g)->format()+Config::dot+CONFIG_STYLESHEETS);
+            qDebug() << "STYLES:" << styles;
+            qDebug() << "SEARCHDIRS:" << searchDirs;
+            qDebug() << "STYLEFILES:" << styleFiles;
+            Config::debug = true;
             e = styles.constBegin();
             while (e != styles.constEnd()) {
                 QString userFriendlyFilePath;
@@ -1582,6 +1586,7 @@ void Generator::initialize(const Config &config)
                                                     *e,
                                                     noExts,
                                                     userFriendlyFilePath);
+                qDebug() << "FILEPATH:" << filePath;
                 if (!filePath.isEmpty())
                     Config::copyFile(config.lastLocation(),
                                      filePath,
@@ -1590,6 +1595,7 @@ void Generator::initialize(const Config &config)
                                      "/style");
                 ++e;
             }
+            Config::debug = false;
         }
         ++g;
     }
-- 
cgit v1.2.3