diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 12:59:04 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-27 12:59:04 +0200 |
commit | a1922317f8b2c219176553ff3f0db815f6f16cfd (patch) | |
tree | f90b3725afcfdd5efce59ad698bd1b347f26900e /src/quick/doc | |
parent | 02bf3ca59ea1aa4af0ce39d2f4fc856ce47f9966 (diff) | |
parent | ffe861a0785056a90c787172400fa6061acfcc32 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I59f34fafd795694981dd1edffca1d322657f1ae6
Diffstat (limited to 'src/quick/doc')
-rw-r--r-- | src/quick/doc/images/qml-item-canvas-clip-complex.png | bin | 0 -> 70000 bytes | |||
-rw-r--r-- | src/quick/doc/images/qml-item-canvas-scaley.png | bin | 0 -> 1080 bytes | |||
-rw-r--r-- | src/quick/doc/images/qml-item-canvas-skewx.png | bin | 0 -> 1857 bytes | |||
-rw-r--r-- | src/quick/doc/images/qml-item-canvas-skewy.png | bin | 0 -> 2654 bytes | |||
-rw-r--r-- | src/quick/doc/images/qml-item-canvas-translate.png | bin | 0 -> 1269 bytes | |||
-rw-r--r-- | src/quick/doc/images/qml-item-canvas-translatey.png | bin | 0 -> 1666 bytes | |||
-rw-r--r-- | src/quick/doc/src/whatsnew.qdoc | 3 |
7 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/doc/images/qml-item-canvas-clip-complex.png b/src/quick/doc/images/qml-item-canvas-clip-complex.png Binary files differnew file mode 100644 index 0000000000..cb582bad41 --- /dev/null +++ b/src/quick/doc/images/qml-item-canvas-clip-complex.png diff --git a/src/quick/doc/images/qml-item-canvas-scaley.png b/src/quick/doc/images/qml-item-canvas-scaley.png Binary files differnew file mode 100644 index 0000000000..61462b9adc --- /dev/null +++ b/src/quick/doc/images/qml-item-canvas-scaley.png diff --git a/src/quick/doc/images/qml-item-canvas-skewx.png b/src/quick/doc/images/qml-item-canvas-skewx.png Binary files differnew file mode 100644 index 0000000000..c9bcb6715c --- /dev/null +++ b/src/quick/doc/images/qml-item-canvas-skewx.png diff --git a/src/quick/doc/images/qml-item-canvas-skewy.png b/src/quick/doc/images/qml-item-canvas-skewy.png Binary files differnew file mode 100644 index 0000000000..594ac842a4 --- /dev/null +++ b/src/quick/doc/images/qml-item-canvas-skewy.png diff --git a/src/quick/doc/images/qml-item-canvas-translate.png b/src/quick/doc/images/qml-item-canvas-translate.png Binary files differnew file mode 100644 index 0000000000..7bb3ae7560 --- /dev/null +++ b/src/quick/doc/images/qml-item-canvas-translate.png diff --git a/src/quick/doc/images/qml-item-canvas-translatey.png b/src/quick/doc/images/qml-item-canvas-translatey.png Binary files differnew file mode 100644 index 0000000000..9196bf5919 --- /dev/null +++ b/src/quick/doc/images/qml-item-canvas-translatey.png diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc index 973d41dca2..26d88699bc 100644 --- a/src/quick/doc/src/whatsnew.qdoc +++ b/src/quick/doc/src/whatsnew.qdoc @@ -38,7 +38,8 @@ features introduced by the new import and new classes in Qt 5.1: \li New render loop for windows for smoother animations. \li New \l Window properties: activeFocusItem, minimumWidth, minimumHeight, maximumWidth, maximumHeight, visibility, contentOrientation, and opacity. -\li New \l Item property: activeFocusOnTab. +\li New \l Screen attached properties: name, desktopAvailableWidth, + desktopAvailableHeight, logicalPixelDensity \li New \l Grid properties: horizontalAlignment, verticalAlignment, and effectiveHorizontalAlignment. \li New \l TextEdit properties: selectByKeyboard and textDocument |