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 similarity index 100% rename from doc/src/snippets/coffee/ApplicationFlow.qml rename to examples/demos/coffee/ApplicationFlow.qml diff --git a/doc/src/snippets/coffee/ApplicationFlowForm.ui.qml b/examples/demos/coffee/ApplicationFlowForm.ui.qml similarity index 100% rename from doc/src/snippets/coffee/ApplicationFlowForm.ui.qml rename to examples/demos/coffee/ApplicationFlowForm.ui.qml diff --git a/doc/src/snippets/coffee/Brewing.qml b/examples/demos/coffee/Brewing.qml similarity index 100% rename from doc/src/snippets/coffee/Brewing.qml rename to examples/demos/coffee/Brewing.qml diff --git a/doc/src/snippets/coffee/BrewingForm.ui.qml b/examples/demos/coffee/BrewingForm.ui.qml similarity index 100% rename from doc/src/snippets/coffee/BrewingForm.ui.qml rename to examples/demos/coffee/BrewingForm.ui.qml diff --git a/doc/src/snippets/coffee/ChoosingCoffee.ui.qml b/examples/demos/coffee/ChoosingCoffee.ui.qml similarity index 100% rename from doc/src/snippets/coffee/ChoosingCoffee.ui.qml rename to examples/demos/coffee/ChoosingCoffee.ui.qml diff --git a/doc/src/snippets/coffee/CoffeeButton.qml b/examples/demos/coffee/CoffeeButton.qml similarity index 100% rename from doc/src/snippets/coffee/CoffeeButton.qml rename to examples/demos/coffee/CoffeeButton.qml diff --git a/doc/src/snippets/coffee/Cup.qml b/examples/demos/coffee/Cup.qml similarity index 100% rename from doc/src/snippets/coffee/Cup.qml rename to examples/demos/coffee/Cup.qml diff --git a/doc/src/snippets/coffee/CupForm.ui.qml b/examples/demos/coffee/CupForm.ui.qml similarity index 100% rename from doc/src/snippets/coffee/CupForm.ui.qml rename to examples/demos/coffee/CupForm.ui.qml diff --git a/doc/src/snippets/coffee/EmptyCup.qml b/examples/demos/coffee/EmptyCup.qml similarity index 100% rename from doc/src/snippets/coffee/EmptyCup.qml rename to examples/demos/coffee/EmptyCup.qml diff --git a/doc/src/snippets/coffee/EmptyCupForm.ui.qml b/examples/demos/coffee/EmptyCupForm.ui.qml similarity index 100% rename from doc/src/snippets/coffee/EmptyCupForm.ui.qml rename to 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 similarity index 100% rename from doc/src/snippets/coffee/NavigationButton.ui.qml rename to examples/demos/coffee/NavigationButton.ui.qml diff --git a/doc/src/snippets/coffee/SideBar.qml b/examples/demos/coffee/SideBar.qml similarity index 100% rename from doc/src/snippets/coffee/SideBar.qml rename to examples/demos/coffee/SideBar.qml diff --git a/doc/src/snippets/coffee/SideBarForm.ui.qml b/examples/demos/coffee/SideBarForm.ui.qml similarity index 100% rename from doc/src/snippets/coffee/SideBarForm.ui.qml rename to examples/demos/coffee/SideBarForm.ui.qml diff --git a/doc/src/snippets/coffee/coffee.pro b/examples/demos/coffee/coffee.pro similarity index 100% rename from doc/src/snippets/coffee/coffee.pro rename to examples/demos/coffee/coffee.pro diff --git a/doc/src/snippets/coffee/coffee.qdoc b/examples/demos/coffee/coffee.qdoc similarity index 100% rename from doc/src/snippets/coffee/coffee.qdoc rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/cup structure/coffee_cup_large.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/cup structure/coffee_cup_outline.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_back.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_coverplate.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/cup structure/cup elements/coffee_cup_front.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/cup structure/liquids/liquid_coffee.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/cup structure/liquids/liquid_foam.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/cup structure/liquids/liquid_milk.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/icons/coffees/Americano.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/icons/coffees/Espresso.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/icons/coffees/Latte.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/icons/coffees/Macchiato.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/icons/coffees/cappucino.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/icons/contents/coffee.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/icons/contents/milk.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/icons/contents/sugar.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/ui controls/buttons/back/white.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/ui controls/buttons/go/white.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/images/ui controls/line.png rename to 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 similarity index 100% rename from doc/src/snippets/coffee/imports/Coffee/Constants.qml rename to 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 similarity index 100% rename from doc/src/snippets/coffee/imports/Coffee/TitilliumWeb-Regular.ttf rename to 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 similarity index 100% rename from doc/src/snippets/coffee/imports/Coffee/qmldir rename to examples/demos/coffee/imports/Coffee/qmldir diff --git a/doc/src/snippets/coffee/main.cpp b/examples/demos/coffee/main.cpp similarity index 100% rename from doc/src/snippets/coffee/main.cpp rename to examples/demos/coffee/main.cpp diff --git a/doc/src/snippets/coffee/main.qml b/examples/demos/coffee/main.qml similarity index 100% rename from doc/src/snippets/coffee/main.qml rename to examples/demos/coffee/main.qml diff --git a/doc/src/snippets/coffee/qml.qrc b/examples/demos/coffee/qml.qrc similarity index 100% rename from doc/src/snippets/coffee/qml.qrc rename to 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 similarity index 100% rename from doc/src/snippets/coffee/qtquickcontrols2.conf rename to examples/demos/coffee/qtquickcontrols2.conf