diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-22 11:08:08 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-23 08:57:00 +0200 |
| commit | af0574a7f73f8815f0f276d8727f4cae74a4110a (patch) | |
| tree | fbfd0f1e84f58c2b9ed6d91088dac07306092df1 /src/qdoc/main.cpp | |
| parent | fe5a157cbe37d2516ca69c92c4ec989ce77a25a2 (diff) | |
| download | qttools-af0574a7f73f8815f0f276d8727f4cae74a4110a.tar.gz | |
Fix deprecation warnings about deprecated container conversions
Fix warnings introduced by
qtbase/92f984273262531f909ede17a324f546fe502b5c.
Change-Id: Iaca85ad36591f7208f63305b885e7ff59c014a72
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qdoc/main.cpp')
| -rw-r--r-- | src/qdoc/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qdoc/main.cpp b/src/qdoc/main.cpp index bb62a9160..db986b6fc 100644 --- a/src/qdoc/main.cpp +++ b/src/qdoc/main.cpp @@ -376,8 +376,10 @@ static void processQdocconfFile(const QString &fileName) + CONFIG_LANDINGTITLE, title)); } - QSet<QString> excludedDirs = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEDIRS)); - QSet<QString> excludedFiles = QSet<QString>::fromList(config.getCanonicalPathList(CONFIG_EXCLUDEFILES)); + const auto &excludedDirList = config.getCanonicalPathList(CONFIG_EXCLUDEDIRS); + QSet<QString> excludedDirs = QSet<QString>(excludedDirList.cbegin(), excludedDirList.cend()); + const auto &excludedFilesList = config.getCanonicalPathList(CONFIG_EXCLUDEFILES); + QSet<QString> excludedFiles = QSet<QString>(excludedFilesList.cbegin(), excludedFilesList.cend()); qCDebug(lcQdoc, "Adding doc/image dirs found in exampledirs to imagedirs"); QSet<QString> exampleImageDirs; |