diff options
author | Eike Ziller <eike.ziller@qt.io> | 2021-01-12 14:14:41 +0100 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2021-01-12 14:14:41 +0100 |
commit | 7ce3ceabe903b6adf219ec58d8022c6dcc6c8f1c (patch) | |
tree | eb27967b24f2f238e02ea583e14cdae8b66e5123 /src/libs/3rdparty/cplusplus/Parser.cpp | |
parent | dedae466fdcb3887236226c79757ae8169f405e2 (diff) | |
parent | 4231a88b67abe9ce2bfcffedc589a262c230d642 (diff) | |
download | qt-creator-7ce3ceabe903b6adf219ec58d8022c6dcc6c8f1c.tar.gz |
Merge remote-tracking branch 'origin/4.14'
Change-Id: I26a53ef81a54a2f7aa482448118298895b712941
Diffstat (limited to 'src/libs/3rdparty/cplusplus/Parser.cpp')
-rw-r--r-- | src/libs/3rdparty/cplusplus/Parser.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp index 54b7c04570..b5cf315e64 100644 --- a/src/libs/3rdparty/cplusplus/Parser.cpp +++ b/src/libs/3rdparty/cplusplus/Parser.cpp @@ -2308,6 +2308,7 @@ bool Parser::parseAccessDeclaration(DeclarationAST *&node) [SCRIPTABLE bool] [STORED bool] [USER bool] + [BINDABLE bindableFunction] [CONSTANT] [FINAL]) @@ -2363,6 +2364,7 @@ bool Parser::parseQtPropertyDeclaration(DeclarationAST *&node) case Token_READ: case Token_WRITE: case Token_MEMBER: + case Token_BINDABLE: case Token_RESET: case Token_NOTIFY: case Token_REVISION: |