feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I2ae0eb18782224e48cd20d41907f9dfea6ee1771
This commit is contained in:
Eike Ziller
2020-11-10 13:42:46 +01:00
parent 2ecfda056b 0eb65f7211
commit 1d2b5db02f
466 changed files with 7273 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/cppeditor/cppinsertvirtualmethods.cpp
View File

@@ -615,15 +615,11 @@ public:
// - virtual int qt_metacall(QMetaObject::Call, int, void **);
bool skip = false;
for (const Function *firstVirtual : qAsConst(firstVirtuals)) {
if (printer.prettyName(firstVirtual->enclosingClass()->name())
== QLatin1String("QObject")) {
const QString funcName = printer.prettyName(func->name());
if (funcName == QLatin1String("metaObject")
|| funcName == QLatin1String("qt_metacast")
|| funcName == QLatin1String("qt_metacall")) {
skip = true;
break;
}
if (printer.prettyName(firstVirtual->enclosingClass()->name()) == "QObject"
&& magicQObjectFunctions().contains(
printer.prettyName(func->name()))) {
skip = true;
break;
}
}
if (skip)