From 27d22c5f4201c7555b42e187252bee3fd88d3821 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 13 Jun 2013 15:13:32 +0200 Subject: Doc: Move Qt Quick 1 demos and their documentation When installing the examples, we currently end up with a QT_INSTALL_EXAMPLES/demos directory with nothing but documentation files. This change moves the docs and also the demos themselves into examples/declarative/demos. Also fixes the links in demo .qdoc files. Task-number: QTBUG-31722 Change-Id: Ied15526be1db8437e14be786ea69eae98af8dd3f Reviewed-by: Jerome Pasion --- .../demos/doc/images/qml-calculator-example.png | Bin 33892 -> 0 bytes examples/demos/doc/images/qml-minehunt-demo.png | Bin 170648 -> 0 bytes examples/demos/doc/images/qml-photoviewer-demo.png | Bin 473306 -> 0 bytes examples/demos/doc/images/qml-rssnews-demo.png | Bin 128307 -> 0 bytes examples/demos/doc/images/qml-samegame-demo.png | Bin 213137 -> 0 bytes examples/demos/doc/images/qml-snake-demo.png | Bin 105053 -> 0 bytes examples/demos/doc/images/qml-twitter-demo.png | Bin 95812 -> 0 bytes examples/demos/doc/src/qml-calculator.qdoc | 37 -------------------- examples/demos/doc/src/qml-minehunt.qdoc | 38 --------------------- examples/demos/doc/src/qml-photoviewer.qdoc | 37 -------------------- examples/demos/doc/src/qml-rssnews.qdoc | 37 -------------------- examples/demos/doc/src/qml-samegame.qdoc | 38 --------------------- examples/demos/doc/src/qml-snake.qdoc | 38 --------------------- examples/demos/doc/src/qml-twitter.qdoc | 38 --------------------- 14 files changed, 263 deletions(-) delete mode 100644 examples/demos/doc/images/qml-calculator-example.png delete mode 100644 examples/demos/doc/images/qml-minehunt-demo.png delete mode 100644 examples/demos/doc/images/qml-photoviewer-demo.png delete mode 100644 examples/demos/doc/images/qml-rssnews-demo.png delete mode 100644 examples/demos/doc/images/qml-samegame-demo.png delete mode 100644 examples/demos/doc/images/qml-snake-demo.png delete mode 100644 examples/demos/doc/images/qml-twitter-demo.png delete mode 100644 examples/demos/doc/src/qml-calculator.qdoc delete mode 100644 examples/demos/doc/src/qml-minehunt.qdoc delete mode 100644 examples/demos/doc/src/qml-photoviewer.qdoc delete mode 100644 examples/demos/doc/src/qml-rssnews.qdoc delete mode 100644 examples/demos/doc/src/qml-samegame.qdoc delete mode 100644 examples/demos/doc/src/qml-snake.qdoc delete mode 100644 examples/demos/doc/src/qml-twitter.qdoc (limited to 'examples/demos') diff --git a/examples/demos/doc/images/qml-calculator-example.png b/examples/demos/doc/images/qml-calculator-example.png deleted file mode 100644 index 0f9ced80..00000000 Binary files a/examples/demos/doc/images/qml-calculator-example.png and /dev/null differ diff --git a/examples/demos/doc/images/qml-minehunt-demo.png b/examples/demos/doc/images/qml-minehunt-demo.png deleted file mode 100644 index 3b695693..00000000 Binary files a/examples/demos/doc/images/qml-minehunt-demo.png and /dev/null differ diff --git a/examples/demos/doc/images/qml-photoviewer-demo.png b/examples/demos/doc/images/qml-photoviewer-demo.png deleted file mode 100644 index be6f1bf1..00000000 Binary files a/examples/demos/doc/images/qml-photoviewer-demo.png and /dev/null differ diff --git a/examples/demos/doc/images/qml-rssnews-demo.png b/examples/demos/doc/images/qml-rssnews-demo.png deleted file mode 100644 index b4143b46..00000000 Binary files a/examples/demos/doc/images/qml-rssnews-demo.png and /dev/null differ diff --git a/examples/demos/doc/images/qml-samegame-demo.png b/examples/demos/doc/images/qml-samegame-demo.png deleted file mode 100644 index 945f2b96..00000000 Binary files a/examples/demos/doc/images/qml-samegame-demo.png and /dev/null differ diff --git a/examples/demos/doc/images/qml-snake-demo.png b/examples/demos/doc/images/qml-snake-demo.png deleted file mode 100644 index d3c077d1..00000000 Binary files a/examples/demos/doc/images/qml-snake-demo.png and /dev/null differ diff --git a/examples/demos/doc/images/qml-twitter-demo.png b/examples/demos/doc/images/qml-twitter-demo.png deleted file mode 100644 index 63d6486a..00000000 Binary files a/examples/demos/doc/images/qml-twitter-demo.png and /dev/null differ diff --git a/examples/demos/doc/src/qml-calculator.qdoc b/examples/demos/doc/src/qml-calculator.qdoc deleted file mode 100644 index 5a12038f..00000000 --- a/examples/demos/doc/src/qml-calculator.qdoc +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \title Calculator - \example declarative/calculator - \brief Shows how to write a calculator in QML - \ingroup qmldemos - - This example shows how to write a simple calculator application in QML and JavaScript. - - \image qml-calculator-example.png -*/ diff --git a/examples/demos/doc/src/qml-minehunt.qdoc b/examples/demos/doc/src/qml-minehunt.qdoc deleted file mode 100644 index ba9c6616..00000000 --- a/examples/demos/doc/src/qml-minehunt.qdoc +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \title Minehunt - \example declarative/minehunt - \brief Shows how to write a Minehunt game in QML - \ingroup qmldemos - - This example shows how to create a simple Minehunt game, using QML for the - UI and C++ for the game logic. - - \image qml-minehunt-demo.png -*/ diff --git a/examples/demos/doc/src/qml-photoviewer.qdoc b/examples/demos/doc/src/qml-photoviewer.qdoc deleted file mode 100644 index 57062bcf..00000000 --- a/examples/demos/doc/src/qml-photoviewer.qdoc +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \title Photo Viewer - \example declarative/photoviewer - \brief Shows how to write a Flickr photo viewer in QML - \ingroup qmldemos - - This example shows how to write a Flickr photo viewer application in QML. - - \image qml-photoviewer-demo.png -*/ diff --git a/examples/demos/doc/src/qml-rssnews.qdoc b/examples/demos/doc/src/qml-rssnews.qdoc deleted file mode 100644 index 25577769..00000000 --- a/examples/demos/doc/src/qml-rssnews.qdoc +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \title RSS News - \example declarative/rssnews - \brief Shows how to write an RSS news reader in QML - \ingroup qmldemos - - This example shows how to write an RSS news reader in QML. - - \image qml-rssnews-demo.png -*/ diff --git a/examples/demos/doc/src/qml-samegame.qdoc b/examples/demos/doc/src/qml-samegame.qdoc deleted file mode 100644 index 5b256e56..00000000 --- a/examples/demos/doc/src/qml-samegame.qdoc +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \title Same Game - \example declarative/samegame - \brief Shows how to write a Same Game in QML - \ingroup qmldemos - - This example shows how to write a 'Same Game' game in QML, using Javascript - for all the game logic. - - \image qml-samegame-demo.png -*/ diff --git a/examples/demos/doc/src/qml-snake.qdoc b/examples/demos/doc/src/qml-snake.qdoc deleted file mode 100644 index d1d38bd5..00000000 --- a/examples/demos/doc/src/qml-snake.qdoc +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \title Snake - \example declarative/snake - \brief Shows how to write a Snake game in QML - \ingroup qmldemos - - This example shows how to write a Snake game in QML, controlled by the - keyboard as well as the mouse. - - \image qml-snake-demo.png -*/ diff --git a/examples/demos/doc/src/qml-twitter.qdoc b/examples/demos/doc/src/qml-twitter.qdoc deleted file mode 100644 index d81f41ac..00000000 --- a/examples/demos/doc/src/qml-twitter.qdoc +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \title Twitter Mobile - \example declarative/twitter - \brief Shows how to write a Twitter client in QML - \ingroup qmldemos - - This example shows how to write a mobile Twitter search client in QML. Use it to - see what people think about Qt Quick! - - \image qml-twitter-demo.png -*/ -- cgit v1.2.3