Merge remote-tracking branch 'origin/4.15'

Change-Id: I1d13f3543ab4bb17f0cbfe26bbea3f154f856ca6
This commit is contained in:
Eike Ziller
2021-04-20 10:42:55 +02:00
99 changed files with 1600 additions and 1265 deletions

View File

@@ -565,34 +565,12 @@ private:
class IdsThatShouldNotBeUsedInDesigner : public QStringList
{
public:
IdsThatShouldNotBeUsedInDesigner() : QStringList({"top",
"bottom",
"left",
"right",
"width",
"height",
"x",
"y",
"opacity",
"parent",
"item",
"flow",
"color",
"margin",
"padding",
"border",
"font",
"text",
"source",
"state",
"visible",
"focus",
"data",
"clip",
"layer",
"scale",
"enabled",
"anchors"})
IdsThatShouldNotBeUsedInDesigner()
: QStringList({"top", "bottom", "left", "right", "width", "height",
"x", "y", "opacity", "parent", "item", "flow",
"color", "margin", "padding", "print", "border", "font",
"text", "source", "state", "visible", "focus", "data",
"clip", "layer", "scale", "enabled", "anchors"})
{}
};