whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deprecate providing a function as a property flag 

Property flags such as SCRIPTABLE should not get controlled by
a function. I can't see this feature being used anywhere and it
leads to additional overhead that I'd like to get rid of for Qt 6.

Change-Id: Iaa10b2b3bfb7eec11401f7b6bb887c9467b67183
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Lars Knoll 2019-05-02 14:31:34 +02:00
parent e3b55616e2
commit 1f1e04f29f
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/tools/moc/moc.cpp
View File

@ -1194,6 +1194,15 @@ void Moc::createPropertyDef(PropertyDef &propDef)
propDef.type = type;
auto checkIsFunction = [&](const QByteArray &def, const char *name) {
if (def.endsWith(')')) {
QByteArray msg = "Providing a function for ";
msg += name;
msg += " in a property declaration is deprecated and will not be supported in Qt 6 anymore.";
warning(msg.constData());
}
};
next();
propDef.name = lexem();
while (test(IDENTIFIER)) {
@ -1243,11 +1252,13 @@ void Moc::createPropertyDef(PropertyDef &propDef)
error(2);
break;
case 'S':
if (l == "SCRIPTABLE")
if (l == "SCRIPTABLE") {
propDef.scriptable = v + v2;
else if (l == "STORED")
checkIsFunction(propDef.scriptable, "SCRIPTABLE");
} else if (l == "STORED") {
propDef.stored = v + v2;
else
checkIsFunction(propDef.stored, "STORED");
} else
error(2);
break;
case 'W': if (l != "WRITE") error(2);
@ -1255,15 +1266,18 @@ void Moc::createPropertyDef(PropertyDef &propDef)
break;
case 'D': if (l != "DESIGNABLE") error(2);
propDef.designable = v + v2;
checkIsFunction(propDef.designable, "DESIGNABLE");
break;
case 'E': if (l != "EDITABLE") error(2);
propDef.editable = v + v2;
checkIsFunction(propDef.editable, "EDITABLE");
break;
case 'N': if (l != "NOTIFY") error(2);
propDef.notify = v;
break;
case 'U': if (l != "USER") error(2);
propDef.user = v + v2;
checkIsFunction(propDef.user, "USER");
break;
default:
error(2);