diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-12-11 11:28:11 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-12-13 19:14:49 +0000 |
| commit | 59febb49e45b009b740ff8b67bba30c4a285a2f2 (patch) | |
| tree | eb3928e8568ee7c7f2e5f59fb4091efc63c7e5a1 /src/corelib/tools/qunicodetables_p.h | |
| parent | 457fe3e8e2f27d773032f4406d5f933ae155e8ff (diff) | |
Fix a bug in the generation of the Unicode joining property data
The code that was supposed to initialize the joining property of
characters to the correct defaults was actually applied after reading
in the data from the Unicode file, and was in a couple of cases
overwriting explicitly specified data in ArabicShaping.txt
Task-number: QTBUG-63191
Change-Id: Ie35261039b2211a827322ca11afacd9555ccefc7
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/corelib/tools/qunicodetables_p.h')
| -rw-r--r-- | src/corelib/tools/qunicodetables_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h index 5a422ea4eb..be2f44f0c3 100644 --- a/src/corelib/tools/qunicodetables_p.h +++ b/src/corelib/tools/qunicodetables_p.h @@ -50,11 +50,11 @@ // We mean it. // -#include <QtCore/private/qglobal_p.h> - #ifndef QUNICODETABLES_P_H #define QUNICODETABLES_P_H +#include <QtCore/private/qglobal_p.h> + #include <QtCore/qchar.h> QT_BEGIN_NAMESPACE |