Merge remote-tracking branch 'origin/4.14'

Change-Id: I26a53ef81a54a2f7aa482448118298895b712941
2021-01-12 14:14:41 +01:00
parent dedae466fd 4231a88b67
commit 7ce3ceabe9
12 changed files with 68 additions and 29 deletions
--- 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: