summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2012-06-11 12:54:42 +0200
committerQt by Nokia <qt-info@nokia.com>2012-06-12 04:29:34 +0200
commit0d456996023053ca491ac28e6d706fa01de22dd2 (patch)
tree5ab306dfe74504ef4227f24821aa65836b923a8b
parent14b07221664f95aea7603d6b7625c4467641b57c (diff)
QDoc: Also allow dependant modules to be specified on CLI.
Change-Id: I25dfbadc788616a864ecbf322434a3ce45bb94e5 Reviewed-by: Martin Smith <martin.smith@nokia.com>
-rw-r--r--src/tools/qdoc/main.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp
index 41d2f44a68..9dd5384dd3 100644
--- a/src/tools/qdoc/main.cpp
+++ b/src/tools/qdoc/main.cpp
@@ -98,6 +98,7 @@ static bool highlighting = false;
static bool showInternal = false;
static bool obsoleteLinks = false;
static QStringList defines;
+static QStringList dependModules;
static QStringList indexDirs;
static QHash<QString, Tree *> trees;
@@ -110,6 +111,8 @@ static void printHelp()
"Options:\n"
" -D<name> "
"Define <name> as a macro while parsing sources\n"
+ " -depends "
+ "Specify dependant modules\n"
" -help "
"Display this information and exit\n"
" -highlighting "
@@ -250,7 +253,7 @@ static void processQdocconfFile(const QString &fileName)
*/
QStringList indexFiles = config.getStringList(CONFIG_INDEXES);
- QStringList dependModules = config.getStringList(CONFIG_DEPENDS);
+ dependModules += config.getStringList(CONFIG_DEPENDS);
if (dependModules.size() > 0) {
if (indexDirs.size() > 0) {
@@ -516,6 +519,10 @@ int main(int argc, char **argv)
QString define = opt.mid(2);
defines += define;
}
+ else if (opt == "-depends") {
+ dependModules += argv[i];
+ i++;
+ }
else if (opt == "-highlighting") {
highlighting = true;
}