diff options
Diffstat (limited to 'doc')
11 files changed, 60 insertions, 73 deletions
diff --git a/doc/qtcreator/src/editors/creator-code-completion.qdoc b/doc/qtcreator/src/editors/creator-code-completion.qdoc index c21ebef7b3..7d7b627eb3 100644 --- a/doc/qtcreator/src/editors/creator-code-completion.qdoc +++ b/doc/qtcreator/src/editors/creator-code-completion.qdoc @@ -230,8 +230,9 @@ %{variable} \endcode - For example, the following variable expands to the name of the current - project: \c {%{CurrentProject:Name}}. + For example, the following variable expands to the name of the + project containing the file that is currently open in the editor: + \c {%{CurrentDocument:Project:Name}}. Use unique variable names within a snippet, because all instances of a variable are renamed when you specify a value for it. diff --git a/doc/qtdesignstudio/images/qt-bridge.png b/doc/qtdesignstudio/images/qt-bridge.png Binary files differindex 0c774bf96e..011ae971b3 100644 --- a/doc/qtdesignstudio/images/qt-bridge.png +++ b/doc/qtdesignstudio/images/qt-bridge.png diff --git a/doc/qtdesignstudio/images/qt-sketch-bridge.png b/doc/qtdesignstudio/images/qt-sketch-bridge.png Binary files differindex 31d9208504..e515dc6aba 100644 --- a/doc/qtdesignstudio/images/qt-sketch-bridge.png +++ b/doc/qtdesignstudio/images/qt-sketch-bridge.png diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc index ddee99ba2f..d9677906fb 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-ps-using.qdoc @@ -172,6 +172,10 @@ drew a rectangle, you can export it as a Rectangle Studio component. You can provide the import statement of the module where the QML type is defined in the \uicontrol {Add Imports} field. + \li Select the \uicontrol {Render Text} check box to render the text + layer as an asset. The layer will be exported as an asset and the + text data will not be exported. This allows the text layer to be + merged to parent artboard or group as well. \li In the \uicontrol {Add Imports} field, enter additional import statements to have them added to the generated QML file. For example, to use Qt Quick Controls 2.3, you need the import diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc index 820cdf4b52..bd1953c4c5 100644 --- a/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc +++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-sketch-using.qdoc @@ -197,6 +197,10 @@ it as a \l Rectangle component. You can provide the import statement of the module where the QML type is defined in the \uicontrol {QML Imports} field. + \li Select the \uicontrol {Render Text} check box to render the text + layer as an asset. The layer will be exported as an asset and the + text data will not be exported. This allows the text layer to be + merged to parent artboard or group as well. \li In the \uicontrol {QML Imports} field, enter additional import statements to have them added to the generated QML file. For example, to use Qt Quick Controls 2.3, you need the diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-arc.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-arc.qdoc index 37af1be548..f4efa4066d 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-arc.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-arc.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -59,8 +59,8 @@ have an outline, the \l capStyle property specifies whether the line ends are square or rounded. - Because an arc has curves, it may be appropriate to set the \l antialiasing - property to improve its appearance. + Because an arc has curves, it may be appropriate to set the \c antialiasing + property that is inherited from \l Item to improve its appearance. \section2 Example Usage @@ -207,7 +207,7 @@ When set to \c transparent, no line is drawn. - The default value is \c white. + The default value is \c red. \sa QColor */ @@ -233,7 +233,7 @@ When set to a negative value, no line is drawn. - The default value is 1. + The default value is 4. The total width of an arc that has an outline (that is, the outline and the fill) is specified by \l arcWidth. @@ -255,6 +255,8 @@ The position in degrees where the arc ends. + The default value is 90. + To create a circle, set the value of this property to 360 and the value of the \l begin property to 0. */ @@ -265,6 +267,8 @@ The total width of an arc that has an outline, including the outline and fill. + The default value is 10. + \sa arcWidthBegin, arcWidthEnd, strokeWidth */ @@ -307,14 +311,6 @@ */ /*! - \qmlproperty bool Arc::antialiasing - - Whether the arc should be antialiased. - - Antialiasing might require more memory and slow down drawing the type. -*/ - -/*! \qmlproperty bool Arc::outlineArc Whether the arc has an outline. diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-border.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-border.qdoc index 0f00044dd1..a49d4533c9 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-border.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-border.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -43,7 +43,8 @@ The \l radius property specifies whether the border corners are rounded. The radius can also be specified separately for each corner. Because this introduces curved edges to the corners, it may be appropriate to set the - \l antialiasing property to improve the appearance of the border. + \c antialiasing property that is inherited from \l Item to improve the + appearance of the border. The \l joinStyle property specifies how to connect two border line segments. @@ -108,6 +109,8 @@ The radius used to draw rounded corners. + The default value is 10. + If radius is non-zero, the corners will be rounded, otherwise they will be sharp. The radius can also be specified separately for each corner by using the \l bottomLeftRadius, \l bottomRightRadius, \l topLeftRadius, and @@ -226,7 +229,7 @@ When set to \c transparent, no line is drawn. - The default value is \c white. + The default value is \c red. \sa QColor */ @@ -252,7 +255,7 @@ When set to a negative value, no line is drawn. - The default value is 1. + The default value is 4. */ /*! @@ -288,14 +291,6 @@ */ /*! - \qmlproperty bool Border::antialiasing - - Whether the border should be antialiased. - - Antialiasing might require more memory and slow down drawing the type. -*/ - -/*! \qmlproperty enumeration Border::borderMode Where the border is drawn. diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-pie.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-pie.qdoc index e09e6038f2..b7266ff0f1 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-pie.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-pie.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -49,7 +49,8 @@ rounded. Because a pie has curved edges, it may be appropriate to set the - \l antialiasing property to improve its appearance. + \c antialiasing property that is inherited from \l Item to improve + its appearance. \section2 Example Usage @@ -184,7 +185,7 @@ When set to \c transparent, no line is drawn. - The default value is \c white. + The default value is \c red. \sa QColor */ @@ -210,7 +211,7 @@ When set to a negative value, no line is drawn. - The default value is 1. + The default value is 4. */ /*! @@ -229,6 +230,8 @@ The position in degrees where the pie ends. + The default value is 90. + To create a circle, set the value of this property to 360 and the value of the \l begin property to 0. */ @@ -239,13 +242,6 @@ The area between \l begin and \l end. */ -/*! - \qmlproperty bool Pie::antialiasing - - Whether the pie should be antialiased. - - Antialiasing might require more memory and slow down drawing the type. -*/ /*! \qmlproperty bool Pie::hideLine diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-rectangle.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-rectangle.qdoc index dc792addb4..f30f6fee94 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-rectangle.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-rectangle.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -47,7 +47,8 @@ Rounded rectangles can be drawn using the \l radius property. The radius can also be specified separately for each corner. Because this introduces curved edges to the corners of a rectangle, it may be appropriate to set - the \l antialiasing property to improve the appearance of the rectangle. + the \c antialiasing property that is inherited from \l Item to improve the + appearance of the rectangle. \section2 Example Usage @@ -143,6 +144,8 @@ The radius used to draw rounded corners. + The default value is 10. + If radius is non-zero, the corners will be rounded, otherwise they will be sharp. The radius can also be specified separately for each corner by using the \l bottomLeftRadius, \l bottomRightRadius, \l topLeftRadius, and @@ -241,7 +244,7 @@ When set to \c transparent, no line is drawn. - The default value is \c white. + The default value is \c red. \sa QColor */ @@ -265,6 +268,8 @@ The width of the border of the rectangle. + The default value is 4. + A width of 1 creates a thin line. For no line, use a negative value or a transparent color. @@ -274,10 +279,3 @@ The border is rendered within the rectangle's boundaries. */ - -/*! - \qmlproperty bool Rectangle::antialiasing - - Whether the Rectangle should be antialiased. Antialiasing might - require more memory and slow down drawing the type. -*/ diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-svgPath.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-svgPath.qdoc index 3a460382b2..78a04e1083 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-svgPath.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-svgPath.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -48,8 +48,8 @@ using the \l gradient property. If both a color and a gradient are specified, the gradient is used. - If the path has curves, it may be appropriate to set the \l antialiasing - property to improve its appearance. + If the path has curves, it may be appropriate to set the \c antialiasing + property that is inherited from \l Item to improve its appearance. \note Mixing SvgPath with other types of elements is not always supported. For example, when \l Shape is backed by \c GL_NV_path_rendering, a @@ -165,7 +165,7 @@ When set to \c transparent, no line is drawn. - The default value is \c white. + The default value is \c red. \sa QColor */ @@ -191,7 +191,7 @@ When set to a negative value, no line is drawn. - The default value is 1. + The default value is 4. */ /*! @@ -202,11 +202,3 @@ For more information, see \l{https://www.w3.org/TR/SVG/paths.html#PathData} {W3C SVG Path Data}. */ - -/*! - \qmlproperty bool SvgPath::antialising - - Whether the path should be antialiased. - - Antialiasing might require more memory and slow down drawing the type. -*/ diff --git a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-triangle.qdoc b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-triangle.qdoc index a8431b2f06..d627fe4bf3 100644 --- a/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-triangle.qdoc +++ b/doc/qtdesignstudio/src/qtquickdesigner-components/components/qqs-components-triangle.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Design Studio documentation. @@ -177,7 +177,7 @@ When set to \c transparent, no line is drawn. - The default value is \c white. + The default value is \c red. \sa QColor */ @@ -201,6 +201,8 @@ The width of the border of the rectangle. + The default value is 4. + A width of 1 creates a thin line. For no line, use a negative value or a transparent color. @@ -214,9 +216,14 @@ /*! \qmlproperty int Triangle::radius - Defines the rotation of the triangle in degrees. The default value is 0. + The radius used to draw rounded corners. - This property can be used together with the \l radius property to + The default value is 5. + + If radius is non-zero, the corners will be rounded, otherwise they will + be sharp. + + This property can be used together with the \l arcRadius property to determine the shape of the triangle. \sa arcRadius @@ -227,6 +234,8 @@ The radius used to draw rounded corners. + The default value is 5. + If radius is non-zero, the corners will be rounded, otherwise they will be sharp. @@ -277,11 +286,3 @@ \sa topMargin, leftMargin, rightMargin */ - -/*! - \qmlproperty bool Triangel::antialiasing - - Whether the triangle should be antialiased. - - Antialiasing might require more memory and slow down drawing the type. -*/ |
