summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-05-21 14:15:24 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-05 17:11:35 +0200
commit939d021813974949cc21e56bf70c4340ea14fba9 (patch)
tree59bf6efc557170c2936ddb6cf129b89ebc7b95f0 /src/tools
parenta763500a61de7c25b73d6eb54a7d8ca60af0d79e (diff)
do not auto-add install dir to index dirs
the install dir may contain indexes from previous builds. a build must never refer to previous builds. Change-Id: I67c04df8f3f82bdbebb67e280f70795ed0a76ccf Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qdoc/main.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp
index 2c1c28ec8c..8998a27081 100644
--- a/src/tools/qdoc/main.cpp
+++ b/src/tools/qdoc/main.cpp
@@ -224,8 +224,7 @@ static void loadIndexFiles(Config& config)
}
}
else {
- qDebug() << "Dependant modules specified, but no index directories or "
- << "install directory were set."
+ qDebug() << "Dependent modules specified, but no index directories were set."
<< "There will probably be errors for missing links.";
}
}
@@ -618,7 +617,6 @@ int main(int argc, char **argv)
}
else if (opt == "-installdir") {
Config::installDir = argv[i];
- indexDirs += argv[i];
i++;
}
else if (opt == "-obsoletelinks") {