Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

3 files changed, 0 insertions, 31 deletions

diff --git a/doc/src/declarative/effects.qdoc b/doc/src/declarative/effects.qdoc
deleted file mode 100644
index 7879260..0000000
--- a/doc/src/declarative/effects.qdoc
+++ /dev/null
@@ -1,29 +0,0 @@
-/*! 
-\page effects.html
-\target qmleffects
-\title Visual Effects
-
-\section1 Basic Effects
-
-\list
-\o Scaling (\l Item \bold scale property)
-\o Opacity (\l Item \bold opacity property)
-\o Rotation (\l Item \bold rotation property)
-\o Affine Transforms (\l Squish)
-\endlist
-
-\section1 Advanced Effects
-
-These effects are currently only supported by the OpenGL canvas
-backend. Support for other backends may be added if the performance
-can be made acceptable.
-
-\list
-\o \l Shadow
-\o \l Blur
-\o \l Reflection
-\o \l Highlight
-\o \l Particles
-\endlist
-
-*/
diff --git a/doc/src/declarative/qmlreference.qdoc b/doc/src/declarative/qmlreference.qdoc
index cbd086c..da955dc 100644
--- a/doc/src/declarative/qmlreference.qdoc
+++ b/doc/src/declarative/qmlreference.qdoc
@@ -29,7 +29,6 @@
     \o \l {binding}{Data Binding}
     \o \l {anchor-layout}{Layout Anchors}
     \o \l {qmlanimation}{Animation}
-    \o \l {qmleffects}{Visual Effects}
     \o \l {components}{Components}
     \o \l {qmlmodules}{Modules}
     \o \l {qmlfocus}{Keyboard Focus}
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index c5d32fe..ccfe4a6 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -73,7 +73,6 @@
     \o \l {binding}{Data Binding}
     \o \l {anchor-layout}{Layout Anchors}
     \o \l {qmlanimation}{Animation}
-    \o \l {qmleffects}{Visual Effects}
     \o \l {qmlmodules}{Modules}
     \o \l {qmlfocus}{Keyboard Focus}
     \o \l {Extending types from QML}