diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:39:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-08 09:58:20 +0100 |
| commit | 66fb4a7d97b8e3dd90c983a9a94c2e7352f9d5e8 (patch) | |
| tree | af78d7d89a71e6e973b30d450fec1de5b08d8c9c /src/shared/winutils/utils.h | |
| parent | e238a37c1888e069ca1a6464f9e4e8f659e53fe7 (diff) | |
| parent | 7249ba659951a9ca388a7a09cd301a2d9f79eaa4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.12.1
Conflicts:
qttools.pro
Change-Id: Ibf247399306794b1d79ebbcd230b853896d0bc87
Diffstat (limited to 'src/shared/winutils/utils.h')
| -rw-r--r-- | src/shared/winutils/utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/winutils/utils.h b/src/shared/winutils/utils.h index 4cede6b55..5552a3665 100644 --- a/src/shared/winutils/utils.h +++ b/src/shared/winutils/utils.h @@ -82,8 +82,8 @@ inline std::wostream &operator<<(std::wostream &str, const QString &s) // Container class for JSON output class JsonOutput { - typedef QPair<QString, QString> SourceTargetMapping; - typedef QList<SourceTargetMapping> SourceTargetMappings; + using SourceTargetMapping = QPair<QString, QString>; + using SourceTargetMappings = QList<SourceTargetMapping>; public: void addFile(const QString &source, const QString &target) |