summaryrefslogtreecommitdiff
path: root/src/qdoc/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qdoc/main.cpp')
-rw-r--r--src/qdoc/main.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp
index 39ad0c9a2..4f4dcf5c4 100644
--- a/src/qdoc/main.cpp
+++ b/src/qdoc/main.cpp
@@ -234,12 +234,10 @@ static void processQdocconfFile(const QString &fileName, Config &config)
exit(1);
}
/*
- Add the defines to the configuration variables.
+ Add the defines and includepaths to their respective configuration variables.
*/
- QStringList defs = qdocGlobals.defines() + config.getStringList(CONFIG_DEFINES);
- config.setStringList(CONFIG_DEFINES,defs);
- QStringList incs = qdocGlobals.includesPaths() + config.getStringList(CONFIG_INCLUDEPATHS);
- config.setStringList(CONFIG_INCLUDEPATHS, incs);
+ config.insertStringList(CONFIG_DEFINES, qdocGlobals.defines());
+ config.insertStringList(CONFIG_INCLUDEPATHS, qdocGlobals.includesPaths());
Location::terminate();
qdocGlobals.setCurrentDir(QFileInfo(fileName).path());