diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-06-27 10:22:29 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-06-27 10:33:44 +0200 |
| commit | c7b724c4caa78383640d6f66a95b144d91ecb40a (patch) | |
| tree | efee89d2737dcd65d40468d35b16c66710d72b8f /src/libs/cplusplus/ResolveExpression.cpp | |
| parent | c456572fa57295d90147408c61a1209c96a43791 (diff) | |
| parent | 06715441d695064e0548fa94d0cc3e325a3870a6 (diff) | |
| download | qt-creator-c7b724c4caa78383640d6f66a95b144d91ecb40a.tar.gz | |
Merge remote-tracking branch 'origin/8.0'
Change-Id: Ia1c97d5949de607177a5a0632c7e8a37cbfd3475
Diffstat (limited to 'src/libs/cplusplus/ResolveExpression.cpp')
| -rw-r--r-- | src/libs/cplusplus/ResolveExpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/cplusplus/ResolveExpression.cpp b/src/libs/cplusplus/ResolveExpression.cpp index 4ff023624e..6803194ec6 100644 --- a/src/libs/cplusplus/ResolveExpression.cpp +++ b/src/libs/cplusplus/ResolveExpression.cpp @@ -1045,7 +1045,7 @@ ClassOrNamespace *ResolveExpression::findClass(const FullySpecifiedType &origina ClassOrNamespace *binding = nullptr; if (Class *klass = ty->asClassType()) { - if (scope->isBlock()) + if (scope->asBlock()) binding = _context.lookupType(klass->name(), scope, enclosingBinding); if (!binding) binding = _context.lookupType(klass, enclosingBinding); @@ -1135,7 +1135,7 @@ ClassOrNamespace *ResolveExpression::baseExpression(const QList<LookupItem> &bas instantiatedFunction = overloadTy->asFunctionType(); } else if (overloadType->isTemplateType() && overloadType->asTemplateType()->declaration() - && overloadType->asTemplateType()->declaration()->isFunction()) { + && overloadType->asTemplateType()->declaration()->asFunction()) { instantiatedFunction = overloadType->asTemplateType()->declaration()->asFunction(); } |