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 | |
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>
-rw-r--r-- | doc/config/qtdoc.qdocconf | 5 | ||||
-rw-r--r-- | examples/demos/coffee/ApplicationFlow.qml (renamed from doc/src/snippets/coffee/ApplicationFlow.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/ApplicationFlowForm.ui.qml (renamed from doc/src/snippets/coffee/ApplicationFlowForm.ui.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/Brewing.qml (renamed from doc/src/snippets/coffee/Brewing.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/BrewingForm.ui.qml (renamed from doc/src/snippets/coffee/BrewingForm.ui.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/ChoosingCoffee.ui.qml (renamed from doc/src/snippets/coffee/ChoosingCoffee.ui.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/CoffeeButton.qml (renamed from doc/src/snippets/coffee/CoffeeButton.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/Cup.qml (renamed from doc/src/snippets/coffee/Cup.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/CupForm.ui.qml (renamed from doc/src/snippets/coffee/CupForm.ui.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/EmptyCup.qml (renamed from doc/src/snippets/coffee/EmptyCup.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/EmptyCupForm.ui.qml (renamed from doc/src/snippets/coffee/EmptyCupForm.ui.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/LICENSE.txt | 86 | ||||
-rw-r--r-- | examples/demos/coffee/NavigationButton.ui.qml (renamed from doc/src/snippets/coffee/NavigationButton.ui.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/SideBar.qml (renamed from doc/src/snippets/coffee/SideBar.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/SideBarForm.ui.qml (renamed from doc/src/snippets/coffee/SideBarForm.ui.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/coffee.pro (renamed from doc/src/snippets/coffee/coffee.pro) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/coffee.qdoc (renamed from doc/src/snippets/coffee/coffee.qdoc) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/images/cup structure/coffee_cup_large.png (renamed from doc/src/snippets/coffee/images/cup structure/coffee_cup_large.png) | bin | 11148 -> 11148 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/cup structure/coffee_cup_outline.png (renamed from doc/src/snippets/coffee/images/cup structure/coffee_cup_outline.png) | bin | 7511 -> 7511 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/cup structure/cup elements/coffee_cup_back.png (renamed from doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_back.png) | bin | 10351 -> 10351 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/cup structure/cup elements/coffee_cup_coverplate.png (renamed from doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_coverplate.png) | bin | 16630 -> 16630 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/cup structure/cup elements/coffee_cup_front.png (renamed from doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_front.png) | bin | 15775 -> 15775 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/cup structure/liquids/liquid_coffee.png (renamed from doc/src/snippets/coffee/images/cup structure/liquids/liquid_coffee.png) | bin | 30278 -> 30278 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/cup structure/liquids/liquid_foam.png (renamed from doc/src/snippets/coffee/images/cup structure/liquids/liquid_foam.png) | bin | 28867 -> 28867 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/cup structure/liquids/liquid_milk.png (renamed from doc/src/snippets/coffee/images/cup structure/liquids/liquid_milk.png) | bin | 31452 -> 31452 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/icons/coffees/Americano.png (renamed from doc/src/snippets/coffee/images/icons/coffees/Americano.png) | bin | 22801 -> 22801 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/icons/coffees/Espresso.png (renamed from doc/src/snippets/coffee/images/icons/coffees/Espresso.png) | bin | 22734 -> 22734 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/icons/coffees/Latte.png (renamed from doc/src/snippets/coffee/images/icons/coffees/Latte.png) | bin | 23218 -> 23218 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/icons/coffees/Macchiato.png (renamed from doc/src/snippets/coffee/images/icons/coffees/Macchiato.png) | bin | 23007 -> 23007 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/icons/coffees/cappucino.png (renamed from doc/src/snippets/coffee/images/icons/coffees/cappucino.png) | bin | 23148 -> 23148 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/icons/contents/coffee.png (renamed from doc/src/snippets/coffee/images/icons/contents/coffee.png) | bin | 725 -> 725 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/icons/contents/milk.png (renamed from doc/src/snippets/coffee/images/icons/contents/milk.png) | bin | 519 -> 519 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/icons/contents/sugar.png (renamed from doc/src/snippets/coffee/images/icons/contents/sugar.png) | bin | 165 -> 165 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/ui controls/buttons/back/white.png (renamed from doc/src/snippets/coffee/images/ui controls/buttons/back/white.png) | bin | 1758 -> 1758 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/ui controls/buttons/go/white.png (renamed from doc/src/snippets/coffee/images/ui controls/buttons/go/white.png) | bin | 1784 -> 1784 bytes | |||
-rw-r--r-- | examples/demos/coffee/images/ui controls/line.png (renamed from doc/src/snippets/coffee/images/ui controls/line.png) | bin | 123 -> 123 bytes | |||
-rw-r--r-- | examples/demos/coffee/imports/Coffee/Constants.qml (renamed from doc/src/snippets/coffee/imports/Coffee/Constants.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/imports/Coffee/TitilliumWeb-Regular.ttf (renamed from doc/src/snippets/coffee/imports/Coffee/TitilliumWeb-Regular.ttf) | bin | 63752 -> 63752 bytes | |||
-rw-r--r-- | examples/demos/coffee/imports/Coffee/qmldir (renamed from doc/src/snippets/coffee/imports/Coffee/qmldir) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/main.cpp (renamed from doc/src/snippets/coffee/main.cpp) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/main.qml (renamed from doc/src/snippets/coffee/main.qml) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/qml.qrc (renamed from doc/src/snippets/coffee/qml.qrc) | 0 | ||||
-rw-r--r-- | examples/demos/coffee/qt_attribution.json | 15 | ||||
-rw-r--r-- | examples/demos/coffee/qtquickcontrols2.conf (renamed from doc/src/snippets/coffee/qtquickcontrols2.conf) | 0 |
44 files changed, 105 insertions, 1 deletions
diff --git a/doc/config/qtdoc.qdocconf b/doc/config/qtdoc.qdocconf index 8e3cc1517..9f02fa199 100644 --- a/doc/config/qtdoc.qdocconf +++ b/doc/config/qtdoc.qdocconf @@ -81,12 +81,15 @@ sourcedirs += \ exampledirs += \ ../src \ - ../snippets + ../snippets \ + ../../examples/demos # Don't parse files in snippets directory excludedirs += \ ../src/snippets +examplesinstallpath = demos + qhp.projects = QtDoc qhp.QtDoc.file = qtdoc.qhp diff --git a/doc/src/snippets/coffee/ApplicationFlow.qml b/examples/demos/coffee/ApplicationFlow.qml index 406a19b8f..406a19b8f 100644 --- a/doc/src/snippets/coffee/ApplicationFlow.qml +++ b/examples/demos/coffee/ApplicationFlow.qml diff --git a/doc/src/snippets/coffee/ApplicationFlowForm.ui.qml b/examples/demos/coffee/ApplicationFlowForm.ui.qml index 1844d133b..1844d133b 100644 --- a/doc/src/snippets/coffee/ApplicationFlowForm.ui.qml +++ b/examples/demos/coffee/ApplicationFlowForm.ui.qml diff --git a/doc/src/snippets/coffee/Brewing.qml b/examples/demos/coffee/Brewing.qml index 3abe35b39..3abe35b39 100644 --- a/doc/src/snippets/coffee/Brewing.qml +++ b/examples/demos/coffee/Brewing.qml diff --git a/doc/src/snippets/coffee/BrewingForm.ui.qml b/examples/demos/coffee/BrewingForm.ui.qml index 8de3d880a..8de3d880a 100644 --- a/doc/src/snippets/coffee/BrewingForm.ui.qml +++ b/examples/demos/coffee/BrewingForm.ui.qml diff --git a/doc/src/snippets/coffee/ChoosingCoffee.ui.qml b/examples/demos/coffee/ChoosingCoffee.ui.qml index 8b9be8b92..8b9be8b92 100644 --- a/doc/src/snippets/coffee/ChoosingCoffee.ui.qml +++ b/examples/demos/coffee/ChoosingCoffee.ui.qml diff --git a/doc/src/snippets/coffee/CoffeeButton.qml b/examples/demos/coffee/CoffeeButton.qml index 35480a9c4..35480a9c4 100644 --- a/doc/src/snippets/coffee/CoffeeButton.qml +++ b/examples/demos/coffee/CoffeeButton.qml diff --git a/doc/src/snippets/coffee/Cup.qml b/examples/demos/coffee/Cup.qml index 08880c969..08880c969 100644 --- a/doc/src/snippets/coffee/Cup.qml +++ b/examples/demos/coffee/Cup.qml diff --git a/doc/src/snippets/coffee/CupForm.ui.qml b/examples/demos/coffee/CupForm.ui.qml index 6d01b3a3b..6d01b3a3b 100644 --- a/doc/src/snippets/coffee/CupForm.ui.qml +++ b/examples/demos/coffee/CupForm.ui.qml diff --git a/doc/src/snippets/coffee/EmptyCup.qml b/examples/demos/coffee/EmptyCup.qml index 3a74d27f6..3a74d27f6 100644 --- a/doc/src/snippets/coffee/EmptyCup.qml +++ b/examples/demos/coffee/EmptyCup.qml diff --git a/doc/src/snippets/coffee/EmptyCupForm.ui.qml b/examples/demos/coffee/EmptyCupForm.ui.qml index 3bdff6cdc..3bdff6cdc 100644 --- a/doc/src/snippets/coffee/EmptyCupForm.ui.qml +++ b/examples/demos/coffee/EmptyCupForm.ui.qml diff --git a/examples/demos/coffee/LICENSE.txt b/examples/demos/coffee/LICENSE.txt new file mode 100644 index 000000000..10ab55db6 --- /dev/null +++ b/examples/demos/coffee/LICENSE.txt @@ -0,0 +1,86 @@ +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/doc/src/snippets/coffee/NavigationButton.ui.qml b/examples/demos/coffee/NavigationButton.ui.qml index 66216e6fd..66216e6fd 100644 --- a/doc/src/snippets/coffee/NavigationButton.ui.qml +++ b/examples/demos/coffee/NavigationButton.ui.qml diff --git a/doc/src/snippets/coffee/SideBar.qml b/examples/demos/coffee/SideBar.qml index bd11f16bd..bd11f16bd 100644 --- a/doc/src/snippets/coffee/SideBar.qml +++ b/examples/demos/coffee/SideBar.qml diff --git a/doc/src/snippets/coffee/SideBarForm.ui.qml b/examples/demos/coffee/SideBarForm.ui.qml index adcf0cc1b..adcf0cc1b 100644 --- a/doc/src/snippets/coffee/SideBarForm.ui.qml +++ b/examples/demos/coffee/SideBarForm.ui.qml diff --git a/doc/src/snippets/coffee/coffee.pro b/examples/demos/coffee/coffee.pro index 0c9dce00b..0c9dce00b 100644 --- a/doc/src/snippets/coffee/coffee.pro +++ b/examples/demos/coffee/coffee.pro diff --git a/doc/src/snippets/coffee/coffee.qdoc b/examples/demos/coffee/coffee.qdoc index c274870ce..c274870ce 100644 --- a/doc/src/snippets/coffee/coffee.qdoc +++ b/examples/demos/coffee/coffee.qdoc diff --git a/doc/src/snippets/coffee/images/cup structure/coffee_cup_large.png b/examples/demos/coffee/images/cup structure/coffee_cup_large.png Binary files differindex e69889af5..e69889af5 100644 --- a/doc/src/snippets/coffee/images/cup structure/coffee_cup_large.png +++ b/examples/demos/coffee/images/cup structure/coffee_cup_large.png diff --git a/doc/src/snippets/coffee/images/cup structure/coffee_cup_outline.png b/examples/demos/coffee/images/cup structure/coffee_cup_outline.png Binary files differindex 941e0c145..941e0c145 100644 --- a/doc/src/snippets/coffee/images/cup structure/coffee_cup_outline.png +++ b/examples/demos/coffee/images/cup structure/coffee_cup_outline.png diff --git a/doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_back.png b/examples/demos/coffee/images/cup structure/cup elements/coffee_cup_back.png Binary files differindex 045732cab..045732cab 100644 --- a/doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_back.png +++ b/examples/demos/coffee/images/cup structure/cup elements/coffee_cup_back.png diff --git a/doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_coverplate.png b/examples/demos/coffee/images/cup structure/cup elements/coffee_cup_coverplate.png Binary files differindex 48041c539..48041c539 100644 --- a/doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_coverplate.png +++ b/examples/demos/coffee/images/cup structure/cup elements/coffee_cup_coverplate.png diff --git a/doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_front.png b/examples/demos/coffee/images/cup structure/cup elements/coffee_cup_front.png Binary files differindex e2c2a7743..e2c2a7743 100644 --- a/doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_front.png +++ b/examples/demos/coffee/images/cup structure/cup elements/coffee_cup_front.png diff --git a/doc/src/snippets/coffee/images/cup structure/liquids/liquid_coffee.png b/examples/demos/coffee/images/cup structure/liquids/liquid_coffee.png Binary files differindex 0fff3e39d..0fff3e39d 100644 --- a/doc/src/snippets/coffee/images/cup structure/liquids/liquid_coffee.png +++ b/examples/demos/coffee/images/cup structure/liquids/liquid_coffee.png diff --git a/doc/src/snippets/coffee/images/cup structure/liquids/liquid_foam.png b/examples/demos/coffee/images/cup structure/liquids/liquid_foam.png Binary files differindex d07496ce2..d07496ce2 100644 --- a/doc/src/snippets/coffee/images/cup structure/liquids/liquid_foam.png +++ b/examples/demos/coffee/images/cup structure/liquids/liquid_foam.png diff --git a/doc/src/snippets/coffee/images/cup structure/liquids/liquid_milk.png b/examples/demos/coffee/images/cup structure/liquids/liquid_milk.png Binary files differindex 3235b4d6b..3235b4d6b 100644 --- a/doc/src/snippets/coffee/images/cup structure/liquids/liquid_milk.png +++ b/examples/demos/coffee/images/cup structure/liquids/liquid_milk.png diff --git a/doc/src/snippets/coffee/images/icons/coffees/Americano.png b/examples/demos/coffee/images/icons/coffees/Americano.png Binary files differindex b1c0c384a..b1c0c384a 100644 --- a/doc/src/snippets/coffee/images/icons/coffees/Americano.png +++ b/examples/demos/coffee/images/icons/coffees/Americano.png diff --git a/doc/src/snippets/coffee/images/icons/coffees/Espresso.png b/examples/demos/coffee/images/icons/coffees/Espresso.png Binary files differindex faac7593c..faac7593c 100644 --- a/doc/src/snippets/coffee/images/icons/coffees/Espresso.png +++ b/examples/demos/coffee/images/icons/coffees/Espresso.png diff --git a/doc/src/snippets/coffee/images/icons/coffees/Latte.png b/examples/demos/coffee/images/icons/coffees/Latte.png Binary files differindex d9e4e6164..d9e4e6164 100644 --- a/doc/src/snippets/coffee/images/icons/coffees/Latte.png +++ b/examples/demos/coffee/images/icons/coffees/Latte.png diff --git a/doc/src/snippets/coffee/images/icons/coffees/Macchiato.png b/examples/demos/coffee/images/icons/coffees/Macchiato.png Binary files differindex fb7c1c91c..fb7c1c91c 100644 --- a/doc/src/snippets/coffee/images/icons/coffees/Macchiato.png +++ b/examples/demos/coffee/images/icons/coffees/Macchiato.png diff --git a/doc/src/snippets/coffee/images/icons/coffees/cappucino.png b/examples/demos/coffee/images/icons/coffees/cappucino.png Binary files differindex d5557e8da..d5557e8da 100644 --- a/doc/src/snippets/coffee/images/icons/coffees/cappucino.png +++ b/examples/demos/coffee/images/icons/coffees/cappucino.png diff --git a/doc/src/snippets/coffee/images/icons/contents/coffee.png b/examples/demos/coffee/images/icons/contents/coffee.png Binary files differindex c4b35be19..c4b35be19 100644 --- a/doc/src/snippets/coffee/images/icons/contents/coffee.png +++ b/examples/demos/coffee/images/icons/contents/coffee.png diff --git a/doc/src/snippets/coffee/images/icons/contents/milk.png b/examples/demos/coffee/images/icons/contents/milk.png Binary files differindex 19709cfed..19709cfed 100644 --- a/doc/src/snippets/coffee/images/icons/contents/milk.png +++ b/examples/demos/coffee/images/icons/contents/milk.png diff --git a/doc/src/snippets/coffee/images/icons/contents/sugar.png b/examples/demos/coffee/images/icons/contents/sugar.png Binary files differindex ac83a7f37..ac83a7f37 100644 --- a/doc/src/snippets/coffee/images/icons/contents/sugar.png +++ b/examples/demos/coffee/images/icons/contents/sugar.png diff --git a/doc/src/snippets/coffee/images/ui controls/buttons/back/white.png b/examples/demos/coffee/images/ui controls/buttons/back/white.png Binary files differindex 633f0f301..633f0f301 100644 --- a/doc/src/snippets/coffee/images/ui controls/buttons/back/white.png +++ b/examples/demos/coffee/images/ui controls/buttons/back/white.png diff --git a/doc/src/snippets/coffee/images/ui controls/buttons/go/white.png b/examples/demos/coffee/images/ui controls/buttons/go/white.png Binary files differindex 0172138d0..0172138d0 100644 --- a/doc/src/snippets/coffee/images/ui controls/buttons/go/white.png +++ b/examples/demos/coffee/images/ui controls/buttons/go/white.png diff --git a/doc/src/snippets/coffee/images/ui controls/line.png b/examples/demos/coffee/images/ui controls/line.png Binary files differindex bd4484ef8..bd4484ef8 100644 --- a/doc/src/snippets/coffee/images/ui controls/line.png +++ b/examples/demos/coffee/images/ui controls/line.png diff --git a/doc/src/snippets/coffee/imports/Coffee/Constants.qml b/examples/demos/coffee/imports/Coffee/Constants.qml index 8816a9f58..8816a9f58 100644 --- a/doc/src/snippets/coffee/imports/Coffee/Constants.qml +++ b/examples/demos/coffee/imports/Coffee/Constants.qml diff --git a/doc/src/snippets/coffee/imports/Coffee/TitilliumWeb-Regular.ttf b/examples/demos/coffee/imports/Coffee/TitilliumWeb-Regular.ttf Binary files differindex 6da821935..6da821935 100644 --- a/doc/src/snippets/coffee/imports/Coffee/TitilliumWeb-Regular.ttf +++ b/examples/demos/coffee/imports/Coffee/TitilliumWeb-Regular.ttf diff --git a/doc/src/snippets/coffee/imports/Coffee/qmldir b/examples/demos/coffee/imports/Coffee/qmldir index 616ac2035..616ac2035 100644 --- a/doc/src/snippets/coffee/imports/Coffee/qmldir +++ b/examples/demos/coffee/imports/Coffee/qmldir diff --git a/doc/src/snippets/coffee/main.cpp b/examples/demos/coffee/main.cpp index 40c7e7577..40c7e7577 100644 --- a/doc/src/snippets/coffee/main.cpp +++ b/examples/demos/coffee/main.cpp diff --git a/doc/src/snippets/coffee/main.qml b/examples/demos/coffee/main.qml index 14488156e..14488156e 100644 --- a/doc/src/snippets/coffee/main.qml +++ b/examples/demos/coffee/main.qml diff --git a/doc/src/snippets/coffee/qml.qrc b/examples/demos/coffee/qml.qrc index 2f8c143bd..2f8c143bd 100644 --- a/doc/src/snippets/coffee/qml.qrc +++ b/examples/demos/coffee/qml.qrc diff --git a/examples/demos/coffee/qt_attribution.json b/examples/demos/coffee/qt_attribution.json new file mode 100644 index 000000000..37e04600b --- /dev/null +++ b/examples/demos/coffee/qt_attribution.json @@ -0,0 +1,15 @@ +[ +{ + "Id": "coffeeexample-titillium", + "Name": "Titillium Web Font", + "QDocModule": "qtdoc", + "QtUsage": "Used in the Coffee Maker example.", + "QtParts": ["examples"], + "Files": "TitilliumWeb-Regular.ttf", + + "License": "SIL Open Font License 1.1", + "LicenseId": "OFL-1.1", + "LicenseFile": "LICENSE.txt", + "Copyright": "Copyright (c) 2009-2011 by Accademia di Belle Arti di Urbino and students of MA course of Visual design. Some rights reserved." +} +] diff --git a/doc/src/snippets/coffee/qtquickcontrols2.conf b/examples/demos/coffee/qtquickcontrols2.conf index e16b5bb52..e16b5bb52 100644 --- a/doc/src/snippets/coffee/qtquickcontrols2.conf +++ b/examples/demos/coffee/qtquickcontrols2.conf |