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

Merge remote-tracking branch 'origin/13.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
	qbs/modules/qtc/qtc.qbs
	src/plugins/remotelinux/linuxdevicetester.cpp

Change-Id: I8434e41dcfbb50f6ed032a3e0af1591eb19b79eb
This commit is contained in:
Eike Ziller
2024-03-20 15:01:51 +01:00
parent aaf839bcf0 f75e26005f
commit 90e1d96019
107 changed files with 9346 additions and 9167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
doc/qtcreator/src/qtquick/creator-only/qtquick-app-tutorial.qdoc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2023 The Qt Company Ltd.
// Copyright (C) 2024 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
/*!
@@ -55,9 +55,8 @@
To create a custom QML type:
\list 1
\li Select \uicontrol File > \uicontrol {New File} >
\uicontrol Qt >
\uicontrol {QML File (Qt Quick 2)}.
\li Go to \uicontrol File > \uicontrol {New File}.
\li Select \uicontrol Qt > \uicontrol {QML File (Qt Quick 2)}.
\li Select \uicontrol Choose to open the \uicontrol Location dialog.
\li In the \uicontrol {File name} field, enter a name for the custom
QML type: \e Page.
@@ -78,12 +77,11 @@
When you start typing the QML type name, \QC suggests available types
and properties to \l{Complete code}{complete the code}.
Select the light bulb icon \inlineimage icons/refactormarker.png
next to the type name to open the \l{Editing Rectangles}
{Qt Quick Toolbar for rectangles}. You can use it to specify
Select the light bulb icon \inlineimage icons/refactormarker.png next to the
type name to open a \l{Edit rectangles}{toolbar} that you can use to specify
rectangle properties, such as color, transparency, and gradients.
\image qml-toolbar-rectangle.png {Qt Quick Toolbar for rectangles}
\image qml-toolbar-rectangle.png {Qt Quick toolbar for rectangles}
Next, add an \l Image type with \e qt-logo.png as the source. You can also
use any other image or a component. Position the image in the top-left
@@ -91,10 +89,10 @@
\printuntil }
You can use the \l{Previewing Images}{Qt Quick Toolbar for images} to
specify image properties, such as source file and fill mode.
Use a \l{Preview images}{toolbar for images} to specify image properties,
such as source file and fill mode.
\image qml-toolbar-image.png {Logo visible in Qt Quick Toolbar for images}
\image qml-toolbar-image.png {Logo visible in Qt Quick toolbar for images}
Now, create the rectangles that the image will move between. Their size
should match the image size and they should be transparent, so that the
@@ -114,7 +112,7 @@
\printuntil anchors.fill
To check your code, you can compare it with the \e {Page.qml} example file.
To check your code, compare it with the \e {Page.qml} example file.
Next, make the image move between the rectangles when users click
them by adding states and by connecting mouse clicks to state changes.
@@ -171,8 +169,7 @@
\printuntil },
\note You can use the \l{Previewing Animation}
{Qt Quick Toolbar for animation} to specify the
\note Use a \l{Preview animations}{toolbar for animations} to specify the
easing curve type and animation duration.
\image qml-toolbar-animation.png {Qt Quick Toolbar for animation}

2
doc/qtcreator/src/qtquick/creator-only/qtquick-designer-plugin.qdoc
View File

@@ -39,7 +39,7 @@
\image qtquick-designer.webp {Qt Quick Designer}
For more information about \l{Qt QML}, \l{Qt Quick}, and \l{All QML Types}
For more information about \l{Qt Qml}, \l{Qt Quick}, and \l{All QML Types}
{QML types}, see the Qt reference documentation available online and
in the \uicontrol Help mode.

6
doc/qtcreator/src/qtquick/creator-preferences-qtquick-code-style.qdoc
View File

@@ -4,13 +4,13 @@
/*!
\page creator-preferences-qtquick-code-style.html
\if defined(qtdesignstudio)
\previouspage creator-preferences-text-editor-behavior.html
\nextpage qt-quick-toolbars.html
\previouspage qtquick-text-editor.html
\else
\previouspage creator-reference.html
\endif
\ingroup creator-reference-preferences
\ingroup studio-preferences-code
\title Qt Quick Code Style
@@ -33,7 +33,7 @@
To override the global preferences for a particular project, select
\uicontrol Projects > \uicontrol {Code Style}.
\sa {Indent text or code}
\sa {Automatically format QML/JS files}, {Indent text or code}
\if defined(qtcreator)
\sa {Find preferences}, {Specify code style}

92
doc/qtcreator/src/qtquick/qtquick-toolbars.qdoc
View File

@@ -1,4 +1,4 @@
// Copyright (C) 2023 The Qt Company Ltd.
// Copyright (C) 2024 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
// **********************************************************************
@@ -10,56 +10,48 @@
/*!
\page qt-quick-toolbars.html
\if defined(qtdesignstudio)
\previouspage creator-preferences-qtquick-code-style.html
\nextpage studio-finding.html
\previouspage qtquick-text-editor.html
\else
\previouspage creator-completing-code.html
\nextpage creator-editor-codepasting.html
\previouspage creator-how-tos.html
\endif
\title Using Qt Quick Toolbars
\ingroup creator-how-to-edit
\ingroup studio-how-to-code
When you select a QML type in the code and a toolbar is available,
a light bulb icon appears: \inlineimage icons/refactormarker.png
. Select the icon to open the toolbar.
\title Edit properties of QML types
To open toolbars immediately when you select a QML type, select
\preferences > \uicontrol {Qt Quick} >
\uicontrol {QML/JS Editing} > \uicontrol {Always show Qt Quick Toolbar}.
When you edit QML code in the code editor, you specify the properties of QML
types. For some properties, such as colors and font names, this is not a
trivial task. For example, few people can visualize the color \c {#18793f}.
To easily edit these properties, use the Qt Quick toolbars.
\image qtcreator-qml-js-editing.webp {QML/JS Editing preferences}
When you select a QML type in the code and a light bulb icon appears
(\inlineimage icons/refactormarker.png), select it to open a toolbar
for changing the properties of that type.
Drag the toolbar to pin it to another location. Select
\inlineimage icons/pin.png
to unpin the toolbar and move it to its default location. To pin toolbars
by default, select \uicontrol {Pin Qt Quick Toolbar}.
\section1 Preview images
\section1 Previewing Images
The Qt Quick Toolbar for images allows you to edit the properties of
Edit the properties of
\l {Border Image} and
\if defined(qtdesignstudio)
\l {Images}{Image} items.
\l {Images}{Image} items
\else
\l Image items.
\l Image items
\endif
You can scale and tile the images, replace them with other images,
to scale and tile the images, replace them with other images,
preview them, and change the image margins.
\image qml-toolbar-image.png "Qt Quick Toolbar for images"
\image qml-toolbar-image.png {Qt Quick Toolbar for images}
To preview an image, double-click it on the toolbar. In the preview
dialog, you can zoom the image. Drag the image margins to change them.
\image qml-toolbar-image-preview.png "Image preview dialog"
\image qml-toolbar-image-preview.png {Image preview dialog}
\section1 Formatting Text
\section1 Format text
The Qt Quick Toolbar for text allows you to edit the properties of
\l{Text} items.
You can change the font family and size as well as text formatting, style,
alignment, and color.
Edit the properties of \l{Text} items to change the font family and size,
as well as text formatting, style, alignment, and color.
\note Move the mouse pointer over a color hex value in the code editor to
see the color as a tooltip.
@@ -68,35 +60,53 @@
cannot use the toolbar to edit it. The button for editing the property
is disabled.
\image qml-toolbar-text.png "Qt Quick Toolbar for text"
\image qml-toolbar-text.png {Qt Quick Toolbar for text}
By default, font size is specified as pixels. To use points, instead,
change \uicontrol px to \uicontrol pt in the size field.
\section1 Previewing Animation
\section1 Preview animations
The Qt Quick Toolbar for animation allows you to edit the properties of
PropertyAnimation items and the items that inherit it. You can
change the easing curve type and duration. For some curves, you can also
Edit the properties of PropertyAnimation items and the items that inherit it
to change the easing curve type and duration. For some curves, you can also
specify amplitude, period, and overshoot values.
\image qml-toolbar-animation.png "Qt Quick Toolbar for animation"
\image qml-toolbar-animation.png {Qt Quick Toolbar for animation}
Select the play button to preview your changes.
\section1 Editing Rectangles
\section1 Edit rectangles
The Qt Quick Toolbar for rectangles allows you to edit the properties of
Edit the properties of
\if defined(qtdesignstudio)
\l {basic-rectangle}{Rectangle}
\else
Rectangle
\endif
items. You can change the fill and border colors and add gradients.
items to change the fill and border colors and add gradients.
\image qml-toolbar-rectangle.png "Qt Quick Toolbar for rectangles"
\image qml-toolbar-rectangle.png {Qt Quick Toolbar for rectangles}
To add gradient stop points, click above the gradient bar. To remove
stop points, drag them upwards.
\section1 Show toolbars immediately
To open toolbars immediately when you select a QML type, select
\preferences > \uicontrol {Qt Quick} >
\uicontrol {QML/JS Editing} > \uicontrol {Always show Qt Quick Toolbar}.
\image qtcreator-qml-js-editing.webp {QML/JS Editing preferences}
\section1 Pin toolbars
Drag the toolbar to pin it to another location. Select
\inlineimage icons/pin.png to unpin the toolbar and move
it to its default location.
To pin toolbars by default, select \uicontrol {Pin Qt Quick Toolbar}.
\if defined(qtcreator)
\sa {Creating a Qt Quick Application}
\endif
*/