diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-02 09:58:28 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-02 13:21:18 +0100 |
| commit | fb16802edcbf8feeecd6a4f760888852aafd117e (patch) | |
| tree | 910eebd355106840d6bfa24a8b73365b06272ba0 /src/qtattributionsscanner | |
| parent | 3c7675d9609a15bea81884560920bded736f79a6 (diff) | |
| parent | f1233878fef715c0746dcb6af7164acfb46fd418 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.105.10
Conflicts:
src/qtattributionsscanner/main.cpp
Change-Id: Ic509d457547ec64122b17511563de5ea3e1b1b44
Diffstat (limited to 'src/qtattributionsscanner')
| -rw-r--r-- | src/qtattributionsscanner/main.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/qtattributionsscanner/main.cpp b/src/qtattributionsscanner/main.cpp index ddb942a9d..59b0e6794 100644 --- a/src/qtattributionsscanner/main.cpp +++ b/src/qtattributionsscanner/main.cpp @@ -138,6 +138,7 @@ int main(int argc, char *argv[]) } QString generator = parser.value(generatorOption); + out.setCodec("UTF-8"); if (generator == QLatin1String("qdoc")) { QString baseDirectory = parser.value(baseDirOption); if (baseDirectory.isEmpty()) { |