diff options
author | Nico Vertriest <nico.vertriest@qt.io> | 2018-05-22 14:01:05 +0200 |
---|---|---|
committer | Nico Vertriest <nico.vertriest@qt.io> | 2018-06-07 11:07:19 +0000 |
commit | d6686a578debb0a235baeb4b626bc931c7695780 (patch) | |
tree | 00c7e461b16519ed8f860efa7bd43cfbf9d99b6b /doc/src/snippets/coffee/imports | |
parent | 96bfc87db384f10b7e85931268972941f63a0680 (diff) |
Doc: Move coffeemachine examples to examples/demos
-Also add license file for TitilliumWeb-Regular.ttf
-Add qt_qttribution.json and LICENSE.txt
Task-number: QTBUG-68357
Change-Id: I705a28ed9f113e7ad3cca1b93eb162cc223d9d2d
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Diffstat (limited to 'doc/src/snippets/coffee/imports')
-rw-r--r-- | doc/src/snippets/coffee/imports/Coffee/Constants.qml | 68 | ||||
-rw-r--r-- | doc/src/snippets/coffee/imports/Coffee/TitilliumWeb-Regular.ttf | bin | 63752 -> 0 bytes | |||
-rw-r--r-- | doc/src/snippets/coffee/imports/Coffee/qmldir | 1 |
3 files changed, 0 insertions, 69 deletions
diff --git a/doc/src/snippets/coffee/imports/Coffee/Constants.qml b/doc/src/snippets/coffee/imports/Coffee/Constants.qml deleted file mode 100644 index 8816a9f58..000000000 --- a/doc/src/snippets/coffee/imports/Coffee/Constants.qml +++ /dev/null @@ -1,68 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** BSD License Usage -** Alternatively, you may use this file under the terms of the BSD license -** as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd 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 -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -pragma Singleton -import QtQuick 2.6 - -QtObject { - property FontLoader fontLoader: FontLoader { - id: fontLoader - source: "TitilliumWeb-Regular.ttf" - } - readonly property alias fontFamily: fontLoader.name - - readonly property int width: 1024 - readonly property int height: 768 - readonly property int leftSideBarWidth: 366 - - readonly property color backgroundColor: "#443224" - readonly property int defaultMargin: 8 -} diff --git a/doc/src/snippets/coffee/imports/Coffee/TitilliumWeb-Regular.ttf b/doc/src/snippets/coffee/imports/Coffee/TitilliumWeb-Regular.ttf Binary files differdeleted file mode 100644 index 6da821935..000000000 --- a/doc/src/snippets/coffee/imports/Coffee/TitilliumWeb-Regular.ttf +++ /dev/null diff --git a/doc/src/snippets/coffee/imports/Coffee/qmldir b/doc/src/snippets/coffee/imports/Coffee/qmldir deleted file mode 100644 index 616ac2035..000000000 --- a/doc/src/snippets/coffee/imports/Coffee/qmldir +++ /dev/null @@ -1 +0,0 @@ -singleton Constants 1.0 Constants.qml |