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/linguist/lupdate/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/linguist/lupdate/main.cpp')
| -rw-r--r-- | src/linguist/lupdate/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp index d9c6f7966..d74f213cc 100644 --- a/src/linguist/lupdate/main.cpp +++ b/src/linguist/lupdate/main.cpp @@ -529,14 +529,14 @@ static QSet<QString> projectRoots(const QString &projectFile, const QStringList sourceDirs.insert(proPath + QLatin1Char('/')); for (const QString &sf : sourceFiles) sourceDirs.insert(sf.left(sf.lastIndexOf(QLatin1Char('/')) + 1)); - QStringList rootList = sourceDirs.toList(); + QStringList rootList = sourceDirs.values(); rootList.sort(); for (int prev = 0, curr = 1; curr < rootList.length(); ) if (rootList.at(curr).startsWith(rootList.at(prev))) rootList.removeAt(curr); else prev = curr++; - return rootList.toSet(); + return QSet<QString>(rootList.cbegin(), rootList.cend()); } class ProjectProcessor |