diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-08-27 07:51:01 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-08-27 07:51:01 +0300 |
commit | b5e21475344d575a7f07f9d6f3dd2a9d82cf4a50 (patch) | |
tree | 75adaf9abab6a9e3052ef9d35dd7709628215cbd /src/qdoc/main.cpp | |
parent | d33c53dd3cf4f750f4c78a9b453df98e1726e827 (diff) | |
parent | 142831bf69b321369a25371e191a24dadd81fee1 (diff) |
Merge dev into 5.14
Change-Id: I4cf54be2bdab30def3620ac44f45d32ad6c7e9a4
Diffstat (limited to 'src/qdoc/main.cpp')
-rw-r--r-- | src/qdoc/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp index 3ce7ef9ea..39ad0c9a2 100644 --- a/src/qdoc/main.cpp +++ b/src/qdoc/main.cpp @@ -581,7 +581,8 @@ int main(int argc, char **argv) // Set the globals declared at the top of this file: QDocCommandLineParser parser; - parser.process(app.arguments(), qdocGlobals); + parser.process(app.arguments()); + qdocGlobals.setOptions(parser); config.setOptions(parser); postProcess(parser); |