diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-30 10:35:49 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-09-30 10:42:28 +0200 |
| commit | bf3a7979a41b166b8dc178a3cc6a22f15a4e6ea5 (patch) | |
| tree | ef02290769e610427f052a53a0e24e71b4adc9e1 /src/plugins/scanner/cpp/Token.cpp | |
| parent | d17105376102c4cd846757c7f091b9f3cd90e4d7 (diff) | |
| parent | ed69ed958d6ca25cb97dc81b21322f8ab398b7df (diff) | |
Merge 1.6 into master
Change-Id: I5a0de1ab1c38080d6061045d28fa9220a88ef4ba
Diffstat (limited to 'src/plugins/scanner/cpp/Token.cpp')
| -rw-r--r-- | src/plugins/scanner/cpp/Token.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/scanner/cpp/Token.cpp b/src/plugins/scanner/cpp/Token.cpp index b7126bf8a..ee125652c 100644 --- a/src/plugins/scanner/cpp/Token.cpp +++ b/src/plugins/scanner/cpp/Token.cpp @@ -109,6 +109,7 @@ static const char *token_names[] = { ("Q_FOREACH"), ("Q_D"), ("Q_Q"), ("Q_INVOKABLE"), ("Q_PROPERTY"), ("Q_INTERFACES"), ("Q_ENUMS"), ("Q_FLAGS"), ("Q_PRIVATE_SLOT"), ("Q_DECLARE_INTERFACE"), ("Q_OBJECT"), ("Q_GADGET"), + ("Q_NAMESPACE"), }; |