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

Merge remote-tracking branch 'origin/3.3'

Browse Source 
Conflicts:
	doc/src/editors/creator-coding-edit-mode.qdoc
	doc/src/qtquick/qtquick-creating.qdoc
	qtcreator.pri
	qtcreator.qbs

Change-Id: I46e5e35419d2871f455f1df8094c5438d34e570b
This commit is contained in:
Eike Ziller
2014-12-12 13:42:42 +01:00
parent 49b1fd133a e1fbeedcd4
commit e07f33db93
103 changed files with 2105 additions and 1913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
doc/src/qtquick/creator-mobile-app-tutorial.qdoc
View File

@@ -61,28 +61,30 @@
\list 1
\li Select \gui File > \gui {New File or Project} > \gui Application >
\gui {Qt Quick Application} > \gui Choose.
\li Select \uicontrol File > \uicontrol {New File or Project} > \uicontrol Application >
\uicontrol {Qt Quick Application} > \uicontrol Choose.
\li In the \gui{Name} field, type \b{accelbubble}.
\li In the \uicontrol{Name} field, type \b{accelbubble}.
\li In the \gui {Create in} field, enter the path for the project files.
For example, \c {C:\Qt\examples}, and then click \gui{Next} (or
\gui Continue on OS X).
\li In the \uicontrol {Create in} field, enter the path for the project files.
For example, \c {C:\Qt\examples}, and then click \uicontrol{Next} (or
\uicontrol Continue on OS X).
\li In the \gui {Qt Quick component set} field, select
\gui {Qt Quick Controls 1.1}.
\li In the \uicontrol {Qt Quick component set} field, select
\uicontrol {Qt Quick Controls 1.1}.
\li Select \l{glossary-buildandrun-kit}{kits} for Android ARM and iPhone
OS, and click \gui{Next}.
OS, and click \uicontrol{Next}.
\note Kits are listed if they have been specified in \gui Tools >
\gui Options > \gui{Build & Run} > \gui Kits.
\note Kits are listed if they have been specified in \uicontrol Tools >
\uicontrol Options > \uicontrol {Build & Run} > \uicontrol Kits (on Windows and Linux)
or in \uicontrol {Qt Creator} > \uicontrol Preferences \uicontrol {Build & Run} >
\uicontrol Kits (on OS X).
\li Select \gui Next in the following dialogs to use the default
\li Select \uicontrol Next in the following dialogs to use the default
settings.
\li Review the project settings, and click \gui{Finish} (or \gui Done on
\li Review the project settings, and click \uicontrol{Finish} (or \uicontrol Done on
OS X).
\endlist
@@ -100,12 +102,12 @@
as the QML file) from the examples directory in the Qt installation
directory. For example:
\c {C:\Qt\Qt5.2.0\5.2.0\msvc2010\examples\sensors\accelbubble\content}.
The image appears in \gui Resources. You can also use any other
The image appears in \uicontrol Resources. You can also use any other
image or a QML type, instead.
\list 1
\li In the \gui Projects view, double-click the main.qml file
\li In the \uicontrol Projects view, double-click the main.qml file
to open it in the code editor.
\li Modify the properties of the ApplicationWindow type to specify the
@@ -118,15 +120,15 @@
\skipto /^\}/
\printuntil }
\li Click \gui Design to open the file in \QMLD.
\li Click \uicontrol Design to open the file in \QMLD.
\li In the \gui Navigator, select \gui Label and press \key Delete
\li In the \uicontrol Navigator, select \uicontrol Label and press \key Delete
to delete it.
\li In \gui Library > \gui Resources, select Bluebubble.svg
\li In \uicontrol Library > \uicontrol Resources, select Bluebubble.svg
and drag and drop it to the canvas.
\li In the \gui Properties pane, \gui Id field, enter \e bubble to be
\li In the \uicontrol Properties pane, \uicontrol Id field, enter \e bubble to be
able to reference the image from other places.
\li In the code editor, add the following new properties to the image to
@@ -243,7 +245,7 @@
}
\endcode
After adding the dependencies, select \gui Build > \gui {Run qmake} to apply
After adding the dependencies, select \uicontrol Build > \uicontrol {Run qmake} to apply
the changes to the Makefile of the project.
\section1 Adding Resources
@@ -253,10 +255,10 @@
\list 1
\li In the \gui Projects view, double-click the qml.qrc file to open it
\li In the \uicontrol Projects view, double-click the qml.qrc file to open it
in the resource editor.
\li Select \gui Add to add Bluebubble.svg.
\li Select \uicontrol Add to add Bluebubble.svg.
\endlist
@@ -274,7 +276,7 @@
If you are using a device running Android v4.2.2, it should prompt you to
verify the connection to allow USB debugging from the PC it is connected
to. To avoid such prompts every time you connect the device, check
"Always allow from the computer" and select \gui OK.
"Always allow from the computer" and select \uicontrol OK.
\li To run the application on the device, press \key {Ctrl+R}.

7
doc/src/qtquick/creator-projects-settings-run-qtquick.qdocinc
View File

@@ -1,13 +1,14 @@
\section1 Specifying Run Settings for Qt Quick UI Projects
You can specify run settings for \l{glossary-buildandrun-kit}{kits} with \gui Desktop device type:
You can specify run settings for \l{glossary-buildandrun-kit}{kits}
with \uicontrol Desktop device type:
\list
\li In the \gui Arguments field, you can specify command line arguments
\li In the \uicontrol Arguments field, you can specify command line arguments
to be passed to the executable.
\li In the \gui {Main QML file}, select the file that \QQV will be
\li In the \uicontrol {Main QML file}, select the file that \QQV will be
started with.
\endlist

104
doc/src/qtquick/qtquick-app-tutorial.qdoc
View File

@@ -47,29 +47,31 @@
\list 1
\li Select \gui{File > New File or Project > Application >
\li Select \uicontrol{File > New File or Project > Application >
Qt Quick Application > Choose}.
\li In the \gui{Name} field, type \b {Transitions}.
\li In the \uicontrol{Name} field, type \b {Transitions}.
\li In the \gui {Create in} field, enter the path for the project files.
For example, \c {C:\Qt\examples}, and then click \gui{Next} (on
Windows and Linux) or \gui Continue (on OS X).
\li In the \uicontrol {Create in} field, enter the path for the project files.
For example, \c {C:\Qt\examples}, and then click \uicontrol{Next} (on
Windows and Linux) or \uicontrol Continue (on OS X).
\li In the \gui {Qt Quick component set} field, select
\gui {Qt Quick 2.1}.
\li In the \uicontrol {Qt Quick component set} field, select
\uicontrol {Qt Quick 2.1}.
\li Select \l{glossary-buildandrun-kit}{kits} for running and building your project,
and then click \gui{Next}.
and then click \uicontrol{Next}.
\note Kits are listed if they have been specified in \gui Tools >
\gui Options > \gui {Build & Run} > \gui Kits.
\note Kits are listed if they have been specified in \uicontrol Tools >
\uicontrol Options > \uicontrol {Build & Run} > \uicontrol Kits (on Windows and Linux)
or in \uicontrol {Qt Creator} > \uicontrol Preferences \uicontrol {Build & Run} >
\uicontrol Kits (on OS X).
\li Select \gui Next in the following dialogs to use the default
\li Select \uicontrol Next in the following dialogs to use the default
settings.
\li Review the project settings, and click \gui{Finish} (on Windows and
Linux) or \gui Done (on OS X) to create the project.
\li Review the project settings, and click \uicontrol{Finish} (on Windows and
Linux) or \uicontrol Done (on OS X) to create the project.
\li Press \key {Ctrl+R} (or \key {Cmd+R}) to run the application.
@@ -90,28 +92,28 @@
directory in the Qt installation directory. For example:
\c {C:\Qt\Qt5.3.0\5.3.0\msvc2010\examples\declarative\animation\states}. The
image appears
in \gui Resources. You can also use any other image or a QML
in \uicontrol Resources. You can also use any other image or a QML
type, instead.
\list 1
\li In the \gui Projects view, double-click the main.qml file
\li In the \uicontrol Projects view, double-click the main.qml file
to open it in the code editor.
\li Click \gui Design to open the file in \QMLD.
\li Click \uicontrol Design to open the file in \QMLD.
\image qmldesigner-tutorial-desing-mode.png "Transitions project in Design Mode"
\li In the \gui Navigator, select \gui Text and press \key Delete to
\li In the \uicontrol Navigator, select \uicontrol Text and press \key Delete to
delete it.
\li Select \gui Window to edit its properties.
\li Select \uicontrol Window to edit its properties.
\image qmldesigner-tutorial-page.png "Page properties"
\list a
\li In the \gui Id field, enter \e page, to be able to reference the
\li In the \uicontrol Id field, enter \e page, to be able to reference the
window from other places.
\li In the code editor, set the window background color to #343434:
@@ -124,77 +126,77 @@
\endlist
\li In \gui Library > \gui Resources, select states.png and
\li In \uicontrol Library > \uicontrol Resources, select states.png and
drag and drop it to the canvas.
\image qmldesigner-tutorial-user-icon.png "Image properties"
\list a
\li In the \gui Id field, enter \e icon.
\li In the \uicontrol Id field, enter \e icon.
\li In the \gui Position field, set \gui X to 10 and \gui Y to 20.
\li In the \uicontrol Position field, set \uicontrol X to 10 and \uicontrol Y to 20.
\endlist
\li Double-click the resource file, qml.qrc, in the \gui Projects view
\li Double-click the resource file, qml.qrc, in the \uicontrol Projects view
to add states.png to the resource file for deployment.
\li Click \gui Add and select states.png.
\li Click \uicontrol Add and select states.png.
\li In the \gui Design mode, \gui Library view, \gui {QML Types} tab,
select \gui Rectangle,
\li In the \uicontrol Design mode, \uicontrol Library view, \uicontrol {QML Types} tab,
select \uicontrol Rectangle,
drag and drop it to the canvas, and edit its properties.
\image qmldesigner-tutorial-topleftrect.png "Rectangle properties"
\list a
\li In the \gui Id field, enter \e topLeftRect.
\li In the \uicontrol Id field, enter \e topLeftRect.
\li In the \gui Size field, set \gui W and \gui H to 64, for the
\li In the \uicontrol Size field, set \uicontrol W and \uicontrol H to 64, for the
rectangle size to match the image size.
\li In the \gui Color field, click the
\li In the \uicontrol Color field, click the
\inlineimage qmldesigner-transparent-button.png
(\gui Transparent) button to make the rectangle transparent.
(\uicontrol Transparent) button to make the rectangle transparent.
\li In the \gui Border field, set the border color to #808080.
\li In the \uicontrol Border field, set the border color to #808080.
\li In the \gui Rectangle group, \gui Border field, set the border
\li In the \uicontrol Rectangle group, \uicontrol Border field, set the border
width to 1.
\note If the \gui Border field does not appear after you set the
\note If the \uicontrol Border field does not appear after you set the
border color, try setting the border color to solid by clicking
the
\inlineimage qmldesigner-solid-color-button.png
(\gui {Solid Color}) button.
(\uicontrol {Solid Color}) button.
\li In the \gui Radius field, select 6 to create rounded corners for
\li In the \uicontrol Radius field, select 6 to create rounded corners for
the rectangle.
\li Click \gui {Layout}, and then click the top and left anchor
\li Click \uicontrol {Layout}, and then click the top and left anchor
buttons to anchor the rectangle to the top left corner of the
page.
\image qmldesigner-tutorial-topleftrect-layout.png "Layout tab"
\li In the \gui Margin field, select 20 for the top anchor and 10
\li In the \uicontrol Margin field, select 20 for the top anchor and 10
for the left anchor.
\endlist
\li In the \gui Navigator, drag and drop the \gui {Mouse Area}
\li In the \uicontrol Navigator, drag and drop the \uicontrol {Mouse Area}
from \e page to \e topLeftRect to make it apply only to the
rectangle and not to the whole page.
\li Edit the \gui {Mouse Area} properties:
\li Edit the \uicontrol {Mouse Area} properties:
\list a
\li Click \gui {Layout}, and then click the
\li Click \uicontrol {Layout}, and then click the
\inlineimage qmldesigner-anchor-fill-screen.png
(\gui {Fill to Parent}) button to anchor the mouse area to the
(\uicontrol {Fill to Parent}) button to anchor the mouse area to the
rectangle.
\li In the code editor, edit the pointer to the clicked expression
@@ -220,7 +222,7 @@
\printuntil }
\printuntil }
\li In the \gui Navigator, copy topLeftRect (by pressing
\li In the \uicontrol Navigator, copy topLeftRect (by pressing
\key {Ctrl+C}) and paste it to the canvas twice (by pressing
\key {Ctrl+V}). \QC renames the new instances of the type
topLeftRect1 and topLeftRect2.
@@ -229,13 +231,13 @@
\list a
\li In the \gui Id field, enter \e middleRightRect.
\li In the \uicontrol Id field, enter \e middleRightRect.
\li In \gui {Layout}, select the vertical center anchor button and
\li In \uicontrol {Layout}, select the vertical center anchor button and
then the right anchor button to
anchor the rectangle to the middle right margin of the screen.
\li In the \gui Margin field, select 10 for the right anchor and 0
\li In the \uicontrol Margin field, select 10 for the right anchor and 0
for the vertical center anchor.
\li In the code editor, add a pointer to a clicked expression to the
@@ -252,12 +254,12 @@
\list a
\li In the \gui Id field, enter \e bottomLeftRect.
\li In the \uicontrol Id field, enter \e bottomLeftRect.
\li In \gui {Layout}, select the bottom and left anchor buttons to
\li In \uicontrol {Layout}, select the bottom and left anchor buttons to
anchor the rectangle to the bottom left margin of the screen.
\li In the \gui Margin field, select 20 for the bottom anchor and 10
\li In the \uicontrol Margin field, select 20 for the bottom anchor and 10
for the left anchor.
\li In the code editor, add a pointer to a clicked expression to the
@@ -340,15 +342,15 @@
\list a
\li Click \gui NumberAnimation in the code editor to display the
\li Click \uicontrol NumberAnimation in the code editor to display the
\inlineimage qml-toolbar-indicator.png
icon, and then click the icon to open the toolbar:
\image qmldesigner-tutorial-quick-toolbar.png "Qt Quick toolbar for animation"
\li In the \gui Easing field, select \gui Bounce.
\li In the \uicontrol Easing field, select \uicontrol Bounce.
\li In the \gui Subtype field, select \gui Out.
\li In the \uicontrol Subtype field, select \uicontrol Out.
\endlist

100
doc/src/qtquick/qtquick-buttons.qdoc
View File

@@ -34,52 +34,52 @@
\list 1
\li Select \gui {File > New File or Project > Qt > QML File > Choose}
\li Select \uicontrol {File > New File or Project > Qt > QML File > Choose}
to create a QML file called Button.qml (for example).
\note Components are listed in the \gui Library only if the
\note Components are listed in the \uicontrol Library only if the
filename begins with a capital letter.
\li Click \gui {Design} to edit the file in the visual editor.
\li Click \uicontrol {Design} to edit the file in the visual editor.
\li In the \gui Navigator, click \gui Rectangle to set properties
\li In the \uicontrol Navigator, click \uicontrol Rectangle to set properties
for it.
\li In the \gui Properties pane, modify the appearance of the button.
\li In the \uicontrol Properties pane, modify the appearance of the button.
\list a
\li In the \gui Size field, set the width (\gui W) and height
(\gui H) of the button.
\li In the \uicontrol Size field, set the width (\uicontrol W) and height
(\uicontrol H) of the button.
\li In the \gui Color field, select the button color.
\li In the \uicontrol Color field, select the button color.
\li In the \gui Radius field, use the slider to set the radius of
\li In the \uicontrol Radius field, use the slider to set the radius of
the rectangle and produce rounded corners for the button.
\endlist
\li Drag and drop a \gui {Text} item on top of the \gui Rectangle. This
creates a nested item where \gui Rectangle is the parent item
of \gui Text. Items are positioned relative to their parents.
\li Drag and drop a \uicontrol {Text} item on top of the \uicontrol Rectangle. This
creates a nested item where \uicontrol Rectangle is the parent item
of \uicontrol Text. Items are positioned relative to their parents.
\li In the \gui Properties pane, edit the properties of the \gui Text
\li In the \uicontrol Properties pane, edit the properties of the \uicontrol Text
item.
\list a
\li In the \gui Text field, type \b Button.
\li In the \uicontrol Text field, type \b Button.
You can select the text color in the \gui {Text color} field and the
You can select the text color in the \uicontrol {Text color} field and the
font, size, and style in the
\gui Font section.
\uicontrol Font section.
\li In the \gui Alignment field, select the center buttons to align
\li In the \uicontrol Alignment field, select the center buttons to align
the text to the center of the button.
\li Click \gui {Layout}, and then click the
\li Click \uicontrol {Layout}, and then click the
\inlineimage qmldesigner-anchor-fill-screen.png
(\gui {Fill to Parent}) button to anchor the text to the whole
(\uicontrol {Fill to Parent}) button to anchor the text to the whole
button area.
\endlist
@@ -130,12 +130,12 @@
\list 1
\li Select \gui {File > New File or Project > Qt > QML File > Choose}
\li Select \uicontrol {File > New File or Project > Qt > QML File > Choose}
to create a QML file called Button.qml (for example).
\li Double-click the file to open it in the code editor.
\li Replace the \gui Rectangle with an \gui Item, as illustrated by the
\li Replace the \uicontrol Rectangle with an \uicontrol Item, as illustrated by the
following code snippet:
\qml
@@ -144,7 +144,7 @@
}
\endqml
\li Specify properties and set expressions for the \gui Item, as
\li Specify properties and set expressions for the \uicontrol Item, as
illustrated by the following code snippet:
\qml
@@ -161,83 +161,83 @@
You will point to the properties and expression later.
\li Click \gui {Design} to edit the file in the visual editor.
\li Click \uicontrol {Design} to edit the file in the visual editor.
\li Drag and drop two \gui {Border Image} items from the \gui Library
\li Drag and drop two \uicontrol {Border Image} items from the \uicontrol Library
to the canvas.
\li Drag and drop a \gui Text item to the canvas.
\li Drag and drop a \uicontrol Text item to the canvas.
\li Drag and drop a \gui {Mouse Area} to the canvas.
\li Drag and drop a \uicontrol {Mouse Area} to the canvas.
\li In the \gui Navigator, select \gui border_image1 to specify
settings for it in the \gui Properties pane:
\li In the \uicontrol Navigator, select \uicontrol border_image1 to specify
settings for it in the \uicontrol Properties pane:
\list a
\li Select \gui {Set Binding} in the menu next to the
\gui Visibility check box.
\li Select \uicontrol {Set Binding} in the menu next to the
\uicontrol Visibility check box.
\li Enter the following expression to specify that the image is
visible when the mouse is not pressed down:
\c {!mouse_area1.pressed}.
\li In the \gui Source field, select the image file for the button,
\li In the \uicontrol Source field, select the image file for the button,
for example button_up.png.
\li Click \gui {Layout}, and then click the
\li Click \uicontrol {Layout}, and then click the
\inlineimage qmldesigner-anchor-fill-screen.png
(\gui {Fill to Parent}) button to anchor the border image to the
\gui Item.
(\uicontrol {Fill to Parent}) button to anchor the border image to the
\uicontrol Item.
\endlist
\li Select \gui border_image2 to specify similar settings for it:
\li Select \uicontrol border_image2 to specify similar settings for it:
\list a
\li Set the following epression for \gui Visibility, to specify that
\li Set the following epression for \uicontrol Visibility, to specify that
the image is visible when the mouse is pressed down:
\c {mouse_area1.pressed}.
\li In the \gui Source field, select the image file for the button
\li In the \uicontrol Source field, select the image file for the button
when it is clicked, for example button_down.png.
\li Click \gui {Layout}, and then click the
\gui {Fill to Parent}
button to anchor the border image to the \gui Item.
\li Click \uicontrol {Layout}, and then click the
\uicontrol {Fill to Parent}
button to anchor the border image to the \uicontrol Item.
\endlist
\li Select \gui text1 to specify font size and color, and text
\li Select \uicontrol text1 to specify font size and color, and text
scaling and rendering:
\list a
\li In the \gui Color field, use the color picker to select
\li In the \uicontrol Color field, use the color picker to select
the font color, or enter a value in the field.
\li In the \gui Text field, select \gui {Set Binding} and
\li In the \uicontrol Text field, select \uicontrol {Set Binding} and
enter a pointer to the \c {text} property that you specified
earlier: \c {parent.txt}.
\li In the \gui Size field, select \gui {Pixels} to specify the font
\li In the \uicontrol Size field, select \uicontrol {Pixels} to specify the font
size in pixels. By default, the size is specified in points.
\li In the \gui Size field, select \gui {Set Expression} and enter a
\li In the \uicontrol Size field, select \uicontrol {Set Expression} and enter a
pointer to the \c {fontSize} property that you specified
earlier.
\li Click \gui {Layout}, and then click the
\li Click \uicontrol {Layout}, and then click the
\inlineimage qmldesigner-center-in.png "Anchor buttons"
(\gui {Set Vertical Anchor} and \gui {Set Horizontal Anchor})
(\uicontrol {Set Vertical Anchor} and \uicontrol {Set Horizontal Anchor})
buttons to inherit the vertical and horizontal centering from
the parent.
\li Click \gui Advanced to specify scaling for the text in the
\gui Scale field.
\li Click \uicontrol Advanced to specify scaling for the text in the
\uicontrol Scale field.
\li Select \gui {Set Binding} and enter the following expression:
\li Select \uicontrol {Set Binding} and enter the following expression:
\c {if (!mousearea1.pressed) { 1 } else { 0.95 }}.
\note You can enter long and complicated expressions also in the

18
doc/src/qtquick/qtquick-components.qdoc
View File

@@ -87,20 +87,20 @@
\list 1
\li Select \gui File > \gui {New File or Project} >
\gui {Files and Classes} > \gui Qt > \gui {QML File (Qt Quick 1)} or
\gui {QML File (Qt Quick 2)} > \gui Choose to create a new .qml
\li Select \uicontrol File > \uicontrol {New File or Project} >
\uicontrol {Files and Classes} > \uicontrol Qt > \uicontrol {QML File (Qt Quick 1)} or
\uicontrol {QML File (Qt Quick 2)} > \uicontrol Choose to create a new .qml
file.
\note Components are listed in the \gui {QML Components} section of
the \gui Library only if the filename begins with a capital
\note Components are listed in the \uicontrol {QML Components} section of
the \uicontrol Library only if the filename begins with a capital
letter.
\li Click \gui Design to open the .qml file in \QMLD.
\li Click \uicontrol Design to open the .qml file in \QMLD.
\li Drag and drop a QML type from the \gui Library to the editor.
\li Drag and drop a QML type from the \uicontrol Library to the editor.
\li Edit its properties in the \gui Properties pane.
\li Edit its properties in the \uicontrol Properties pane.
The available properties depend on the QML type.
@@ -121,7 +121,7 @@
Components can consist of several other components. To view the component
hierarchy as a bread crumb path when you edit a component on the canvas,
select \gui {Go into Component} or press \key F2. Click the component
select \uicontrol {Go into Component} or press \key F2. Click the component
names in the path to navigate to them. You can easily navigate back to the
top level when you are done editing the component.

30
doc/src/qtquick/qtquick-connection-editor.qdoc
View File

@@ -35,7 +35,7 @@
\title Adding Connections
You can use the \gui {Connections} view (commercial only) to:
You can use the \uicontrol {Connections} view (commercial only) to:
\list
@@ -57,14 +57,14 @@
\list 1
\li Select the \gui {Connections} tab.
\li Select the \uicontrol {Connections} tab.
\li Select \gui Target to add the object to connect to a signal.
\li Select \uicontrol Target to add the object to connect to a signal.
\li Select \gui {Signal Handler} to select the signal that the connection
\li Select \uicontrol {Signal Handler} to select the signal that the connection
will listen to from a list of all signals available for the object.
\li Select \gui Actions to specify the action to perform when
\li Select \uicontrol Actions to specify the action to perform when
the signal is emitted. You use JavaScript to specify the actions.
\endlist
@@ -81,15 +81,15 @@
\list 1
\li Select the \gui {Dynamic Properties} tab.
\li Select the \uicontrol {Dynamic Properties} tab.
\li Select \gui Item to select the object to specify the property for.
\li Select \uicontrol Item to select the object to specify the property for.
\li Select \gui Property to give a name to the property.
\li Select \uicontrol Property to give a name to the property.
\li Select \gui {Property Type} to specify the type of the property.
\li Select \uicontrol {Property Type} to specify the type of the property.
\li Select \gui {Property Value} to specify the value of the property.
\li Select \uicontrol {Property Value} to specify the value of the property.
\endlist
@@ -104,18 +104,18 @@
\list 1
\li Select the \gui {Bindings} tab.
\li Select the \uicontrol {Bindings} tab.
\li Select \gui Item to select the target object whose property you want
\li Select \uicontrol Item to select the target object whose property you want
to change dynamically.
\li Select \gui Property to specify the property to bind to a source
\li Select \uicontrol Property to specify the property to bind to a source
property.
\li Select \gui {Source Item} to specify the object whose property you
\li Select \uicontrol {Source Item} to specify the object whose property you
want to use to determine the behavior of the target object.
\li Select \gui {Source Property} to specify the property to bind the
\li Select \uicontrol {Source Property} to specify the property to bind the
target property to.
\endlist

44
doc/src/qtquick/qtquick-creating.qdoc
View File

@@ -38,24 +38,24 @@
\list
\li \gui {Qt Quick Application} creates a Qt Quick application project
\li \uicontrol {Qt Quick Application} creates a Qt Quick application project
that can contain both QML and C++ code. The project includes a
QDeclarativeView or QQuickView. You can build the application and
deploy it to
desktop and mobile target platforms.
\li \gui {Qt Quick UI} creates a Qt Quick UI project with a single QML
\li \uicontrol {Qt Quick UI} creates a Qt Quick UI project with a single QML
file that contains the main view. You can review Qt Quick UI
projects in a \l{Previewing QML Files}{preview tool} and you need
not build them. You do not
need to have the development environment installed on your
computer to create and run this type of project.
\li \gui {Qt Quick Extension Plugins} (in the \gui Libraries category)
\li \uicontrol {Qt Quick Extension Plugins} (in the \uicontrol Libraries category)
create C++ plugins that make it possible to offer extensions that
can be loaded dynamically into Qt Quick applications. Select
\gui {Qt Quick 1 Extension Plugin} to create extensions for
Qt Quick 1 applications and \gui {Qt Quick 2 Extension Plugin} to
\uicontrol {Qt Quick 1 Extension Plugin} to create extensions for
Qt Quick 1 applications and \uicontrol {Qt Quick 2 Extension Plugin} to
create extensions for Qt Quick 2 applications.
\endlist
@@ -66,14 +66,14 @@
\list 1
\li Select \gui Help > \gui Tools > \gui {About Plugins} >
\gui {Qt Quick} > \gui {QmlProjectManager} and restart \QC to show
\li Select \uicontrol Help > \uicontrol Tools > \uicontrol {About Plugins} >
\uicontrol {Qt Quick} > \uicontrol {QmlProjectManager} and restart \QC to show
the wizard.
\li Select \gui File > \gui {New File or Project} > \gui Application >
\gui {Qt Quick UI} > \gui Choose.
\li Select \uicontrol File > \uicontrol {New File or Project} > \uicontrol Application >
\uicontrol {Qt Quick UI} > \uicontrol Choose.
\li In the \gui {Qt Quick component set} field, select the component set
\li In the \uicontrol {Qt Quick component set} field, select the component set
to use for the project. The Qt Quick imports enable you to use the
basic QML types to create user interfaces, whereas the Qt Quick
Controls provide a set of ready-made controls that you can customize
@@ -81,10 +81,10 @@
\list
\li Select \gui {Qt Quick Controls} or \gui {Qt Quick 2.1}, or
\li Select \uicontrol {Qt Quick Controls} or \uicontrol {Qt Quick 2.1}, or
later, to develop for platforms that run Qt 5.
\li Select \gui {Qt Quick 1.1} to develop for platforms that run
\li Select \uicontrol {Qt Quick 1.1} to develop for platforms that run
Qt 4.7.4. To develop for platforms that run Qt 4.7.1, 4.7.2, or
4.7.3, you must change the import statement to import Qt Quick
1.0.
@@ -109,8 +109,8 @@
whole application UI.
\li .qml.ui files defines a form for the application UI. It is created
if you select \gui {Qt Quick Controls 1.3}, or later, or
\gui {Qt Quick 2.4}, or later. The forms can contain a subset of the
if you select \uicontrol {Qt Quick Controls 1.3}, or later, or
\uicontrol {Qt Quick 2.4}, or later. The forms can contain a subset of the
QML language. Similarly as with the UI forms for \QD, it is
recommended that you use \QMLD to edit the UI forms. For more
information, see \l{Qt Quick UI Forms}.
@@ -124,21 +124,21 @@
\list 1
\li Select \gui File > \gui {New File or Project} > \gui Application >
\gui {Qt Quick Application} > \gui Choose.
\li Select \uicontrol File > \uicontrol {New File or Project} > \uicontrol Application >
\uicontrol {Qt Quick Application} > \uicontrol Choose.
\li In the \gui {Qt Quick component set} field, select the component set
\li In the \uicontrol {Qt Quick component set} field, select the component set
to use for the project. For more information, see
\l{Creating Qt Quick UI Projects}.
\li Select \l{glossary-buildandrun-kit}{kits} for running and building
your project, and then click \gui{Next}.
your project, and then click \uicontrol{Next}.
\note Kits are listed if they have been specified in \gui Tools >
\gui Options > \gui {Build & Run} > \gui Kits.
\note Kits are listed if they have been specified in \uicontrol Tools >
\uicontrol Options > \uicontrol {Build & Run} > \uicontrol Kits.
\li Review the project settings, and click \gui{Finish} (on Windows and
Linux) or \gui Done (on OS X) to create the project.
\li Review the project settings, and click \uicontrol{Finish} (on Windows and
Linux) or \uicontrol Done (on OS X) to create the project.
\endlist

96
doc/src/qtquick/qtquick-designer.qdoc
View File

@@ -31,7 +31,7 @@
\title Using Qt Quick Designer
You can edit \l{Qt Quick UI Forms} (ui.qml files) in \QMLD. \QC opens the
UI forms in the \gui Design mode. It is recommended that you use UI forms
UI forms in the \uicontrol Design mode. It is recommended that you use UI forms
for components that you want to desing in \QMLD.
\image qmldesigner-visual-editor.png "Visual editor"
@@ -47,35 +47,35 @@
\list
\li \gui {Navigator} (1) displays the items in the current QML
\li \uicontrol {Navigator} (1) displays the items in the current QML
file as tree structure.
\li \gui {Library} (2) displays the building blocks that you can use
\li \uicontrol {Library} (2) displays the building blocks that you can use
to design applications: predefined QML types, your own QML
components, Qt Quick components or Qt Quick Controls that you
import to the project, and other resources.
\li \gui Connections (3) enables you to create connections between
\li \uicontrol Connections (3) enables you to create connections between
objects, signals, and object properties (commercial only). For
more information, see \l{Adding Connections}.
\li \gui {Projects} shows a list of projects open in the current
\li \uicontrol {Projects} shows a list of projects open in the current
session. For more information, see \l{Viewing Project Files}.
\li \gui {File System} shows all files in the currently selected
\li \uicontrol {File System} shows all files in the currently selected
directory. For more information, see \l{Viewing the File System}.
\li \gui {Open Documents} sidebar view shows currently open files.
\li \uicontrol {Open Documents} sidebar view shows currently open files.
\endlist
\li \gui Canvas (4) is the working area where you create QML components and
\li \uicontrol Canvas (4) is the working area where you create QML components and
design applications.
\li \gui {Properties} pane (5) organizes the properties of the selected item.
\li \uicontrol {Properties} pane (5) organizes the properties of the selected item.
You can change the properties also in the code editor.
\li \gui {State} pane (6) displays the different states of the item.
\li \uicontrol {State} pane (6) displays the different states of the item.
QML states typically describe user interface configurations, such as
the UI controls, their properties and behavior and the available
actions.
@@ -84,14 +84,14 @@
\section1 Managing Item Hierarchy
The \gui Navigator displays the items in the current QML file and their
The \uicontrol Navigator displays the items in the current QML file and their
relationships.
Items (1) are listed in a tree structure, below their parent (2).
\image qmldesigner-navigator.png "Navigator"
You can select items in the \gui Navigator to edit their properties
in the \gui Properties pane. Items can access the properties of their
You can select items in the \uicontrol Navigator to edit their properties
in the \uicontrol Properties pane. Items can access the properties of their
parent item. To select items on the canvas, right-click an item,
and select another type in the context menu.
@@ -109,16 +109,16 @@
Click the
\inlineimage qmldesigner-show-hide-icon.png
icon to change the visibility of an item on the canvas. To change the
visibility of an item in the application, use the \gui Visibility
check box or the \gui Opacity field in the \gui Properties pane. If you set
\gui Opacity to 0, items are hidden, but you can still apply animation
visibility of an item in the application, use the \uicontrol Visibility
check box or the \uicontrol Opacity field in the \uicontrol Properties pane. If you set
\uicontrol Opacity to 0, items are hidden, but you can still apply animation
to them.
As all properties, visibility and opacity are inherited from the parent
item. To hide or show child items, edit the properties of the parent item.
To view lists of files or projects, instead, select \gui {File System},
\gui {Open Documents}, or \gui Projects in the menu.
To view lists of files or projects, instead, select \uicontrol {File System},
\uicontrol {Open Documents}, or \uicontrol Projects in the menu.
To view several types of content at a time, split the sidebar by clicking
\inlineimage qtcreator-splitbar.png
.
@@ -133,9 +133,9 @@
up.
To change the stacking order of an item, right-click it on the canvas and
select \gui {Stack (z)}. You can raise or lower the stack value of an item
select \uicontrol {Stack (z)}. You can raise or lower the stack value of an item
or move the item to the front or back of all its siblings. To remove the
\c z property, select \gui {Reset z Property}.
\c z property, select \uicontrol {Reset z Property}.
\section2 Switching Parent Items
@@ -148,7 +148,7 @@
key before you drag and drop the item into a new position. The topmost
item under the cursor becomes the new parent of the item.
You can change the parent of an item also in the \gui Navigator.
You can change the parent of an item also in the \uicontrol Navigator.
Drag and drop the item to another position in the tree or use the arrow
buttons (1) to move the item in the tree.
@@ -156,10 +156,10 @@
\section1 QML Type Library
The \gui {Library} enables you to select QML types, UI components, and
The \uicontrol {Library} enables you to select QML types, UI components, and
resources, as well as to manage imports.
\gui {QML Types} displays the QML types grouped by category: your own QML
\uicontrol {QML Types} displays the QML types grouped by category: your own QML
components, basic types, layouts, positioner types, and views.
Sets of UI components with the look and feel of a particular mobile device
@@ -167,34 +167,34 @@
Quick Controls, Dialogs, and Layouts are available for creating user
interfaces using Qt Quick 2.1. The components and controls are based on
standard QML types. To view the components and controls in the
\gui {Library}, import the component sets in \gui Imports.
\uicontrol {Library}, import the component sets in \uicontrol Imports.
The \gui {Qt Quick Application} wizards for a particular platform add the
The \uicontrol {Qt Quick Application} wizards for a particular platform add the
import statements automatically. You can remove import statements in
\gui Imports
\uicontrol Imports
\image qmldesigner-qml-components.png "QML Components"
\gui {Resources} displays the images and other files that you copy
\uicontrol {Resources} displays the images and other files that you copy
to the project folder (to the same subfolder as the QML files).
\section1 Specifying Item Properties
The \gui Properties pane displays all the properties of the selected item.
The \uicontrol Properties pane displays all the properties of the selected item.
The properties are grouped by type. The top part of the pane
displays properties that are common to all QML types, such as
position, size, and visibility.
The bottom part of the pane displays properties that are specific to each
QML type. For example, the following image displays the properties you
can set for \gui Rectangle (1) and \gui Text (2) items.
can set for \uicontrol Rectangle (1) and \uicontrol Text (2) items.
\image qmldesigner-element-properties.png
You can use a context-menu to reset some item properties. To reset the
position or size property of an item, right-click the item and select
\gui {Edit > Reset Position} or \gui {Reset Size} in the context menu. To
set the visibility of the item, select \gui {Edit > Visibility}.
\uicontrol {Edit > Reset Position} or \uicontrol {Reset Size} in the context menu. To
set the visibility of the item, select \uicontrol {Edit > Visibility}.
For more information on the properties available for an item, press
\key {F1}.
@@ -212,12 +212,12 @@
When editing states, you can easily see which values are explicitly set in
the current state and which values are derived from the base state.
The following images illustrate this. In the base state, the \gui Size (1)
and \gui Colors (2) values are explicitly set and highlighted.
The following images illustrate this. In the base state, the \uicontrol Size (1)
and \uicontrol Colors (2) values are explicitly set and highlighted.
\image qmldesigner-properties-explicit-base.png "Explicitly set properties"
In \gui State1, only the color (1) is explicitly set and highlighted.
In \uicontrol State1, only the color (1) is explicitly set and highlighted.
\image qmldesigner-properties-explicit-state1.png "Explicitly set properties"
@@ -253,7 +253,7 @@
\section2 Marking Text Items for Translation
To support translators, mark each text item that should be translated.
In the \gui Properties pane, \gui Text field, select \gui tr (1).
In the \uicontrol Properties pane, \uicontrol Text field, select \uicontrol tr (1).
\image qmldesigner-text-property-tr.png "Text properties"
@@ -350,7 +350,7 @@
\section2 Building Transformations on Items
The \gui Advanced pane allows you to configure advanced transformations,
The \uicontrol Advanced pane allows you to configure advanced transformations,
such as rotation, scale, and translation. You can assign any number of
transformations to an item. Each transformation is applied in order, one at
a time.
@@ -403,7 +403,7 @@
\endlist
The \gui State pane displays the different \l{State}{states}
The \uicontrol State pane displays the different \l{State}{states}
of the component in the Qt Quick Designer.
\image qmldesigner-transitions.png "State pane"
@@ -414,7 +414,7 @@
you can change the position of an object on the canvas and then add animation
to the change between the states.
You can preview the states in the \gui State pane and click them to switch
You can preview the states in the \uicontrol State pane and click them to switch
between states on the canvas.
For more information on using states, see \l{Creating Screens}.
@@ -438,13 +438,13 @@
Click the \inlineimage qmldesigner-snap-to-anchors-button.png
button to anchor the item to the items that you snap to.
Choose \gui {Tools > Options > Qt Quick > Qt Quick Designer} to specify
settings for snapping. In the \gui {Parent item padding} field, specify the
Choose \uicontrol {Tools > Options > Qt Quick > Qt Quick Designer} to specify
settings for snapping. In the \uicontrol {Parent item padding} field, specify the
distance in pixels between the parent item and the snapping lines. In the
\gui {Sibling item spacing} field, specify the distance in pixels between
\uicontrol {Sibling item spacing} field, specify the distance in pixels between
sibling items and the snapping lines.
The following image shows the snapping lines when \gui {Parent item padding}
The following image shows the snapping lines when \uicontrol {Parent item padding}
is set to 5 pixels.
\image qmldesigner-snap-margins.png "Snapping lines on canvas"
@@ -476,18 +476,18 @@
bindings.
To experiment with different component sizes, enter values in the
\gui Height and \gui Width fields (1) on the canvas toolbar. The changes are
displayed in the \gui State pane (2) and on the canvas (3), but the property
\uicontrol Height and \uicontrol Width fields (1) on the canvas toolbar. The changes are
displayed in the \uicontrol State pane (2) and on the canvas (3), but the property
values are not changed permanently in the QML file. You can permanently
change the property values in the \gui Properties pane (4).
change the property values in the \uicontrol Properties pane (4).
\image qmldesigner-preview-size.png "Canvas width and height"
\section2 Specifying Canvas Size
To change the canvas size, select \gui {Tools > Options > Qt Quick
To change the canvas size, select \uicontrol {Tools > Options > Qt Quick
> Qt Quick Designer} and
specify the canvas width and height in the \gui Canvas group.
specify the canvas width and height in the \uicontrol Canvas group.
\section2 Refreshing the Canvas
@@ -499,6 +499,6 @@
To refresh the image on the canvas, press \key R or select
\inlineimage qmldesigner-reset-view.png
(\gui {Reset View}).
(\uicontrol {Reset View}).
*/

30
doc/src/qtquick/qtquick-exporting-qml.qdoc
View File

@@ -87,7 +87,7 @@
item, use top-level layer groups.
\li To determine that some layers are not exported, hide them, and
deselect the \gui {Export hidden} check box during exporting.
deselect the \uicontrol {Export hidden} check box during exporting.
\li To make it easier to find the layers and layer groups after
exporting them, use descriptive names for them.
@@ -122,34 +122,34 @@
information about the script.
\li Double-click the export script to add the export command to the
\gui Scripts menu. You can also copy the script file to the Adobe
\uicontrol Scripts menu. You can also copy the script file to the Adobe
Photoshop scripts directory (typically, \c{\Presets\Scripts} in the
Photoshop installation directory).
\li In Adobe Photoshop, choose \gui {File > Scripts > Export to QML} to
\li In Adobe Photoshop, choose \uicontrol {File > Scripts > Export to QML} to
export the scene to a QML file.
\li In the \gui {Export Document to QML} dialog, enter a name and
\li In the \uicontrol {Export Document to QML} dialog, enter a name and
location for the QML file.
\li Select the \gui {Rasterize text} check box to export text layers as
\li Select the \uicontrol {Rasterize text} check box to export text layers as
images, not as Text items.
\li Select the \gui {Group layers} check box to export each top-level
\li Select the \uicontrol {Group layers} check box to export each top-level
group as a merged QML Image item.
\li Select the \gui {Export hidden} check box to export hidden layers
\li Select the \uicontrol {Export hidden} check box to export hidden layers
and to set their visibility property to hidden.
\li Deselect the \gui {Export QML} check box if you have modified the
\li Deselect the \uicontrol {Export QML} check box if you have modified the
QML document in \QC, but still want to re-export graphical assets.
\li Click \gui Export.
\li Click \uicontrol Export.
\endlist
The QML file is saved to the location that you specified. In \QC, choose
\gui {File > Open File or Project} to open the QML file.
\uicontrol {File > Open File or Project} to open the QML file.
\note Existing files are replaced without warning.
@@ -186,18 +186,18 @@
On Linux, run the following command: \c {chmod u+rx}
\li Restart GIMP to have the export command added to the \gui File menu.
\li Restart GIMP to have the export command added to the \uicontrol File menu.
\li Choose \gui {File > Export to QML} to export the design to a QML
\li Choose \uicontrol {File > Export to QML} to export the design to a QML
file.
\li In the \gui {Export Layers to a QML Document} dialog, enter a name
and location for the QML file, and click \gui Export.
\li In the \uicontrol {Export Layers to a QML Document} dialog, enter a name
and location for the QML file, and click \uicontrol Export.
\endlist
The QML file is saved to the location that you specified. In \QC, choose
\gui {File > Open File or Project} to open the QML file.
\uicontrol {File > Open File or Project} to open the QML file.
\note Existing files are replaced without warning.

12
doc/src/qtquick/qtquick-modules-with-plugins.qdoc
View File

@@ -96,15 +96,15 @@
the box.
To use an emulation layer that is built with the Qt
configured in the build and run kit for the project, select \gui Tools >
\gui Options > \gui {Qt Quick} > \gui {Qt Quick Designer} >
\gui {Use QML emulation layer which is built by the selected Qt} radio button.
\QC builds the emulation layer when you select the \gui Design mode.
configured in the build and run kit for the project, select \uicontrol Tools >
\uicontrol Options > \uicontrol {Qt Quick} > \uicontrol {Qt Quick Designer} >
\uicontrol {Use QML emulation layer which is built by the selected Qt} radio button.
\QC builds the emulation layer when you select the \uicontrol Design mode.
A plugin should behave differently depending on whether it is run by the
emulation layer or an application. For example, animations should not be run
in the \gui Design mode. You can use the value of the QML_PUPPET_MODE
in the \uicontrol Design mode. You can use the value of the QML_PUPPET_MODE
environment variable to check whether the plugin is currently being run
by an application or edited in the \gui Design mode.
by an application or edited in the \uicontrol Design mode.
*/

8
doc/src/qtquick/qtquick-pathview-editor.qdoc
View File

@@ -48,17 +48,17 @@
control points to construct the curve.
In addition, PathLine and PathQuad path objects are supported indirectly.
To make a curve segment linear, select \gui {Make Curve Segment Straight} in
To make a curve segment linear, select \uicontrol {Make Curve Segment Straight} in
the context menu.
By default, the Path is closed, which means that its start and end points
are identical. To create separate start and end points for it, right-click
an edit point to open a context menu, and deselect \gui {Closed Path}.
an edit point to open a context menu, and deselect \uicontrol {Closed Path}.
To add intermediary points to a curve segment, select \gui {Split Segment}
To add intermediary points to a curve segment, select \uicontrol {Split Segment}
in the context menu.
In the \gui Properties pane, you can specify other properties for
In the \uicontrol Properties pane, you can specify other properties for
the PathView. For example, what is the maximum distance from the path that
initiates mouse dragging and what is the rate at which a flick will
decelerate.

52
doc/src/qtquick/qtquick-screens.qdoc
View File

@@ -35,8 +35,8 @@
screens. Typically, the main qml file in a Qt Quick project specifies the
main window of an application.
The QML files in the project folder are displayed in \gui {QML Components}
in the \gui Library.
The QML files in the project folder are displayed in \uicontrol {QML Components}
in the \uicontrol Library.
You can also use ready-made Qt Quick 1 Components (for Qt 4) to create
screens with a native look and feel for a particular target platform.
@@ -48,10 +48,10 @@
\list 1
\li Drag and drop components from the \gui Library to the editor.
\li Drag and drop components from the \uicontrol Library to the editor.
\li Select components in the \gui Navigator to edit their
properties in the \gui Properties pane.
\li Select components in the \uicontrol Navigator to edit their
properties in the \uicontrol Properties pane.
For example, you can anchor components to a position on the screen.
@@ -76,7 +76,7 @@
When you add a GridView, ListView, or PathView, the ListModel and the
delegate component that creates an instance for each item in the model are
added automatically. You can edit item properties
in the \gui Properties pane or
in the \uicontrol Properties pane or
in the code editor. You can also replace the default model and
delegate with other, more complex models and delegates in the code editor.
@@ -115,11 +115,11 @@
Property bindings are created implicitly in QML whenever a property is
assigned a JavaScript expression. To set JavaScript expressions as values of
properties in \QMLD, click the circle icon next to a property to open a
context menu, and select \gui {Set Binding}.
context menu, and select \uicontrol {Set Binding}.
\image qmldesigner-set-expression.png "Type properties context menu"
To remove bindings, select \gui Reset in the context menu.
To remove bindings, select \uicontrol Reset in the context menu.
For more information on the JavaScript environment provided by QML, see
\l{Integrating QML and JavaScript}.
@@ -136,7 +136,7 @@
invisible \e anchor lines: top, bottom, left, right, fill, horizontal
center, vertical center, and baseline.
In the \gui Layout pane you can set anchors and margins for items. To set
In the \uicontrol Layout pane you can set anchors and margins for items. To set
the anchors of an item, click the anchor buttons. You can combine the
top/bottom, left/right, and horizontal/vertical anchors to anchor items in
the corners of the parent item or center them horizontally or vertically
@@ -149,7 +149,7 @@
For performance reasons, you can only anchor an item to its siblings and
direct parent. By default, an item is anchored to its parent when you
use the anchor buttons. Select a sibling of the item in the \gui Target
use the anchor buttons. Select a sibling of the item in the \uicontrol Target
field to anchor to it, instead.
Arbitrary anchoring is not supported. For example, you cannot specify:
@@ -159,12 +159,12 @@
to the opposite side: \c {anchor.left: sibling.right}. This allows you to keep
sibling items together.
In the following image, \gui{Rectangle 2} is anchored to \gui{Rectangle 1}
In the following image, \uicontrol{Rectangle 2} is anchored to \uicontrol{Rectangle 1}
on its left and to the bottom of its parent.
\image qmldesigner-anchors.png "Anchoring sibling items"
The anchors for \gui{Rectangle 2} are specified as follows in code:
The anchors for \uicontrol{Rectangle 2} are specified as follows in code:
\qml
Rectangle {
@@ -207,7 +207,7 @@
\endlist
To lay out several items in a Column, Row, Grid, or Flow, select
the items on the canvas, and then select \gui Layout in the context
the items on the canvas, and then select \uicontrol Layout in the context
menu.
\section2 Using Layouts
@@ -222,7 +222,7 @@
\list
\li \l{Layout} provides attached properties for items pushed onto a
\gui {Column Layout}, \gui {Row Layout}, or \gui {Grid Layout}.
\uicontrol {Column Layout}, \uicontrol {Row Layout}, or \uicontrol {Grid Layout}.
\li ColumnLayout provides a grid layout with only one column.
@@ -233,14 +233,14 @@
\endlist
To lay out several items in a \gui {Column Layout}, \gui {Row Layout}, or
\gui {Grid Layout}, select the items on the canvas, and then select
\gui Layout in the context menu.
To lay out several items in a \uicontrol {Column Layout}, \uicontrol {Row Layout}, or
\uicontrol {Grid Layout}, select the items on the canvas, and then select
\uicontrol Layout in the context menu.
To make an item within a layout as wide as possible while respecting the
given constraints, select the item on the canvas and then select
\gui Layout > \gui {Fill Width} in the context menu. To make the item as
high as possible, select \gui {Fill Height}.
\uicontrol Layout > \uicontrol {Fill Width} in the context menu. To make the item as
high as possible, select \uicontrol {Fill Height}.
\section2 Using Split Views
@@ -257,7 +257,7 @@
controls, their properties and behavior and the available actions. For
example, you can use states to create two screens.
To add states, click the empty slot in the \gui States pane. Then modify the
To add states, click the empty slot in the \uicontrol States pane. Then modify the
new state in the visual editor.
\image qmldesigner-states.png "States pane"
@@ -297,11 +297,11 @@
\inlineimage qmldesigner-show-hide-icon.png
icon to hide items on the canvas that are not part of a screen.
\li In the \gui States pane, click the empty slot to create a new state
\li In the \uicontrol States pane, click the empty slot to create a new state
and give it a name. For example, \c Normal.
\li In the \gui Properties pane (2), deselect the \gui Visibility check box
or set \gui Opacity to 0 for each item that is not needed in this
\li In the \uicontrol Properties pane (2), deselect the \uicontrol Visibility check box
or set \uicontrol Opacity to 0 for each item that is not needed in this
view. If you specify the setting for the parent item, all child
items inherit it and are also hidden.
@@ -394,7 +394,7 @@
Not visible in the item library in 3.2.
\li StatusBar contains status information in your application. It
does not provide a layout of its own, but requires you to position
its contents, for instance by creating a \gui {Row Layout}.
its contents, for instance by creating a \uicontrol {Row Layout}.
\endomit
\li TextArea displays multiple lines of editable formatted text.
@@ -406,11 +406,11 @@
\li ToolBar provides styling for ToolButton as well as other controls
that it can contain. However, it does not provide a layout of its
own, but requires you to position its contents, for instance by
creating a \gui {Row Layout}.
creating a \uicontrol {Row Layout}.
\endomit
\li ToolButton provides a button that is functionally similar to
\gui Button, but that looks more suitable on a \gui {Tool Bar}.
\uicontrol Button, but that looks more suitable on a \uicontrol {Tool Bar}.
\endlist

6
doc/src/qtquick/qtquick-toolbars.qdoc
View File

@@ -36,13 +36,13 @@
. Select the icon to open the toolbar.
To open toolbars immediately when you select a QML type, select
\gui{Tools > Options > Qt Quick > Qt Quick Toolbar > Always show Qt Quick
\uicontrol{Tools > Options > Qt Quick > Qt Quick Toolbar > Always show Qt Quick
Toolbar}.
Drag the toolbar to pin it to another location. Select
\inlineimage qml-toolbar-pin.png
to unpin the toolbar and move it to its default location. To pin toolbars
by default, select \gui{Tools > Options > Qt Quick > Qt Quick Toolbar
by default, select \uicontrol{Tools > Options > Qt Quick > Qt Quick Toolbar
> Pin Quick Toolbar}.
\section1 Previewing Images
@@ -73,7 +73,7 @@
\image qml-toolbar-text.png "Qt Quick Toolbar for text"
By default, font size is specified as pixels. To use points, instead,
change \gui px to \gui pt in the size field.
change \uicontrol px to \uicontrol pt in the size field.
\section1 Previewing Animation

6
doc/src/qtquick/qtquick-ui-forms.qdoc
View File

@@ -33,7 +33,7 @@
You can use \QC wizards to create UI forms that have the filename extension
\e .ui.qml. The UI forms contain a purely declarative subset of the QML
language. It is recommended that you edit the forms in the \gui Design mode.
language. It is recommended that you edit the forms in the \uicontrol Design mode.
\QC enforces the use of the supported QML features by displaying error
messages.
@@ -64,7 +64,7 @@
\section1 Using Qt Quick UI Forms
You can edit the forms in the \gui Design mode. Items that are supposed to
You can edit the forms in the \uicontrol Design mode. Items that are supposed to
be used in QML code have to be exported as properties:
\code
@@ -85,7 +85,7 @@
The property alias exports the button to the QML code that uses the form.
You can use the
\inlineimage qmldesigner-export-item-button.png
(\gui Export) button in the \gui Navigator to export an item as a property
(\uicontrol Export) button in the \uicontrol Navigator to export an item as a property
(commercial only):
\image qmldesigner-export-item.png