summaryrefslogtreecommitdiffstats
path: root/src/tools
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2014-06-07 00:40:44 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-06-07 00:40:44 +0200
commitd9a7ad80f78e7346d6f4dbae2cabe31305d6458f (patch)
tree26a410780b94c553051b8898d5abaf37a909691b /src/tools
parentd707acfc9e357ffc86feb5d9219372c30c5ff157 (diff)
parent0fcce50af009f97efa2a5c5f2c74415c92830962 (diff)
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/qdoc/main.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp
index 3f3c11cc90..21ca2c4820 100644
--- a/src/tools/qdoc/main.cpp
+++ b/src/tools/qdoc/main.cpp
@@ -85,7 +85,6 @@ static QStringList dependModules;
static QStringList indexDirs;
static QString currentDir;
static QString prevCurrentDir;
-static QString documentationPath;
/*!
Print the help message to \c stdout.
@@ -156,11 +155,6 @@ static void loadIndexFiles(Config& config)
singleOutputSubdir = "html";
}
- // Allow modules and third-party application/libraries to link
- // to the Qt docs without having to explicitly pass --indexdir.
- if (!indexDirs.contains(documentationPath))
- indexDirs.append(documentationPath);
-
if (dependModules.size() > 0) {
if (indexDirs.size() > 0) {
for (int i = 0; i < indexDirs.size(); i++) {
@@ -231,8 +225,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.";
}
}
@@ -637,7 +630,6 @@ int main(int argc, char **argv)
}
else if (opt == "-installdir") {
Config::installDir = argv[i];
- indexDirs += argv[i];
i++;
}
else if (opt == "-obsoletelinks") {