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/textinput/main.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/textinput/main.qml')
| -rw-r--r-- | basicsuite/textinput/main.qml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/basicsuite/textinput/main.qml b/basicsuite/textinput/main.qml index b67d960..8f63b83 100644 --- a/basicsuite/textinput/main.qml +++ b/basicsuite/textinput/main.qml @@ -1,9 +1,10 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** Contact: For any questions to Digia, please use the contact form at +** http://qt.digia.com/ ** -** This file is part of the examples of the Qt Toolkit. +** This file is part of the examples of the Qt Enterprise Embedded. ** ** $QT_BEGIN_LICENSE:BSD$ ** You may use this file under the terms of the BSD license as follows: @@ -17,10 +18,10 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor -** the names of its contributors may be used to endorse or promote -** products derived from this software without specific prior written -** permission. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** ** ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |