diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-28 15:24:18 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-28 15:35:03 +0200 |
| commit | ba0899542cf03a685335bf4e02edfb377bade224 (patch) | |
| tree | 554213486fd3420745da3821c3e4502e4c15830f /src/quick/doc/images | |
| parent | 6f411ef9d460d6a4f73a455b6eec9afc2f52d305 (diff) | |
| parent | 43484528552cb2ba3dc1dabfcce22ed40bf4f8db (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/quick/doc/src/appdevguide/porting.qdoc
sync.profile
Change-Id: Iec5516c596c3eca60a3e6ceb1d45f2a7a1595c12
Diffstat (limited to 'src/quick/doc/images')
| -rw-r--r-- | src/quick/doc/images/qml-extending-types.png | bin | 738 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-animation.png | bin | 474 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-integratingjs.png | bin | 679 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-layouts-anchors.png | bin | 946 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-layouts-direct.png | bin | 344 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-layouts-positioners.png | bin | 471 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-styling-text.png | bin | 29158 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-styling.png | bin | 6330 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-text.png | bin | 41485 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-userinput.png | bin | 6713 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-visual-opacity.png | bin | 211 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-visual-rectangles.png | bin | 770 -> 0 bytes |
| -rw-r--r-- | src/quick/doc/images/qml-uses-visual-transforms.png | bin | 671 -> 0 bytes |
13 files changed, 0 insertions, 0 deletions
diff --git a/src/quick/doc/images/qml-extending-types.png b/src/quick/doc/images/qml-extending-types.png Binary files differdeleted file mode 100644 index 6990d7c190..0000000000 --- a/src/quick/doc/images/qml-extending-types.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-animation.png b/src/quick/doc/images/qml-uses-animation.png Binary files differdeleted file mode 100644 index b54361260c..0000000000 --- a/src/quick/doc/images/qml-uses-animation.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-integratingjs.png b/src/quick/doc/images/qml-uses-integratingjs.png Binary files differdeleted file mode 100644 index 3bb0d8aadf..0000000000 --- a/src/quick/doc/images/qml-uses-integratingjs.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-layouts-anchors.png b/src/quick/doc/images/qml-uses-layouts-anchors.png Binary files differdeleted file mode 100644 index 769597cf52..0000000000 --- a/src/quick/doc/images/qml-uses-layouts-anchors.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-layouts-direct.png b/src/quick/doc/images/qml-uses-layouts-direct.png Binary files differdeleted file mode 100644 index 0682da36f8..0000000000 --- a/src/quick/doc/images/qml-uses-layouts-direct.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-layouts-positioners.png b/src/quick/doc/images/qml-uses-layouts-positioners.png Binary files differdeleted file mode 100644 index ebdd9c58dd..0000000000 --- a/src/quick/doc/images/qml-uses-layouts-positioners.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-styling-text.png b/src/quick/doc/images/qml-uses-styling-text.png Binary files differdeleted file mode 100644 index af2518a9e8..0000000000 --- a/src/quick/doc/images/qml-uses-styling-text.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-styling.png b/src/quick/doc/images/qml-uses-styling.png Binary files differdeleted file mode 100644 index a6bf68e783..0000000000 --- a/src/quick/doc/images/qml-uses-styling.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-text.png b/src/quick/doc/images/qml-uses-text.png Binary files differdeleted file mode 100644 index 6b3d88cb3f..0000000000 --- a/src/quick/doc/images/qml-uses-text.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-userinput.png b/src/quick/doc/images/qml-uses-userinput.png Binary files differdeleted file mode 100644 index 2793e8d1d7..0000000000 --- a/src/quick/doc/images/qml-uses-userinput.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-visual-opacity.png b/src/quick/doc/images/qml-uses-visual-opacity.png Binary files differdeleted file mode 100644 index ab238deb54..0000000000 --- a/src/quick/doc/images/qml-uses-visual-opacity.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-visual-rectangles.png b/src/quick/doc/images/qml-uses-visual-rectangles.png Binary files differdeleted file mode 100644 index acf7cb160a..0000000000 --- a/src/quick/doc/images/qml-uses-visual-rectangles.png +++ /dev/null diff --git a/src/quick/doc/images/qml-uses-visual-transforms.png b/src/quick/doc/images/qml-uses-visual-transforms.png Binary files differdeleted file mode 100644 index d89fc75256..0000000000 --- a/src/quick/doc/images/qml-uses-visual-transforms.png +++ /dev/null |
