diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-25 13:56:27 +0200 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-02-25 13:56:35 +0200 |
| commit | f6d0efea3e4348dc2ec3480059ab424236402ddb (patch) | |
| tree | e9e68b79183ea2965189cf76fcfe4cb512884741 /basicsuite/enterprise-gallery/FlickableMoreIndicator.qml | |
| parent | 203ffaab105b1f868689656bfbdfabb7f55b9e56 (diff) | |
| parent | 62fe9e0b36ac3caed1ec38132be3ef43fe094366 (diff) | |
Merge branch 'stable' into dev
* stable: (28 commits)
Fix typo Main -> SharedMain
Fix stand alone demo layout issues on portrait devices
Exclude mediaplayer also from eLinux-bone, since not working
Fix deployment of QML import plugins when building in Qt Creator
Add QtWidgets dependecy to shared.pri
Update title and description for Text Input demo
Update content for About Boot to Qt demo
Fix QML GroupBox: Binding loop detected for property
[controls-touch] Deploy images
Remove Sensors demo from the Qt Creator's list of examples
Remove Sensor Explorer and Particles demos from launcher
Fix layout issues with Qt-Everywhere (touchgallery)
[qt5-launchpresentation] Don't crop the description text on nexus
[launcher settings] improve visual appearance
[qt5-everywhere] update preview image
Fix vkb import path
Fix issues in qt5-launcher presentation
Remove Raspberry Pi logo from demo
Fix Canvas2D error
Qt5-Everywhere: show network error message
...
Change-Id: I0289b2f6a53cf53bc6c6ef1f63b07b8e8dc75c88
Diffstat (limited to 'basicsuite/enterprise-gallery/FlickableMoreIndicator.qml')
| -rw-r--r-- | basicsuite/enterprise-gallery/FlickableMoreIndicator.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml b/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml index c935de2..c8b9fe5 100644 --- a/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml +++ b/basicsuite/enterprise-gallery/FlickableMoreIndicator.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc +** Copyright (C) 2014 Digia Plc ** All rights reserved. ** For any questions to Digia, please use contact form at http://qt.digia.com ** |