diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 18:37:26 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-19 18:37:26 +0100 |
| commit | 852f4e4cf87d7db0eaa87384b1589e151f76e6cd (patch) | |
| tree | 73bc838da6bde8b66e26c2e1a34ff319584edf82 /src/qdoc/tokenizer.cpp | |
| parent | 863a6621d14caf67adcf3f30cb955a268765f0f1 (diff) | |
| parent | 98eebb2dc1830b262d72e748817aee25e54d0d35 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: Ibd5f6052bd07152fbe344505308563d9857771e9
Diffstat (limited to 'src/qdoc/tokenizer.cpp')
| -rw-r--r-- | src/qdoc/tokenizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/tokenizer.cpp b/src/qdoc/tokenizer.cpp index 987fff548..f723debe7 100644 --- a/src/qdoc/tokenizer.cpp +++ b/src/qdoc/tokenizer.cpp @@ -59,7 +59,7 @@ static const char *kwords[] = { "private", "protected", "public", "short", "signals", "signed", "slots", "static", "struct", "template", "typedef", "typename", "union", "unsigned", "using", "virtual", "void", "volatile", - "__int64", + "__int64", "default", "delete", "final", "Q_OBJECT", "Q_OVERRIDE", "Q_PROPERTY", |