diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-23 09:24:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-23 09:40:54 +0200 |
| commit | 32f50225c4913de1af145ef2da9a11ffffac3ded (patch) | |
| tree | c2ecd51223706f3ad1234af883af9fdf33d846a2 /src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp | |
| parent | 88e6f8cff2974c46b1262f3a1a61e1440c664e0c (diff) | |
| parent | 9c58dd15885d813aeb5d83d2869c0f3a3ee5fcfe (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
src/plugins/platforms/direct2d/direct2d.pro
src/plugins/platforms/ios/qiosclipboard.mm
src/plugins/platforms/windows/windows.pro
Change-Id: Idffa03b3990bd642784f528821c5446b2e1008ef
Diffstat (limited to 'src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp')
| -rw-r--r-- | src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp index 809aa68365..b5a0a5bbeb 100644 --- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp +++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp @@ -520,7 +520,7 @@ static inline int fromBase8(const char *s, const char *end) { int result = 0; while (*s && s != end) { - if (*s <= '0' || *s >= '7') + if (*s < '0' || *s > '7') return 0; result *= 8; result += *s - '0'; |