summaryrefslogtreecommitdiffstats
path: root/src/doxygen.cpp
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-08-15 17:48:24 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-08-15 17:48:24 (GMT)
commit6385a83aa86bc5ad741d8068a574c5851bed708a (patch)
tree51a3748236d6503a4ec07d82fcc509eec1c32084 /src/doxygen.cpp
parentb272b4b5077873457a0f6b517ac799f4a5f8c951 (diff)
parent1076d3814fa27fbd93d5df8f088d76ca4a27bb71 (diff)
downloadDoxygen-6385a83aa86bc5ad741d8068a574c5851bed708a.zip
Doxygen-6385a83aa86bc5ad741d8068a574c5851bed708a.tar.gz
Doxygen-6385a83aa86bc5ad741d8068a574c5851bed708a.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src/doxygen.cpp')
-rw-r--r--src/doxygen.cpp26
1 files changed, 14 insertions, 12 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index a31b559..168725d 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -9152,22 +9152,24 @@ static void copyStyleSheet()
copyFile(htmlStyleSheet,destFileName);
}
}
- QCString &htmlExtraStyleSheet = Config_getString("HTML_EXTRA_STYLESHEET");
- if (!htmlExtraStyleSheet.isEmpty())
+ QStrList htmlExtraStyleSheet = Config_getList("HTML_EXTRA_STYLESHEET");
+ for (uint i=0; i<htmlExtraStyleSheet.count(); ++i)
{
- QFileInfo fi(htmlExtraStyleSheet);
- if (!fi.exists())
- {
- err("Style sheet '%s' specified by HTML_EXTRA_STYLESHEET does not exist!\n",htmlExtraStyleSheet.data());
- htmlExtraStyleSheet.resize(0); // revert to the default
- }
- else
+ QCString fileName(htmlExtraStyleSheet.at(i));
+ if (!fileName.isEmpty())
{
- QCString destFileName = Config_getString("HTML_OUTPUT")+"/"+fi.fileName().data();
- copyFile(htmlExtraStyleSheet,destFileName);
+ QFileInfo fi(fileName);
+ if (!fi.exists())
+ {
+ err("Style sheet '%s' specified by HTML_EXTRA_STYLESHEET does not exist!\n",fileName.data());
+ }
+ else
+ {
+ QCString destFileName = Config_getString("HTML_OUTPUT")+"/"+fi.fileName().data();
+ copyFile(fileName, destFileName);
+ }
}
}
-
}
static void copyLogo()