File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -3059,6 +3059,8 @@ static std::vector<DuplMemberFuncInfo> getDuplInheritedMemberFunctionsRecursive(
30593059 for (const Function& classFuncIt : typeCurrent->classScope ->functionList ) {
30603060 if (classFuncIt.isImplicitlyVirtual ())
30613061 continue ;
3062+ if (classFuncIt.tokenDef ->isExpandedMacro ())
3063+ continue ;
30623064 for (const Function& parentClassFuncIt : parentClassIt.type ->classScope ->functionList ) {
30633065 if (classFuncIt.name () == parentClassFuncIt.name () &&
30643066 (parentClassFuncIt.access != AccessControl::Private || !skipPrivate) &&
@@ -3200,6 +3202,8 @@ void CheckClass::checkOverride()
32003202 for (const Function &func : classScope->functionList ) {
32013203 if (func.hasOverrideSpecifier () || func.hasFinalSpecifier ())
32023204 continue ;
3205+ if (func.tokenDef ->isExpandedMacro ())
3206+ continue ;
32033207 const Function *baseFunc = func.getOverriddenFunction ();
32043208 if (baseFunc)
32053209 overrideError (baseFunc, &func);
Original file line number Diff line number Diff line change @@ -804,3 +804,11 @@ const QString& unassignedVariable_static_QString() // #12935
804804 static QString qs;
805805 return qs;
806806}
807+
808+ struct BQObject_missingOverride { // #13406
809+ Q_OBJECT
810+ };
811+
812+ struct DQObject_missingOverride : BQObject_missingOverride {
813+ Q_OBJECT
814+ };
You can’t perform that action at this time.
0 commit comments