diff options
author | Aleksei German <aleksei.german@qt.io> | 2021-07-13 17:01:35 +0200 |
---|---|---|
committer | Aleksei German <aleksei.german@qt.io> | 2021-09-10 08:51:23 +0000 |
commit | 64c525800b8933c490218a8688fa40f600ab3058 (patch) | |
tree | 43cfb8489be42ae078d56223f60c162f3ea7c4d8 /share | |
parent | f2642e6f3ca83b2453c609706043303814cd68c1 (diff) |
QmlDesigner: Fix for qds-mcu metainfo rules
- Fixes dublicated values
- Fixes properties that were assigned to the wrong item
- Adds new qul-1.9 metadata file
Task-number: QDS-4712
Change-Id: I7486d1a202b81fde06673076dda80cc13d8d274e
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qtcreator/qmldesigner/qt4mcu/metadata.qml | 10 | ||||
-rw-r--r-- | share/qtcreator/qmldesigner/qt4mcu/qul-14.qml | 17 | ||||
-rw-r--r-- | share/qtcreator/qmldesigner/qt4mcu/qul-17.qml | 17 | ||||
-rw-r--r-- | share/qtcreator/qmldesigner/qt4mcu/qul-18.qml | 17 | ||||
-rw-r--r-- | share/qtcreator/qmldesigner/qt4mcu/qul-19.qml | 216 |
5 files changed, 257 insertions, 20 deletions
diff --git a/share/qtcreator/qmldesigner/qt4mcu/metadata.qml b/share/qtcreator/qmldesigner/qt4mcu/metadata.qml index 20ddf65da7..d26ef06fd5 100644 --- a/share/qtcreator/qmldesigner/qt4mcu/metadata.qml +++ b/share/qtcreator/qmldesigner/qt4mcu/metadata.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -27,7 +27,7 @@ Metadata { id: metadataFile - defaultVersion: v18 + defaultVersion: v19 VersionData { id: v14 @@ -46,4 +46,10 @@ Metadata { name: "QUL 1.8" path: "qul-18.qml" } + + VersionData { + id: v19 + name: "QUL 1.9" + path: "qul-19.qml" + } } diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml index 00e4ad790f..cebc31f67c 100644 --- a/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml +++ b/share/qtcreator/qmldesigner/qt4mcu/qul-14.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -80,11 +80,15 @@ VersionData { } QtQuick.Item { - bannedProperties: ["layer", "opacity", "gradient", "smooth", "antialiasing", - "border", "baselineOffset", "focus", "activeFocusOnTab", + bannedProperties: ["layer", "opacity", "smooth", "antialiasing", + "baselineOffset", "focus", "activeFocusOnTab", "rotation", "scale", "transformOrigin"] } + QtQuick.Rectangle { + bannedProperties: ["gradient", "border"] + } + QtQuick.Flickable { bannedProperties: ["boundsBehavior", "boundsMovement", "flickDeceleration", "flickableDirection", "leftMargin", "rightMargin", "bottomMargin", "topMargin", @@ -113,7 +117,7 @@ VersionData { allowChildren: false allowedProperties: ["rotation", "scale", "transformOrigin"] bannedProperties: ["elide", "lineHeight", "lineHeightMode", "wrapMode", "style", - "styleColor", "minimumPointSize", "minimumPixelSize", "styleColor", + "styleColor", "minimumPointSize", "minimumPixelSize", "fontSizeMode", "renderType", "textFormat", "maximumLineCount"] } @@ -123,11 +127,12 @@ VersionData { } QtQuick.Column { - bannedProperties: ["layoutDirection"] + bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding"] } QtQuick.Row { - bannedProperties: ["layoutDirection"] + bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding", + "effectiveLayoutDirection", "layoutDirection"] } QtQuick.ListView { diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml index ac2caa939c..b8dc8d3d83 100644 --- a/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml +++ b/share/qtcreator/qmldesigner/qt4mcu/qul-17.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -82,11 +82,15 @@ VersionData { } QtQuick.Item { - bannedProperties: ["layer", "opacity", "gradient", "smooth", "antialiasing", - "border", "baselineOffset", "focus", "activeFocusOnTab", + bannedProperties: ["layer", "opacity", "smooth", "antialiasing", + "baselineOffset", "focus", "activeFocusOnTab", "rotation", "scale", "transformOrigin"] } + QtQuick.Rectangle { + bannedProperties: ["gradient", "border"] + } + QtQuick.Flickable { bannedProperties: ["boundsBehavior", "boundsMovement", "flickDeceleration", "flickableDirection", "leftMargin", "rightMargin", "bottomMargin", "topMargin", @@ -115,7 +119,7 @@ VersionData { allowChildren: false allowedProperties: ["rotation", "scale", "transformOrigin"] bannedProperties: ["elide", "lineHeight", "lineHeightMode", "wrapMode", "style", - "styleColor", "minimumPointSize", "minimumPixelSize", "styleColor", + "styleColor", "minimumPointSize", "minimumPixelSize", "fontSizeMode", "renderType", "textFormat", "maximumLineCount"] } @@ -125,11 +129,12 @@ VersionData { } QtQuick.Column { - bannedProperties: ["layoutDirection"] + bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding"] } QtQuick.Row { - bannedProperties: ["layoutDirection"] + bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding", + "effectiveLayoutDirection", "layoutDirection"] } QtQuick.ListView { diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml index b65084451b..5f59109374 100644 --- a/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml +++ b/share/qtcreator/qmldesigner/qt4mcu/qul-18.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. @@ -83,11 +83,15 @@ VersionData { } QtQuick.Item { - bannedProperties: ["layer", "opacity", "gradient", "smooth", "antialiasing", - "border", "baselineOffset", "focus", "activeFocusOnTab", + bannedProperties: ["layer", "opacity", "smooth", "antialiasing", + "baselineOffset", "focus", "activeFocusOnTab", "rotation", "scale", "transformOrigin"] } + QtQuick.Rectangle { + bannedProperties: ["gradient", "border"] + } + QtQuick.Flickable { bannedProperties: ["boundsBehavior", "boundsMovement", "flickDeceleration", "flickableDirection", "leftMargin", "rightMargin", "bottomMargin", "topMargin", @@ -116,7 +120,7 @@ VersionData { allowChildren: false allowedProperties: ["rotation", "scale", "transformOrigin"] bannedProperties: ["elide", "lineHeight", "lineHeightMode", "wrapMode", "style", - "styleColor", "minimumPointSize", "minimumPixelSize", "styleColor", + "styleColor", "minimumPointSize", "minimumPixelSize", "fontSizeMode", "renderType", "textFormat", "maximumLineCount"] } @@ -126,11 +130,12 @@ VersionData { } QtQuick.Column { - bannedProperties: ["layoutDirection"] + bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding"] } QtQuick.Row { - bannedProperties: ["layoutDirection"] + bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding", + "effectiveLayoutDirection", "layoutDirection"] } QtQuick.ListView { diff --git a/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml b/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml new file mode 100644 index 0000000000..3c0c136559 --- /dev/null +++ b/share/qtcreator/qmldesigner/qt4mcu/qul-19.qml @@ -0,0 +1,216 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of Qt Creator. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3 as published by the Free Software +** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-3.0.html. +** +****************************************************************************/ + +VersionData { + name: "QUL 1.9" + + bannedItems: ["QtQuick.AnimatedImage", + "QtQuick.FocusScope", + "QtQuick.TextInput", + "QtQuick.TextEdit", + "QtQuick.Flow", + "QtQuick.Grid", + "QtQuick.GridView", + "QtQuick.PathView", + "QtQuick.Controls", + "QtQuick.Controls.BusyIndicator", + "QtQuick.Controls.ButtonGroup", + "QtQuick.Controls.CheckDelegate", + "QtQuick.Controls.Container", + "QtQuick.Controls.ComboBox", + "QtQuick.Controls.DelayButton", + "QtQuick.Controls.Frame", + "QtQuick.Controls.GroupBox", + "QtQuick.Controls.ItemDelegate", + "QtQuick.Controls.Label", + "QtQuick.Controls.Page", + "QtQuick.Controls.PageIndicator", + "QtQuick.Controls.Pane", + "QtQuick.Controls.RadioDelegate", + "QtQuick.Controls.RangeSlider", + "QtQuick.Controls.RoundButton", + "QtQuick.Controls.ScrollView", + "QtQuick.Controls.SpinBox", + "QtQuick.Controls.StackView", + "QtQuick.Controls.SwipeDelegate", + "QtQuick.Controls.SwitchDelegate", + "QtQuick.Controls.ToolBar", + "QtQuick.Controls.ToolButton", + "QtQuick.Controls.TabBar", + "QtQuick.Controls.TabButton", + "QtQuick.Controls.TextArea", + "QtQuick.Controls.TextField", + "QtQuick.Controls.ToolSeparator", + "QtQuick.Controls.Tumbler"] + + allowedImports: ["QtQuick", + "QtQuick.Shapes", + "QtQuick.Controls", + "QtQuick.Timeline", + "QtQuickUltralite.Extras", + "QtQuickUltralite.Layers"] + + bannedImports: ["FlowView"] + + //ComplexProperty is not a type, it's just a way to handle bigger props + ComplexProperty { + prefix: "font" + bannedProperties: ["wordSpacing", "letterSpacing", "hintingPreference", + "kerning", "preferShaping", "capitalization", + "strikeout", "underline", "styleName"] + } + + QtQuick.Item { + bannedProperties: ["layer", "opacity", "smooth", "antialiasing", + "baselineOffset", "focus", "activeFocusOnTab", + "rotation", "scale", "transformOrigin"] + } + + QtQuick.Rectangle { + bannedProperties: ["gradient", "border"] + } + + QtQuick.Flickable { + bannedProperties: ["boundsBehavior", "boundsMovement", "flickDeceleration", + "flickableDirection", "leftMargin", "rightMargin", "bottomMargin", "topMargin", + "originX", "originY", "pixelAligned", "pressDelay", "synchronousDrag"] + } + + QtQuick.MouseArea { + bannedProperties: ["propagateComposedEvents", "preventStealing", "cursorShape", + "scrollGestureEnabled", "drag", "acceptedButtons", "hoverEnabled"] + } + + QtQuick.Image { + allowChildren: false + allowedProperties: ["rotation", "scale", "transformOrigin"] + bannedProperties: ["mirror", "mipmap", "cache", "autoTransform", "asynchronous", + "sourceSize", "smooth"] + } + + QtQuick.BorderImage { + bannedProperties: ["asynchronous", "cache", "currentFrame", "frameCount", + "horizontalTileMode", "mirror", "progress", "smooth", "sourceSize", + "status", "verticalTileMode"] + } + + QtQuick.Text { + allowChildren: false + allowedProperties: ["rotation", "scale", "transformOrigin"] + bannedProperties: ["elide", "lineHeight", "lineHeightMode", "wrapMode", "style", + "styleColor", "minimumPointSize", "minimumPixelSize", + "fontSizeMode", "renderType", "textFormat", "maximumLineCount"] + } + + //Padding is not an actual item, but rather set of properties in Text + Padding { + bannedProperties: ["bottomPadding", "topPadding", "leftPadding", "rightPadding"] + } + + QtQuick.Column { + bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding"] + } + + QtQuick.Row { + bannedProperties: ["bottomPadding", "leftPadding", "rightPadding", "topPadding", + "effectiveLayoutDirection", "layoutDirection"] + } + + QtQuick.ListView { + bannedProperties: ["cacheBuffer", "highlightRangeMode", "highlightMoveDuration", + "highlightResizeDuration", "preferredHighlightBegin", "layoutDirection", + "preferredHighlightEnd", "highlightFollowsCurrentItem", "keyNavigationWraps", + "snapMode", "highlightMoveVelocity", "highlightResizeVelocity"] + } + + QtQuick.Animation { + bannedProperties: ["paused"] + } + + //Quick Controls2 Items and properties: + + QtQuick.Controls.Control { + bannedProperties: ["focusPolicy", "hoverEnabled", "wheelEnabled"] + } + + QtQuick.Controls.AbstractButton { + bannedProperties: ["display", "autoExclusive"] + } + + QtQuick.Controls.ProgressBar { + bannedProperties: ["indeterminate"] + } + + QtQuick.Controls.Slider { + bannedProperties: ["live", "snapMode", "touchDragThreshold"] + } + + //Path and Shapes related: + + QtQuick.Path { + bannedProperties: ["scale", "pathElements"] + } + + QtQuick.PathArc { + bannedProperties: ["relativeX", "relativeY"] + } + + QtQuick.PathLine { + bannedProperties: ["relativeX", "relativeY"] + } + + QtQuick.PathMove { + bannedProperties: ["relativeX", "relativeY"] + } + + QtQuick.PathQuad { + bannedProperties: ["relativeX", "relativeY", + "relativeControlX", "relativeControlY"] + } + + QtQuick.PathCubic { + bannedProperties: ["relativeX", "relativeY", + "relativeControl1X", "relativeControl1Y", + "relativeControl2X", "relativeControl2Y"] + } + + QtQuick.PathElement { + //nothing + } + + QtQuick.PathSvg { + //nothing + } + + QtQuick.Shapes.Shape { + bannedProperties: ["asynchronous", "containsMode", "data", + "renderType", "status", "vendorExtensionsEnabled"] + } + + QtQuick.Shapes.ShapePath { + bannedProperties: ["dashOffset", "dashPattern", + "fillGradient", "strokeStyle"] + } +} |