From 33e74809f5e4bf44a4f99959c291eb30b1f286de Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 11 Jul 2011 13:40:02 +0200 Subject: Merge demos and examples Change-Id: Iaa84519e5adaa7736b245c831c7cec7ff9453191 Reviewed-on: http://codereview.qt.nokia.com/1419 Reviewed-by: Qt Sanity Bot Reviewed-by: David Boddie --- doc/src/demos/desktopservices.qdoc | 33 --------------------------------- doc/src/demos/embeddedsvgviewer.qdoc | 33 --------------------------------- doc/src/demos/fluidlauncher.qdoc | 33 --------------------------------- doc/src/demos/weatherinfo.qdoc | 33 --------------------------------- doc/src/examples/desktopservices.qdoc | 33 +++++++++++++++++++++++++++++++++ doc/src/examples/embeddedsvgviewer.qdoc | 33 +++++++++++++++++++++++++++++++++ doc/src/examples/fluidlauncher.qdoc | 33 +++++++++++++++++++++++++++++++++ doc/src/examples/weatherinfo.qdoc | 33 +++++++++++++++++++++++++++++++++ 8 files changed, 132 insertions(+), 132 deletions(-) delete mode 100644 doc/src/demos/desktopservices.qdoc delete mode 100644 doc/src/demos/embeddedsvgviewer.qdoc delete mode 100644 doc/src/demos/fluidlauncher.qdoc delete mode 100644 doc/src/demos/weatherinfo.qdoc create mode 100644 doc/src/examples/desktopservices.qdoc create mode 100644 doc/src/examples/embeddedsvgviewer.qdoc create mode 100644 doc/src/examples/fluidlauncher.qdoc create mode 100644 doc/src/examples/weatherinfo.qdoc (limited to 'doc/src') diff --git a/doc/src/demos/desktopservices.qdoc b/doc/src/demos/desktopservices.qdoc deleted file mode 100644 index f1abed8..0000000 --- a/doc/src/demos/desktopservices.qdoc +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example demos/embedded/desktopservices - \title Embedded Desktop Services Demonstration - - \image embeddeddesktopservices-demo.png -*/ diff --git a/doc/src/demos/embeddedsvgviewer.qdoc b/doc/src/demos/embeddedsvgviewer.qdoc deleted file mode 100644 index 044923a..0000000 --- a/doc/src/demos/embeddedsvgviewer.qdoc +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example demos/embedded/embeddedsvgviewer - \title Embedded SVG Viewer Demonstration - - \image embeddedsvgviewer-demo.png -*/ diff --git a/doc/src/demos/fluidlauncher.qdoc b/doc/src/demos/fluidlauncher.qdoc deleted file mode 100644 index 42623e8..0000000 --- a/doc/src/demos/fluidlauncher.qdoc +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example demos/embedded/fluidlauncher - \title Fluid Launcher Demonstration - - \image fluidlauncher-demo.png -*/ diff --git a/doc/src/demos/weatherinfo.qdoc b/doc/src/demos/weatherinfo.qdoc deleted file mode 100644 index 1f8a3e8..0000000 --- a/doc/src/demos/weatherinfo.qdoc +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example demos/embedded/weatherinfo - \title Weather Info Demonstration - - \image weatherinfo-demo.png -*/ diff --git a/doc/src/examples/desktopservices.qdoc b/doc/src/examples/desktopservices.qdoc new file mode 100644 index 0000000..7def082 --- /dev/null +++ b/doc/src/examples/desktopservices.qdoc @@ -0,0 +1,33 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example embedded/desktopservices + \title Embedded Desktop Services + + \image embeddeddesktopservices-demo.png +*/ diff --git a/doc/src/examples/embeddedsvgviewer.qdoc b/doc/src/examples/embeddedsvgviewer.qdoc new file mode 100644 index 0000000..dc5890c --- /dev/null +++ b/doc/src/examples/embeddedsvgviewer.qdoc @@ -0,0 +1,33 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example embedded/embeddedsvgviewer + \title Embedded SVG Viewer + + \image embeddedsvgviewer-demo.png +*/ diff --git a/doc/src/examples/fluidlauncher.qdoc b/doc/src/examples/fluidlauncher.qdoc new file mode 100644 index 0000000..fdaeb1e --- /dev/null +++ b/doc/src/examples/fluidlauncher.qdoc @@ -0,0 +1,33 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example embedded/fluidlauncher + \title Fluid Launcher + + \image fluidlauncher-demo.png +*/ diff --git a/doc/src/examples/weatherinfo.qdoc b/doc/src/examples/weatherinfo.qdoc new file mode 100644 index 0000000..29a1682 --- /dev/null +++ b/doc/src/examples/weatherinfo.qdoc @@ -0,0 +1,33 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** GNU Free Documentation License +** 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms +** and conditions contained in a signed written agreement between you +** and Nokia. +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \example embedded/weatherinfo + \title Weather Info + + \image weatherinfo-demo.png +*/ -- cgit v1.2.1