diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:10:27 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-04-15 15:10:38 +0300 |
| commit | d757a8ee2d86c3f4b694f8fdff5defa7b0dbab75 (patch) | |
| tree | 27b30b37643ebfe4615d7eb645b72cd42a4316cb /doc/template/images | |
| parent | 80c1335ec02c038329603486315d06d7bddc1326 (diff) | |
| parent | 63d998641077d9074281f402ae7becb41c037a2c (diff) | |
Merge branch 'stable' into releaseQtEE_v2.1.0
* stable: (21 commits)
Revert "Show PieMenu in enterprise controls list view."
Show PieMenu in enterprise controls list view.
Fix PieMenu not showing in enterprise-gallery launcher demo.
Update enterprise controls demos to version 1.1
Revert "Add input field for decimal numbers"
Doc: Update documentation version to 2.1.0
[launchersettings] Fix UI scaling
[about-b2qt] Use Screen element for setting width/height
Change default font for demos to support arabic numbers
[launchersettings] Small fixes in wifi settings section
sensorexplorer: Use identifier field when description is empty
Make sensors demo not rely on measurement errors
Doc: Update screenshot for the textinput demo
Remove incorrect assingment of QUrl to bool
qt5-everywhere: update working radio playlist
Show launchersettings and sensors demos in QtCreator
Doc: Switch to use the global Qt template for example docs
Updated preview_l.jpg for textinput demo
Rearrange the order of demos in the launcher
Merge updates from upstream into keyboard example
...
Change-Id: I83f65cb50cf53609d9bb131c94c3d020882a2ccd
Diffstat (limited to 'doc/template/images')
| -rw-r--r-- | doc/template/images/arrow_bc.png | bin | 1071 -> 0 bytes |
| -rw-r--r-- | doc/template/images/bgrContent.png | bin | 149 -> 0 bytes |
| -rw-r--r-- | doc/template/images/blu_dot.png | bin | 168 -> 0 bytes |
| -rw-r--r-- | doc/template/images/btn_next.png | bin | 689 -> 0 bytes |
| -rw-r--r-- | doc/template/images/btn_prev.png | bin | 676 -> 0 bytes |
| -rw-r--r-- | doc/template/images/home.png | bin | 1076 -> 0 bytes |
| -rw-r--r-- | doc/template/images/ico_note.png | bin | 649 -> 0 bytes |
| -rw-r--r-- | doc/template/images/ico_note_attention.png | bin | 529 -> 0 bytes |
| -rw-r--r-- | doc/template/images/ico_out.png | bin | 362 -> 0 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/doc/template/images/arrow_bc.png b/doc/template/images/arrow_bc.png Binary files differdeleted file mode 100644 index f2a83a5..0000000 --- a/doc/template/images/arrow_bc.png +++ /dev/null diff --git a/doc/template/images/bgrContent.png b/doc/template/images/bgrContent.png Binary files differdeleted file mode 100644 index 1a81b03..0000000 --- a/doc/template/images/bgrContent.png +++ /dev/null diff --git a/doc/template/images/blu_dot.png b/doc/template/images/blu_dot.png Binary files differdeleted file mode 100644 index c332148..0000000 --- a/doc/template/images/blu_dot.png +++ /dev/null diff --git a/doc/template/images/btn_next.png b/doc/template/images/btn_next.png Binary files differdeleted file mode 100644 index f7bc2b7..0000000 --- a/doc/template/images/btn_next.png +++ /dev/null diff --git a/doc/template/images/btn_prev.png b/doc/template/images/btn_prev.png Binary files differdeleted file mode 100644 index 10a620c..0000000 --- a/doc/template/images/btn_prev.png +++ /dev/null diff --git a/doc/template/images/home.png b/doc/template/images/home.png Binary files differdeleted file mode 100644 index 8de6d0c..0000000 --- a/doc/template/images/home.png +++ /dev/null diff --git a/doc/template/images/ico_note.png b/doc/template/images/ico_note.png Binary files differdeleted file mode 100644 index 1379404..0000000 --- a/doc/template/images/ico_note.png +++ /dev/null diff --git a/doc/template/images/ico_note_attention.png b/doc/template/images/ico_note_attention.png Binary files differdeleted file mode 100644 index b85b696..0000000 --- a/doc/template/images/ico_note_attention.png +++ /dev/null diff --git a/doc/template/images/ico_out.png b/doc/template/images/ico_out.png Binary files differdeleted file mode 100644 index ff6e458..0000000 --- a/doc/template/images/ico_out.png +++ /dev/null |
