summaryrefslogtreecommitdiffstats
path: root/qmake/library/qmakeparser.cpp
diff options
context:
space:
mode:
authorMarc Mutz <[email protected]>2020-05-06 11:08:00 +0200
committerMarc Mutz <[email protected]>2020-05-12 07:43:48 +0200
commit1a8916cc4f55b70009a50e6fc69a49f32fc02720 (patch)
tree9ca1b9a7b63957e905afbff37e67c5396da4d4ab /qmake/library/qmakeparser.cpp
parent23849826b490c07d9ba656bcb4ac46edd3040c0a (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 <[email protected]> Reviewed-by: Joerg Bornemann <[email protected]>
Diffstat (limited to 'qmake/library/qmakeparser.cpp')
-rw-r--r--qmake/library/qmakeparser.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/qmake/library/qmakeparser.cpp b/qmake/library/qmakeparser.cpp
index ffe90ebda71..c9d5b4fa0db 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++;