diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-04-16 10:18:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-16 10:18:26 +0200 |
| commit | 1dec7c2d638a66e835e1af1cf1b1d62af9803b1b (patch) | |
| tree | a4e6f222875d3a27a43ad14550a968e43ee7d1e8 /doc | |
| parent | 16ae5bf8e0316975ce9fac33aebb142473efb78d (diff) | |
| parent | fe074039addf94cadaa6a31113cb1e400bc8170d (diff) | |
| download | qt-creator-1dec7c2d638a66e835e1af1cf1b1d62af9803b1b.tar.gz | |
Merge remote-tracking branch 'origin/4.9'
Change-Id: If72840c903ec38281c7f76f7b3595197bde96679
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/images/qmldesigner-preview-size.png | bin | 21731 -> 55619 bytes | |||
| -rw-r--r-- | doc/images/qmldesigner-reset-view.png | bin | 157 -> 0 bytes | |||
| -rw-r--r-- | doc/images/qmldesigner-snap-margins.png | bin | 14329 -> 42633 bytes | |||
| -rw-r--r-- | doc/src/qtquick/qtquick-designer.qdoc | 10 |
4 files changed, 5 insertions, 5 deletions
diff --git a/doc/images/qmldesigner-preview-size.png b/doc/images/qmldesigner-preview-size.png Binary files differindex 63003fa46f..244ea4913c 100644 --- a/doc/images/qmldesigner-preview-size.png +++ b/doc/images/qmldesigner-preview-size.png diff --git a/doc/images/qmldesigner-reset-view.png b/doc/images/qmldesigner-reset-view.png Binary files differdeleted file mode 100644 index b3308cf5c1..0000000000 --- a/doc/images/qmldesigner-reset-view.png +++ /dev/null diff --git a/doc/images/qmldesigner-snap-margins.png b/doc/images/qmldesigner-snap-margins.png Binary files differindex f408de621d..f1b697b1c0 100644 --- a/doc/images/qmldesigner-snap-margins.png +++ b/doc/images/qmldesigner-snap-margins.png diff --git a/doc/src/qtquick/qtquick-designer.qdoc b/doc/src/qtquick/qtquick-designer.qdoc index 552dc43f40..ab3102d3dd 100644 --- a/doc/src/qtquick/qtquick-designer.qdoc +++ b/doc/src/qtquick/qtquick-designer.qdoc @@ -132,8 +132,8 @@ \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 \uicontrol {Parent item padding} - is set to 5 pixels. + The following image shows the snapping lines (1) when + \uicontrol {Parent item padding} is set to 5 pixels. \image qmldesigner-snap-margins.png "Snapping lines on canvas" @@ -164,8 +164,8 @@ To experiment with different component sizes, enter values in the \uicontrol {Override Width} and \uicontrol {Override Height} fields (1) on - the canvas toolbar. The changes are - displayed in the \uicontrol State pane (2) and on the canvas (3), but the property + the canvas toolbar. The changes are displayed on the canvas (2) + and in the \uicontrol States pane (3), but the property values are not changed permanently in the QML file. You can permanently change the property values in the \uicontrol Properties pane (4). @@ -186,7 +186,7 @@ not be displayed correctly on the canvas. To refresh the image on the canvas, press \key R or select the - \inlineimage qmldesigner-reset-view.png + \inlineimage reset.png (\uicontrol {Reset View}) button. */ |
