From 640c5d8a992f4ac6f9068aea9ec51a99a40dfc16 Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Wed, 29 Jun 2011 12:15:06 +0200 Subject: Move the composition example in the docs. Change-Id: I63e906e78de75466b9c9bf99d553691c8335f9b2 Reviewed-on: http://codereview.qt.nokia.com/903 Reviewed-by: Qt Sanity Bot Reviewed-by: Kevin Wright --- doc/src/demos/composition.qdoc | 44 --------------------------------------- doc/src/examples/composition.qdoc | 44 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) delete mode 100644 doc/src/demos/composition.qdoc create mode 100644 doc/src/examples/composition.qdoc (limited to 'doc') diff --git a/doc/src/demos/composition.qdoc b/doc/src/demos/composition.qdoc deleted file mode 100644 index c2eadc7308..0000000000 --- a/doc/src/demos/composition.qdoc +++ /dev/null @@ -1,44 +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/composition - \title Composition Modes - - This demo shows some of the more advanced composition modes supported by Qt. - - \image composition-demo.png - - The two most common forms of composition are \bold{Source} and \bold{SourceOver}. - \bold{Source} is used to draw opaque objects onto a paint device. In this mode, - each pixel in the source replaces the corresponding pixel in the destination. - In \bold{SourceOver} composition mode, the source object is transparent and is - drawn on top of the destination. - - In addition to these standard modes, Qt defines the complete set of composition modes - as defined by X. Porter and Y. Duff. See the QPainter documentation for details. -*/ diff --git a/doc/src/examples/composition.qdoc b/doc/src/examples/composition.qdoc new file mode 100644 index 0000000000..53ca3dbf7a --- /dev/null +++ b/doc/src/examples/composition.qdoc @@ -0,0 +1,44 @@ +/**************************************************************************** +** +** 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 painting/composition + \title Composition Modes + + This demo shows some of the more advanced composition modes supported by Qt. + + \image composition-demo.png + + The two most common forms of composition are \bold{Source} and \bold{SourceOver}. + \bold{Source} is used to draw opaque objects onto a paint device. In this mode, + each pixel in the source replaces the corresponding pixel in the destination. + In \bold{SourceOver} composition mode, the source object is transparent and is + drawn on top of the destination. + + In addition to these standard modes, Qt defines the complete set of composition modes + as defined by X. Porter and Y. Duff. See the QPainter documentation for details. +*/ -- cgit v1.2.3