summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2019-08-09 15:16:26 +0200
committerPaul Wicking <paul.wicking@qt.io>2019-09-26 11:39:11 +0200
commitdea8c7c861369db6f66aebd3b032d81efe87b1f9 (patch)
tree1ef2bcd13683ef38df3ea2fbf4449dd92caa83b0
parent3179a484e03df899c70be234750081eca599416f (diff)
downloadqttools-dea8c7c861369db6f66aebd3b032d81efe87b1f9.tar.gz
QDoc: Minor cleanup in main.cpp
Move a variable to where it's used. Remove unused code that's been commented out. Change-Id: I240265c8eded345b40c988fa50e1618bff530345 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r--src/qdoc/main.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index 4f4dcf5c4..b8bee56d5 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -228,7 +228,6 @@ static void processQdocconfFile(const QString &fileName, Config &config)
Location::initialize(config);
config.load(fileName);
QString project = config.getString(CONFIG_PROJECT);
- QString moduleHeader = config.getString(CONFIG_MODULEHEADER);
if (project.isEmpty()) {
Location::logToStdErrAlways(QLatin1String("qdoc can't run; no project set in qdocconf file"));
exit(1);
@@ -306,8 +305,6 @@ static void processQdocconfFile(const QString &fileName, Config &config)
}
#endif
- //QSet<QString> outputLanguages = config.getStringSet(CONFIG_OUTPUTLANGUAGES);
-
/*
Get the source language (Cpp) from the configuration
and the location in the configuration file where the
@@ -348,6 +345,8 @@ static void processQdocconfFile(const QString &fileName, Config &config)
qdb->newPrimaryTree(project);
else
qdb->setPrimaryTree(project);
+
+ const QString moduleHeader = config.getString(CONFIG_MODULEHEADER);
if (!moduleHeader.isNull())
clangParser_->setModuleHeader(moduleHeader);
else