From 7c94b8955f5c0e0fe0633f2a4ddfd0c050e02f62 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 21 May 2014 14:14:05 +0200 Subject: purge obsolete variable documentationPath Change-Id: I1eb9e7ff28e0632c5a87b726dcd52b6542612101 Reviewed-by: Martin Smith --- src/tools/qdoc/main.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'src/tools') diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index 3d2ee409b0..2c1c28ec8c 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -84,7 +84,6 @@ static QStringList dependModules; static QStringList indexDirs; static QString currentDir; static QString prevCurrentDir; -static QString documentationPath; /*! Print the help message to \c stdout. @@ -155,11 +154,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++) { -- cgit v1.2.3 From 52ff4120a29e915215ea06499ae08e17ba997074 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 14 May 2014 14:17:37 +0200 Subject: Fix Null pointer dereferencing in an error handler identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I0042336d9598415b978bf9819e74639685c627b5 Reviewed-by: Martin Smith --- src/tools/qdoc/qdocindexfiles.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools') diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp index 47e302dad6..00c9c55020 100644 --- a/src/tools/qdoc/qdocindexfiles.cpp +++ b/src/tools/qdoc/qdocindexfiles.cpp @@ -536,7 +536,7 @@ void QDocIndexFiles::readIndexSection(const QDomElement& element, } else { qDebug() << "NODE:" << node->name() << "GROUPS:" << groupNames; - qDebug() << "DID NOT FIND GROUP:" << dn->name() << "for:" << node->name(); + qDebug() << "DID NOT FIND GROUP for:" << node->name(); } } } -- cgit v1.2.3 From 939d021813974949cc21e56bf70c4340ea14fba9 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 21 May 2014 14:15:24 +0200 Subject: do not auto-add install dir to index dirs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit the install dir may contain indexes from previous builds. a build must never refer to previous builds. Change-Id: I67c04df8f3f82bdbebb67e280f70795ed0a76ccf Reviewed-by: Topi Reiniö Reviewed-by: Joerg Bornemann --- src/tools/qdoc/main.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/tools') 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") { -- cgit v1.2.3