diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-06 11:08:00 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-12 07:43:48 +0200 |
| commit | 1a8916cc4f55b70009a50e6fc69a49f32fc02720 (patch) | |
| tree | 9ca1b9a7b63957e905afbff37e67c5396da4d4ab /qmake | |
| parent | 23849826b490c07d9ba656bcb4ac46edd3040c0a (diff) | |
qmake: fix a few deprecated QChar(non-char-type) warnings
The QChar ctors from non-char-types are going to be deprecated.
Change-Id: I17d7916fb1dac9889ead61daca846b1257d17312
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/cachekeys.h | 2 | ||||
| -rw-r--r-- | qmake/library/qmakeevaluator.cpp | 6 | ||||
| -rw-r--r-- | qmake/library/qmakeparser.cpp | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/qmake/cachekeys.h b/qmake/cachekeys.h index e9278653bd..d55fb9909e 100644 --- a/qmake/cachekeys.h +++ b/qmake/cachekeys.h @@ -94,7 +94,7 @@ struct FileInfoCacheKey return true; const QChar c0 = file.at(0); - const QChar c1 = length >= 2 ? file.at(1) : QChar(0); + const QChar c1 = length >= 2 ? file.at(1) : QChar::Null; return !(c0 == QLatin1Char('/') || c0 == QLatin1Char('\\') || (c0.isLetter() && c1 == QLatin1Char(':')) diff --git a/qmake/library/qmakeevaluator.cpp b/qmake/library/qmakeevaluator.cpp index 75296fa1dd..51e26f343b 100644 --- a/qmake/library/qmakeevaluator.cpp +++ b/qmake/library/qmakeevaluator.cpp @@ -282,10 +282,10 @@ ProStringList QMakeEvaluator::split_value_list(const QStringRef &vals, int sourc const QChar *vals_data = vals.data(); const int vals_len = vals.length(); - ushort quote = 0; + char16_t quote = 0; bool hadWord = false; for (int x = 0; x < vals_len; x++) { - ushort unicode = vals_data[x].unicode(); + char16_t unicode = vals_data[x].unicode(); if (unicode == quote) { quote = 0; hadWord = true; @@ -313,7 +313,7 @@ ProStringList QMakeEvaluator::split_value_list(const QStringRef &vals, int sourc break; case '\\': if (x + 1 != vals_len) { - ushort next = vals_data[++x].unicode(); + char16_t next = vals_data[++x].unicode(); if (next == '\'' || next == '"' || next == '\\') { build += QChar(unicode); unicode = next; diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp index ffe90ebda7..c9d5b4fa0d 100644 --- a/qmake/library/qmakeparser.cpp +++ b/qmake/library/qmakeparser.cpp @@ -372,9 +372,9 @@ void QMakeParser::read(ProFile *pro, const QStringRef &in, int line, SubGrammar int wordCount = 0; // Number of words in currently accumulated expression int lastIndent = 0; // Previous line's indentation, to detect accidental continuation abuse bool lineMarked = true; // For in-expression markers - ushort needSep = TokNewStr; // Met unquoted whitespace - ushort quote = 0; - ushort term = 0; + char16_t needSep = TokNewStr; // Met unquoted whitespace + char16_t quote = 0; + char16_t term = 0; Context context; ushort *ptr; @@ -450,7 +450,7 @@ void QMakeParser::read(ProFile *pro, const QStringRef &in, int line, SubGrammar } forever { - ushort c; + char16_t c; // First, skip leading whitespace for (indent = 0; ; ++cur, ++indent) { @@ -636,7 +636,7 @@ void QMakeParser::read(ProFile *pro, const QStringRef &in, int line, SubGrammar } } else if (c == '\\') { static const char symbols[] = "[]{}()$\\'\""; - ushort c2; + char16_t c2; if (cur != end && !((c2 = *cur) & 0xff00) && strchr(symbols, c2)) { c = c2; cur++; |