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

Conflicts:
	src/gui/graphicsview/qgraphicsitem.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h

44 files changed, 1401 insertions, 0 deletions

diff --git a/examples/effects/blurpicker/blureffect.cpp b/examples/effects/blurpicker/blureffect.cpp
new file mode 100644
index 0000000..82be44f
--- /dev/null
+++ b/examples/effects/blurpicker/blureffect.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "blureffect.h"
+
+#include <QDebug>
+
+BlurEffect::BlurEffect(QGraphicsItem *item)
+    : QGraphicsBlurEffect()
+    , m_baseLine(200), item(item)
+{
+}
+
+void BlurEffect::adjustForItem()
+{
+    qreal y = m_baseLine - item->pos().y();
+    qreal radius = qBound(0.0, y / 32, 16.0);
+    setBlurRadius(radius);
+}
+
+QRectF BlurEffect::boundingRect() const
+{
+    const_cast<BlurEffect *>(this)->adjustForItem();
+    return QGraphicsBlurEffect::boundingRect();
+}
+
+void BlurEffect::draw(QPainter *painter, QGraphicsEffectSource *source)
+{
+    adjustForItem();
+    QGraphicsBlurEffect::draw(painter, source);
+}
diff --git a/examples/effects/blurpicker/blureffect.h b/examples/effects/blurpicker/blureffect.h
new file mode 100644
index 0000000..89694b6
--- /dev/null
+++ b/examples/effects/blurpicker/blureffect.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BLUREFFECT_H
+#define BLUREFFECT_H
+
+#include <QGraphicsEffect>
+#include <QGraphicsItem>
+
+class BlurEffect: public QGraphicsBlurEffect
+{
+public:
+    BlurEffect(QGraphicsItem *item);
+
+    void setBaseLine(qreal y) { m_baseLine = y; }
+
+    QRectF boundingRect() const;
+
+    void draw(QPainter *painter, QGraphicsEffectSource *source);
+
+private:
+    void adjustForItem();
+
+private:
+    qreal m_baseLine;
+    QGraphicsItem *item;
+};
+
+#endif // BLUREFFECT_H
diff --git a/examples/effects/blurpicker/blurpicker.cpp b/examples/effects/blurpicker/blurpicker.cpp
new file mode 100644
index 0000000..9904dfa
--- /dev/null
+++ b/examples/effects/blurpicker/blurpicker.cpp
@@ -0,0 +1,132 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "blurpicker.h"
+
+#include <QtGui>
+
+#include "blureffect.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+BlurPicker::BlurPicker(QWidget *parent): QGraphicsView(parent), m_index(0.0)
+{
+    setBackgroundBrush(QPixmap(":/images/background.jpg"));
+    setScene(&m_scene);
+
+    setupScene();
+    updateIconPositions();
+
+    connect(&m_timeLine, SIGNAL(valueChanged(qreal)), SLOT(updateIconPositions()));
+    m_timeLine.setDuration(400);
+
+    setRenderHint(QPainter::Antialiasing, true);
+    setFrameStyle(QFrame::NoFrame);
+}
+
+void BlurPicker::updateIconPositions()
+{
+    m_index = m_timeLine.currentFrame() / 1000.0;
+
+    qreal baseline = 0;
+    for (int i = 0; i < m_icons.count(); ++i) {
+        QGraphicsItem *icon = m_icons[i];
+        qreal a = ((i + m_index) * 2 * M_PI) / m_icons.count();
+        qreal xs = 170 * sin(a);
+        qreal ys = 100 * cos(a);
+        QPointF pos(xs, ys);
+        pos = QTransform().rotate(-20).map(pos);
+        pos -= QPointF(40, 40);
+        icon->setPos(pos);
+        baseline = qMax(baseline, ys);
+        static_cast<BlurEffect *>(icon->graphicsEffect())->setBaseLine(baseline);
+    }
+
+    m_scene.update();
+}
+
+void BlurPicker::setupScene()
+{
+    m_scene.setSceneRect(-200, -120, 400, 240);
+
+    QStringList names;
+    names << ":/images/accessories-calculator.png";
+    names << ":/images/accessories-text-editor.png";
+    names << ":/images/help-browser.png";
+    names << ":/images/internet-group-chat.png";
+    names << ":/images/internet-mail.png";
+    names << ":/images/internet-web-browser.png";
+    names << ":/images/office-calendar.png";
+    names << ":/images/system-users.png";
+
+    for (int i = 0; i < names.count(); i++) {
+        QPixmap pixmap(names[i]);
+        QGraphicsPixmapItem *icon = m_scene.addPixmap(pixmap);
+        icon->setZValue(1);
+        icon->setGraphicsEffect(new BlurEffect(icon));
+        m_icons << icon;
+    }
+
+    QGraphicsPixmapItem *bg = m_scene.addPixmap(QPixmap(":/images/background.jpg"));
+    bg->setZValue(0);
+    bg->setPos(-200, -150);
+}
+
+void BlurPicker::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Left) {
+        if (m_timeLine.state() == QTimeLine::NotRunning) {
+            m_timeLine.setFrameRange(m_index * 1000, m_index * 1000 - 1000);
+            m_timeLine.start();
+            event->accept();
+        }
+    }
+
+    if (event->key() == Qt::Key_Right) {
+        if (m_timeLine.state() == QTimeLine::NotRunning) {
+            m_timeLine.setFrameRange(m_index * 1000, m_index * 1000 + 1000);
+            m_timeLine.start();
+            event->accept();
+        }
+    }
+}
diff --git a/examples/effects/blurpicker/blurpicker.h b/examples/effects/blurpicker/blurpicker.h
new file mode 100644
index 0000000..b7ea3b4
--- /dev/null
+++ b/examples/effects/blurpicker/blurpicker.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BLURPICKER_H
+#define BLURPICKER_H
+
+#include <QGraphicsEffect>
+#include <QGraphicsView>
+#include <QTimeLine>
+
+#include "blureffect.h"
+
+class BlurPicker: public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    BlurPicker(QWidget *parent = 0);
+
+protected:
+    void keyPressEvent(QKeyEvent *event);
+
+private slots:
+    void updateIconPositions();
+
+private:
+    void setupScene();
+
+private:
+    qreal m_index;
+    QGraphicsScene m_scene;
+    QList<QGraphicsItem*> m_icons;
+    QTimeLine m_timeLine;
+};
+
+#endif // BLURPICKER_H
diff --git a/examples/effects/blurpicker/blurpicker.pro b/examples/effects/blurpicker/blurpicker.pro
new file mode 100644
index 0000000..76537a9
--- /dev/null
+++ b/examples/effects/blurpicker/blurpicker.pro
@@ -0,0 +1,9 @@
+SOURCES += main.cpp blurpicker.cpp blureffect.cpp
+HEADERS += blurpicker.h blureffect.h
+RESOURCES += blurpicker.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/effects/blurpicker
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blurpicker.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/effects/blurpicker
+INSTALLS += target sources
diff --git a/examples/effects/blurpicker/blurpicker.qrc b/examples/effects/blurpicker/blurpicker.qrc
new file mode 100644
index 0000000..e88eaca
--- /dev/null
+++ b/examples/effects/blurpicker/blurpicker.qrc
@@ -0,0 +1,14 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>images/background.jpg</file>
+        <file>images/accessories-calculator.png</file>
+        <file>images/accessories-text-editor.png</file>
+        <file>images/help-browser.png</file>
+        <file>images/internet-group-chat.png</file>
+        <file>images/internet-mail.png</file>
+        <file>images/internet-web-browser.png</file>
+        <file>images/office-calendar.png</file>
+        <file>images/system-users.png</file>
+    </qresource>
+</RCC>
+
diff --git a/examples/effects/blurpicker/images/README.txt b/examples/effects/blurpicker/images/README.txt
new file mode 100644
index 0000000..0927e17
--- /dev/null
+++ b/examples/effects/blurpicker/images/README.txt
@@ -0,0 +1,5 @@
+The background is taken from a public domain photo at:
+http://www.photos8.com/view/computer_board2-800x600.html
+
+All other icons are from the Tango Desktop project:
+http://tango.freedesktop.org/Tango_Desktop_Project
diff --git a/examples/effects/blurpicker/images/accessories-calculator.png b/examples/effects/blurpicker/images/accessories-calculator.png
new file mode 100644
index 0000000..4e7661f
--- /dev/null
+++ b/examples/effects/blurpicker/images/accessories-calculator.png
diff --git a/examples/effects/blurpicker/images/accessories-text-editor.png b/examples/effects/blurpicker/images/accessories-text-editor.png
new file mode 100644
index 0000000..33bef0b
--- /dev/null
+++ b/examples/effects/blurpicker/images/accessories-text-editor.png
diff --git a/examples/effects/blurpicker/images/background.jpg b/examples/effects/blurpicker/images/background.jpg
new file mode 100644
index 0000000..e75b388
--- /dev/null
+++ b/examples/effects/blurpicker/images/background.jpg
diff --git a/examples/effects/blurpicker/images/help-browser.png b/examples/effects/blurpicker/images/help-browser.png
new file mode 100644
index 0000000..8ef4fae
--- /dev/null
+++ b/examples/effects/blurpicker/images/help-browser.png
diff --git a/examples/effects/blurpicker/images/internet-group-chat.png b/examples/effects/blurpicker/images/internet-group-chat.png
new file mode 100644
index 0000000..dd92d93
--- /dev/null
+++ b/examples/effects/blurpicker/images/internet-group-chat.png
diff --git a/examples/effects/blurpicker/images/internet-mail.png b/examples/effects/blurpicker/images/internet-mail.png
new file mode 100644
index 0000000..7e6b93b
--- /dev/null
+++ b/examples/effects/blurpicker/images/internet-mail.png
diff --git a/examples/effects/blurpicker/images/internet-web-browser.png b/examples/effects/blurpicker/images/internet-web-browser.png
new file mode 100644
index 0000000..a979a92
--- /dev/null
+++ b/examples/effects/blurpicker/images/internet-web-browser.png
diff --git a/examples/effects/blurpicker/images/office-calendar.png b/examples/effects/blurpicker/images/office-calendar.png
new file mode 100644
index 0000000..e095906
--- /dev/null
+++ b/examples/effects/blurpicker/images/office-calendar.png
diff --git a/examples/effects/blurpicker/images/system-users.png b/examples/effects/blurpicker/images/system-users.png
new file mode 100644
index 0000000..a7f630a
--- /dev/null
+++ b/examples/effects/blurpicker/images/system-users.png
diff --git a/examples/effects/blurpicker/main.cpp b/examples/effects/blurpicker/main.cpp
new file mode 100644
index 0000000..b88a51d
--- /dev/null
+++ b/examples/effects/blurpicker/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "blurpicker.h"
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    BlurPicker blurPicker;
+    blurPicker.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Application Picker"));
+    blurPicker.setFixedSize(400, 300);
+    blurPicker.show();
+
+    return app.exec();
+}
diff --git a/examples/effects/customshader/blureffect.cpp b/examples/effects/customshader/blureffect.cpp
new file mode 100644
index 0000000..2b5237b
--- /dev/null
+++ b/examples/effects/customshader/blureffect.cpp
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "blureffect.h"
+
+#include <QDebug>
+
+BlurEffect::BlurEffect(QGraphicsItem *item)
+    : QGraphicsBlurEffect()
+    , m_baseLine(200), item(item)
+{
+}
+
+void BlurEffect::adjustForItem()
+{
+    qreal y = m_baseLine - item->pos().y();
+    qreal radius = qBound(0.0, y / 32, 16.0);
+    setBlurRadius(radius);
+}
+
+QRectF BlurEffect::boundingRectFor(const QRectF &rect) const
+{
+    const_cast<BlurEffect *>(this)->adjustForItem();
+    return QGraphicsBlurEffect::boundingRectFor(rect);
+}
+
+void BlurEffect::draw(QPainter *painter, QGraphicsEffectSource *source)
+{
+    adjustForItem();
+    QGraphicsBlurEffect::draw(painter, source);
+}
diff --git a/examples/effects/customshader/blureffect.h b/examples/effects/customshader/blureffect.h
new file mode 100644
index 0000000..bf72226
--- /dev/null
+++ b/examples/effects/customshader/blureffect.h
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BLUREFFECT_H
+#define BLUREFFECT_H
+
+#include <QGraphicsEffect>
+#include <QGraphicsItem>
+
+class BlurEffect: public QGraphicsBlurEffect
+{
+public:
+    BlurEffect(QGraphicsItem *item);
+
+    void setBaseLine(qreal y) { m_baseLine = y; }
+
+    QRectF boundingRectFor(const QRectF &) const;
+
+    void draw(QPainter *painter, QGraphicsEffectSource*);
+
+private:
+    void adjustForItem();
+
+private:
+    qreal m_baseLine;
+    QGraphicsItem *item;
+};
+
+#endif // BLUREFFECT_H
diff --git a/examples/effects/customshader/blurpicker.cpp b/examples/effects/customshader/blurpicker.cpp
new file mode 100644
index 0000000..de80312
--- /dev/null
+++ b/examples/effects/customshader/blurpicker.cpp
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "blurpicker.h"
+
+#include <QtGui>
+
+#include "blureffect.h"
+#include "customshadereffect.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+BlurPicker::BlurPicker(QWidget *parent): QGraphicsView(parent), m_index(0.0)
+{
+    setBackgroundBrush(QPixmap(":/images/background.jpg"));
+    setScene(&m_scene);
+
+    setupScene();
+    updateIconPositions();
+
+    connect(&m_timeLine, SIGNAL(valueChanged(qreal)), SLOT(updateIconPositions()));
+    m_timeLine.setDuration(400);
+
+    setRenderHint(QPainter::Antialiasing, true);
+    setFrameStyle(QFrame::NoFrame);
+}
+
+void BlurPicker::updateIconPositions()
+{
+    m_index = m_timeLine.currentFrame() / 1000.0;
+
+    qreal baseline = 0;
+    for (int i = 0; i < m_icons.count(); ++i) {
+        QGraphicsItem *icon = m_icons[i];
+        qreal a = ((i + m_index) * 2 * M_PI) / m_icons.count();
+        qreal xs = 170 * sin(a);
+        qreal ys = 100 * cos(a);
+        QPointF pos(xs, ys);
+        pos = QTransform().rotate(-20).map(pos);
+        pos -= QPointF(40, 40);
+        icon->setPos(pos);
+        baseline = qMax(baseline, ys);
+        if (i != 3)
+            static_cast<BlurEffect *>(icon->graphicsEffect())->setBaseLine(baseline);
+    }
+
+    m_scene.update();
+}
+
+void BlurPicker::setupScene()
+{
+    m_scene.setSceneRect(-200, -120, 400, 240);
+
+    QStringList names;
+    names << ":/images/accessories-calculator.png";
+    names << ":/images/accessories-text-editor.png";
+    names << ":/images/help-browser.png";
+    names << ":/images/internet-group-chat.png";
+    names << ":/images/internet-mail.png";
+    names << ":/images/internet-web-browser.png";
+    names << ":/images/office-calendar.png";
+    names << ":/images/system-users.png";
+
+    for (int i = 0; i < names.count(); i++) {
+        QPixmap pixmap(names[i]);
+        QGraphicsPixmapItem *icon = m_scene.addPixmap(pixmap);
+        icon->setZValue(1);
+        if (i == 3)
+            icon->setGraphicsEffect(new CustomShaderEffect());
+        else
+            icon->setGraphicsEffect(new BlurEffect(icon));
+        m_icons << icon;
+    }
+
+    QGraphicsPixmapItem *bg = m_scene.addPixmap(QPixmap(":/images/background.jpg"));
+    bg->setZValue(0);
+    bg->setPos(-200, -150);
+}
+
+void BlurPicker::keyPressEvent(QKeyEvent *event)
+{
+    if (event->key() == Qt::Key_Left) {
+        if (m_timeLine.state() == QTimeLine::NotRunning) {
+            m_timeLine.setFrameRange(m_index * 1000, m_index * 1000 - 1000);
+            m_timeLine.start();
+            event->accept();
+        }
+    }
+
+    if (event->key() == Qt::Key_Right) {
+        if (m_timeLine.state() == QTimeLine::NotRunning) {
+            m_timeLine.setFrameRange(m_index * 1000, m_index * 1000 + 1000);
+            m_timeLine.start();
+            event->accept();
+        }
+    }
+}
diff --git a/examples/effects/customshader/blurpicker.h b/examples/effects/customshader/blurpicker.h
new file mode 100644
index 0000000..b7ea3b4
--- /dev/null
+++ b/examples/effects/customshader/blurpicker.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef BLURPICKER_H
+#define BLURPICKER_H
+
+#include <QGraphicsEffect>
+#include <QGraphicsView>
+#include <QTimeLine>
+
+#include "blureffect.h"
+
+class BlurPicker: public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    BlurPicker(QWidget *parent = 0);
+
+protected:
+    void keyPressEvent(QKeyEvent *event);
+
+private slots:
+    void updateIconPositions();
+
+private:
+    void setupScene();
+
+private:
+    qreal m_index;
+    QGraphicsScene m_scene;
+    QList<QGraphicsItem*> m_icons;
+    QTimeLine m_timeLine;
+};
+
+#endif // BLURPICKER_H
diff --git a/examples/effects/customshader/blurpicker.qrc b/examples/effects/customshader/blurpicker.qrc
new file mode 100644
index 0000000..e88eaca
--- /dev/null
+++ b/examples/effects/customshader/blurpicker.qrc
@@ -0,0 +1,14 @@
+<RCC>
+    <qresource prefix="/" >
+        <file>images/background.jpg</file>
+        <file>images/accessories-calculator.png</file>
+        <file>images/accessories-text-editor.png</file>
+        <file>images/help-browser.png</file>
+        <file>images/internet-group-chat.png</file>
+        <file>images/internet-mail.png</file>
+        <file>images/internet-web-browser.png</file>
+        <file>images/office-calendar.png</file>
+        <file>images/system-users.png</file>
+    </qresource>
+</RCC>
+
diff --git a/examples/effects/customshader/customshader.pro b/examples/effects/customshader/customshader.pro
new file mode 100644
index 0000000..4ce5d2b
--- /dev/null
+++ b/examples/effects/customshader/customshader.pro
@@ -0,0 +1,10 @@
+SOURCES += main.cpp blurpicker.cpp blureffect.cpp customshadereffect.cpp
+HEADERS += blurpicker.h blureffect.h customshadereffect.h
+RESOURCES += blurpicker.qrc
+QT += opengl
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/effects/customshader
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customshader.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/effects/customshader
+INSTALLS += target sources
diff --git a/examples/effects/customshader/customshadereffect.cpp b/examples/effects/customshader/customshadereffect.cpp
new file mode 100644
index 0000000..293123c
--- /dev/null
+++ b/examples/effects/customshader/customshadereffect.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "customshadereffect.h"
+#include <QGLShaderProgram>
+
+static char const colorizeShaderCode[] =
+    "varying highp vec2 textureCoords;\n"
+    "uniform sampler2D imageTexture;\n"
+    "uniform lowp vec4 effectColor;\n"
+    "lowp vec4 srcPixel() {\n"
+    "    vec4 src = texture2D(imageTexture, textureCoords);\n"
+    "    float gray = dot(src.rgb, vec3(0.212671, 0.715160, 0.072169));\n"
+    "    vec4 colorize = 1.0-((1.0-gray)*(1.0-effectColor));\n"
+    "    return vec4(colorize.rgb, src.a);\n"
+    "}";
+
+CustomShaderEffect::CustomShaderEffect()
+    : QGraphicsShaderEffect(),
+      color(Qt::red)
+{
+    setPixelShaderFragment(colorizeShaderCode);
+}
+
+void CustomShaderEffect::setEffectColor(const QColor& c)
+{
+    color = c;
+    setUniformsDirty();
+}
+
+void CustomShaderEffect::setUniforms(QGLShaderProgram *program)
+{
+    program->setUniformValue("effectColor", color);
+}
diff --git a/examples/effects/customshader/customshadereffect.h b/examples/effects/customshader/customshadereffect.h
new file mode 100644
index 0000000..6482bd5
--- /dev/null
+++ b/examples/effects/customshader/customshadereffect.h
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CUSTOMSHADEREFFECT_H
+#define CUSTOMSHADEREFFECT_H
+
+#include <QGraphicsEffect>
+#include <QGraphicsShaderEffect>
+#include <QGraphicsItem>
+
+class CustomShaderEffect: public QGraphicsShaderEffect
+{
+public:
+    CustomShaderEffect();
+
+    QColor effectColor() const { return color; }
+    void setEffectColor(const QColor& c);
+
+protected:
+    void setUniforms(QGLShaderProgram *program);
+
+private:
+    QColor color;
+};
+
+#endif // CUSTOMSHADEREFFECT_H
diff --git a/examples/effects/customshader/images/README.txt b/examples/effects/customshader/images/README.txt
new file mode 100644
index 0000000..0927e17
--- /dev/null
+++ b/examples/effects/customshader/images/README.txt
@@ -0,0 +1,5 @@
+The background is taken from a public domain photo at:
+http://www.photos8.com/view/computer_board2-800x600.html
+
+All other icons are from the Tango Desktop project:
+http://tango.freedesktop.org/Tango_Desktop_Project
diff --git a/examples/effects/customshader/images/accessories-calculator.png b/examples/effects/customshader/images/accessories-calculator.png
new file mode 100644
index 0000000..4e7661f
--- /dev/null
+++ b/examples/effects/customshader/images/accessories-calculator.png
diff --git a/examples/effects/customshader/images/accessories-text-editor.png b/examples/effects/customshader/images/accessories-text-editor.png
new file mode 100644
index 0000000..33bef0b
--- /dev/null
+++ b/examples/effects/customshader/images/accessories-text-editor.png
diff --git a/examples/effects/customshader/images/background.jpg b/examples/effects/customshader/images/background.jpg
new file mode 100644
index 0000000..e75b388
--- /dev/null
+++ b/examples/effects/customshader/images/background.jpg
diff --git a/examples/effects/customshader/images/help-browser.png b/examples/effects/customshader/images/help-browser.png
new file mode 100644
index 0000000..8ef4fae
--- /dev/null
+++ b/examples/effects/customshader/images/help-browser.png
diff --git a/examples/effects/customshader/images/internet-group-chat.png b/examples/effects/customshader/images/internet-group-chat.png
new file mode 100644
index 0000000..dd92d93
--- /dev/null
+++ b/examples/effects/customshader/images/internet-group-chat.png
diff --git a/examples/effects/customshader/images/internet-mail.png b/examples/effects/customshader/images/internet-mail.png
new file mode 100644
index 0000000..7e6b93b
--- /dev/null
+++ b/examples/effects/customshader/images/internet-mail.png
diff --git a/examples/effects/customshader/images/internet-web-browser.png b/examples/effects/customshader/images/internet-web-browser.png
new file mode 100644
index 0000000..a979a92
--- /dev/null
+++ b/examples/effects/customshader/images/internet-web-browser.png
diff --git a/examples/effects/customshader/images/office-calendar.png b/examples/effects/customshader/images/office-calendar.png
new file mode 100644
index 0000000..e095906
--- /dev/null
+++ b/examples/effects/customshader/images/office-calendar.png
diff --git a/examples/effects/customshader/images/system-users.png b/examples/effects/customshader/images/system-users.png
new file mode 100644
index 0000000..a7f630a
--- /dev/null
+++ b/examples/effects/customshader/images/system-users.png
diff --git a/examples/effects/customshader/main.cpp b/examples/effects/customshader/main.cpp
new file mode 100644
index 0000000..b88a51d
--- /dev/null
+++ b/examples/effects/customshader/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "blurpicker.h"
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    BlurPicker blurPicker;
+    blurPicker.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Application Picker"));
+    blurPicker.setFixedSize(400, 300);
+    blurPicker.show();
+
+    return app.exec();
+}
diff --git a/examples/effects/effects.pro b/examples/effects/effects.pro
new file mode 100644
index 0000000..60b5baf
--- /dev/null
+++ b/examples/effects/effects.pro
@@ -0,0 +1,14 @@
+TEMPLATE      = \
+              subdirs
+SUBDIRS       = \
+              blurpicker \
+              lighting
+
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles2):SUBDIRS += customshader
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/effects
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS effects.pro README
+sources.path = $$[QT_INSTALL_EXAMPLES]/effects
+INSTALLS += target sources
+
diff --git a/examples/effects/lighting/lighting.cpp b/examples/effects/lighting/lighting.cpp
new file mode 100644
index 0000000..63f0a6c
--- /dev/null
+++ b/examples/effects/lighting/lighting.cpp
@@ -0,0 +1,119 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "lighting.h"
+
+#include <QtGui>
+
+#include "shadoweffect.h"
+
+#ifndef M_PI
+#define M_PI 3.14159265358979323846
+#endif
+
+Lighting::Lighting(QWidget *parent): QGraphicsView(parent), angle(0.0)
+{
+    setScene(&m_scene);
+
+    setupScene();
+
+    QTimer *timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), SLOT(animate()));
+    timer->setInterval(30);
+    timer->start();
+
+    setRenderHint(QPainter::Antialiasing, true);
+    setFrameStyle(QFrame::NoFrame);
+}
+
+void Lighting::setupScene()
+{
+    m_scene.setSceneRect(-300, -200, 600, 460);
+
+    QLinearGradient linearGrad(QPointF(-100, -100), QPointF(100, 100));
+    linearGrad.setColorAt(0, QColor(255, 255, 255));
+    linearGrad.setColorAt(1, QColor(192, 192, 255));
+    setBackgroundBrush(linearGrad);
+
+    QRadialGradient radialGrad(30, 30, 30);
+    radialGrad.setColorAt(0, Qt::yellow);
+    radialGrad.setColorAt(0.2, Qt::yellow);
+    radialGrad.setColorAt(1, Qt::transparent);
+    QPixmap pixmap(60, 60);
+    pixmap.fill(Qt::transparent);
+    QPainter painter(&pixmap);
+    painter.setPen(Qt::NoPen);
+    painter.setBrush(radialGrad);
+    painter.drawEllipse(0, 0, 60, 60);
+    painter.end();
+
+    m_lightSource = m_scene.addPixmap(pixmap);
+    m_lightSource->setZValue(2);
+
+    for (int i = -2; i < 3; ++i)
+        for (int j = -2; j < 3; ++j) {
+            QAbstractGraphicsShapeItem *item;
+            if ((i + j) & 1)
+                item = new QGraphicsEllipseItem(0, 0, 50, 50);
+            else
+                item = new QGraphicsRectItem(0, 0, 50, 50);
+
+            item->setPen(QPen(Qt::black));
+            item->setBrush(QBrush(Qt::white));
+            item->setGraphicsEffect(new ShadowEffect(item, m_lightSource));
+            item->setZValue(1);
+            item->setPos(i * 80, j * 80);
+            m_scene.addItem(item);
+            m_items << item;
+        }
+
+
+}
+
+void Lighting::animate()
+{
+    angle += (M_PI / 30);
+    qreal xs = 200 * sin(angle) - 40 + 25;
+    qreal ys = 200 * cos(angle) - 40 + 25;
+    m_lightSource->setPos(xs, ys);
+    m_scene.update();
+}
+
diff --git a/examples/effects/lighting/lighting.h b/examples/effects/lighting/lighting.h
new file mode 100644
index 0000000..70a4d48
--- /dev/null
+++ b/examples/effects/lighting/lighting.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef LIGHTING_H
+#define LIGHTING_H
+
+#include <QGraphicsEffect>
+#include <QGraphicsView>
+
+#include "shadoweffect.h"
+
+class Lighting: public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    Lighting(QWidget *parent = 0);
+
+private slots:
+    void animate();
+
+private:
+    void setupScene();
+
+private:
+    qreal angle;
+    QGraphicsScene m_scene;
+    QGraphicsItem *m_lightSource;
+    QList<QGraphicsItem*> m_items;
+};
+
+#endif // LIGHTING_H
diff --git a/examples/effects/lighting/lighting.pro b/examples/effects/lighting/lighting.pro
new file mode 100644
index 0000000..ea9d5f6
--- /dev/null
+++ b/examples/effects/lighting/lighting.pro
@@ -0,0 +1,8 @@
+SOURCES += main.cpp lighting.cpp shadoweffect.cpp
+HEADERS += lighting.h shadoweffect.h
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/effects/lighting
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lighting.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/effects/lighting
+INSTALLS += target sources
diff --git a/examples/effects/lighting/main.cpp b/examples/effects/lighting/main.cpp
new file mode 100644
index 0000000..07415f6
--- /dev/null
+++ b/examples/effects/lighting/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "lighting.h"
+#include <QApplication>
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    Lighting lighting;
+    lighting.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Lighting and Shadows"));
+    lighting.resize(640, 480);
+    lighting.show();
+
+    return app.exec();
+}
diff --git a/examples/effects/lighting/shadoweffect.cpp b/examples/effects/lighting/shadoweffect.cpp
new file mode 100644
index 0000000..8a41aaa
--- /dev/null
+++ b/examples/effects/lighting/shadoweffect.cpp
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "shadoweffect.h"
+
+#include <math.h>
+
+ShadowEffect::ShadowEffect(QGraphicsItem *item, QGraphicsItem *source)
+    : QGraphicsDropShadowEffect()
+    , item(item), m_lightSource(source)
+{
+    setBlurRadius(8);
+    m_color = color();
+}
+
+void ShadowEffect::adjustForItem()
+{
+    QPointF delta = item->pos() - m_lightSource->pos();
+    setOffset(delta.toPoint() / 30);
+
+    qreal dx = delta.x();
+    qreal dy = delta.y();
+    qreal dd = sqrt(dx * dx + dy * dy);
+    m_color.setAlphaF(qBound(0.4, 1 - dd / 200.0, 0.7));
+    setColor(m_color);
+}
+
+QRectF ShadowEffect::boundingRectFor(const QRectF &rect) const
+{
+    const_cast<ShadowEffect *>(this)->adjustForItem();
+    return QGraphicsDropShadowEffect::boundingRectFor(rect);
+}
+
+void ShadowEffect::draw(QPainter *painter, QGraphicsEffectSource *source)
+{
+    adjustForItem();
+    QGraphicsDropShadowEffect::draw(painter, source);
+}
diff --git a/examples/effects/lighting/shadoweffect.h b/examples/effects/lighting/shadoweffect.h
new file mode 100644
index 0000000..7ea409e
--- /dev/null
+++ b/examples/effects/lighting/shadoweffect.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SHADOWEFFECT_H
+#define SHADOWEFFECT_H
+
+#include <QGraphicsEffect>
+#include <QGraphicsItem>
+
+class ShadowEffect: public QGraphicsDropShadowEffect
+{
+public:
+    ShadowEffect(QGraphicsItem *item, QGraphicsItem *source);
+
+    QRectF boundingRectFor(const QRectF &rect) const;
+
+    void draw(QPainter *painter, QGraphicsEffectSource *source);
+
+private:
+    void adjustForItem();
+
+private:
+    QColor m_color;
+    QGraphicsItem *item;
+    QGraphicsItem *m_lightSource;
+};
+
+#endif // SHADOWEFFECT_H
diff --git a/examples/examples.pro b/examples/examples.pro
index 4aa5576..f756801 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -4,6 +4,7 @@ SUBDIRS       = \
                 desktop \
                 dialogs \
                 draganddrop \
+                effects \
                 graphicsview \
                 ipc \
                 itemviews \