Merge branch 'master' of git://scm.dev.nokia.troll.no/qtmobility/qtm-connectivity

* 'master' of git://scm.dev.nokia.troll.no/qtmobility/qtm-connectivity: (140 commits)
  Fix SystemInfo cell network info request logic on Symbian
  Fix app crash when unable to connect to location server on Symbian
  Improve GeneralInfo QML Element documentation.
  Improve StorageInfo QML element documentation
  Clarify QContactManagerEngine::waitForRequestFinished documentation
  Added missing since tags to QContactFetchHint documentation
  Clarify what is included in QContactDetail default schema.
  Improve GeneralInfo QML Element documentation.
  Improve NetworkInfo QML element documentation
  Case 949050: Failure of service framework testcases
  Clarify FeedbackEffect documentation
  Fix license check failures in new systeminfo Symbian tests
  Revert "Enable failing autotests again"
  Fix MapGroup visible property does not have effect
  Testcode:Copyright and styling issues fixed
  Symbian:Added multi-threading testcases
  DeviceInfo Singleton#RMobilePhone implementation#alignedtimer testfailure
  Fix application exit freeze on Symbian when using SystemInfo
  Documented HTML email sending
  disable only the tst_qmessagestorekeys tests
  ...

518 files changed, 27313 insertions, 4755 deletions

diff --git a/INSTALL.txt b/INSTALL.txt
index 8449caeeac..d633989fbe 100644
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -1,2 +1 @@
 Please refer to installation.html under doc/html.
-
diff --git a/common.pri b/common.pri
index 4abc7b0431..5dff52fae9 100644
--- a/common.pri
+++ b/common.pri
@@ -4,6 +4,7 @@
 #
 ######################################################################
 
+include($$PWD/features/utils.pri)
 
 CONFIG(debug, debug|release) {
     WAS_IN_DEBUG=debug
@@ -50,18 +51,6 @@ win32:contains(CONFIG_WIN32,build_all) {
     }
 }
 
-# Helper function.  This should move to a .prf file
-defineReplace(mobilityDeployFilename) {
-   unset(MOBILITY_DEPLOY_NAME)
-   MOBILITY_DEPLOY_NAME = $$1
-   CONFIG(debug, debug|release): {
-      mac:RET = $$member(MOBILITY_DEPLOY_NAME, 0)_debug
-      else:win32:RET = $$member(MOBILITY_DEPLOY_NAME, 0)d
-   }
-   isEmpty(RET):RET = $$MOBILITY_DEPLOY_NAME
-   return($$RET)
-}
-
 # Make sure this goes everywhere we need it
 symbian: load(data_caging_paths)
 
diff --git a/configure.bat b/configure.bat
index 3da25b5ad7..0660623de1 100644
--- a/configure.bat
+++ b/configure.bat
@@ -6,35 +6,35 @@
 ::

 :: This file is part of the Qt Mobility Components.

 ::

-:: $QT_BEGIN_LICENSE:LGPL$
-:: GNU Lesser General Public License Usage
-:: 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.1, 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.
-::
-:: 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_BEGIN_LICENSE:LGPL$

+:: GNU Lesser General Public License Usage

+:: 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.1, 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.

+::

+:: 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$

 ::

 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::

@@ -638,7 +638,14 @@ if "%MODULE_BEARER_REQUESTED%" == "yes" (
     call :compileTest SNAP snap

 )

 

-if "%MODULE_CONTACTS_REQUESTED%" == "yes" IF "%MODULE_SYSTEMINFO_REQUESTED%" == "yes" (

+set doSymbianContactSIM=

+if "%MODULE_CONTACTS_REQUESTED%" == "yes" (

+    set doSymbianContactSIM=yes

+)

+if "%MODULE_SYSTEMINFO_REQUESTED%" == "yes" (

+    set doSymbianContactSIM=yes

+)

+if "%doSymbianContactSIM%" == "yes" (

     echo.

     echo Running compile tests for contacts / systeminfo module ...

     call :compileTest SymbianContactSIM symbiancntsim

diff --git a/demos/demos.pro b/demos/demos.pro
index 7cd1023aee..a65b7700d5 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -5,7 +5,8 @@ TEMPLATE = subdirs
 #Multimedia demos
 contains(mobility_modules,multimedia) {
     SUBDIRS += \
-        player
+        player \
+        video
 }
 
 #Messaging demos
diff --git a/demos/player/player.cpp b/demos/player/player.cpp
index 8fa3879160..ee32179d17 100644
--- a/demos/player/player.cpp
+++ b/demos/player/player.cpp
@@ -100,7 +100,7 @@ Player::Player(QWidget *parent)
 
     connect(openButton, SIGNAL(clicked()), this, SLOT(open()));
 
-    PlayerControls *controls = new PlayerControls(this);
+    PlayerControls *controls = new PlayerControls(this, player);
     controls->setState(player->state());
     controls->setVolume(player->volume());
     controls->setMuted(controls->isMuted());
diff --git a/demos/player/player.pro b/demos/player/player.pro
index 6f369aef4f..33c7575677 100644
--- a/demos/player/player.pro
+++ b/demos/player/player.pro
@@ -25,6 +25,10 @@ maemo* {
 }
 
 symbian {
-    LIBS += -lavkon -lcone -leikcore
+    LIBS += -lavkon \
+        -lcone \
+        -leikcore \
+        -lremconinterfacebase \
+        -lremconcoreapi
     TARGET.CAPABILITY = ReadUserData
 }
diff --git a/demos/player/playercontrols.cpp b/demos/player/playercontrols.cpp
index bf4d96b2fd..103b4af5b4 100644
--- a/demos/player/playercontrols.cpp
+++ b/demos/player/playercontrols.cpp
@@ -46,7 +46,7 @@
 #include <QtGui/qtoolbutton.h>
 #include <QtGui/qcombobox.h>
 
-PlayerControls::PlayerControls(QWidget *parent)
+PlayerControls::PlayerControls(QWidget *parent, QMediaPlayer *player)
     : QWidget(parent)
     , playerState(QMediaPlayer::StoppedState)
     , playerMuted(false)
@@ -58,6 +58,11 @@ PlayerControls::PlayerControls(QWidget *parent)
     , volumeSlider(0)
     , rateBox(0)
 {
+#ifdef Q_OS_SYMBIAN
+    initRemCon();
+#endif // Q_OS_SYMBIAN
+    iplayer = player;
+
     playButton = new QToolButton(this);
     playButton->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
 
@@ -115,6 +120,13 @@ PlayerControls::PlayerControls(QWidget *parent)
     setLayout(layout);
 }
 
+PlayerControls::~PlayerControls()
+{
+#ifdef Q_OS_SYMBIAN
+    delete interfaceSelector;
+#endif
+}
+
 QMediaPlayer::State PlayerControls::state() const
 {
     return playerState;
@@ -209,3 +221,56 @@ void PlayerControls::updateRate()
 {
     emit changeRate(playbackRate());
 }
+
+#ifdef Q_OS_SYMBIAN
+void PlayerControls::MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct)
+{
+    if (!coreTarget)
+        return;
+
+    switch (aOperationId){
+        case ERemConCoreApiVolumeUp:
+            if ((aButtonAct == ERemConCoreApiButtonClick) ||
+                (aButtonAct == ERemConCoreApiButtonPress) ||
+                (aButtonAct == ERemConCoreApiButtonRelease))
+             emit changeVolume((iplayer->volume()) + 10);
+             break;
+        case ERemConCoreApiVolumeDown:
+            if ((aButtonAct == ERemConCoreApiButtonClick) ||
+                (aButtonAct == ERemConCoreApiButtonPress) ||
+                (aButtonAct == ERemConCoreApiButtonRelease))
+             emit changeVolume((iplayer->volume()) - 10);
+             break;
+        case ERemConCoreApiPausePlayFunction:
+            if (aButtonAct == ERemConCoreApiButtonClick)
+             playClicked();
+             break;
+        case ERemConCoreApiStop:
+            if (aButtonAct == ERemConCoreApiButtonClick)
+             emit stop();
+             break;
+        case ERemConCoreApiBackward:
+            if (aButtonAct == ERemConCoreApiButtonClick)
+             emit previous();
+             break;
+        case ERemConCoreApiForward:
+            if (aButtonAct == ERemConCoreApiButtonClick)
+             emit next();
+             break;
+    }
+}
+
+void PlayerControls::initRemCon()
+{
+    try {
+        QT_TRAP_THROWING(
+            interfaceSelector = CRemConInterfaceSelector::NewL();
+            coreTarget = CRemConCoreApiTarget::NewL(*interfaceSelector, *this);
+            interfaceSelector->OpenTargetL());
+    } catch (const std::exception &e) {
+        delete interfaceSelector;
+        interfaceSelector = 0;
+        coreTarget = 0;
+    }
+}
+#endif // Q_OS_SYMBIAN
diff --git a/demos/player/playercontrols.h b/demos/player/playercontrols.h
index 89dc3fd9ec..2bddf50707 100644
--- a/demos/player/playercontrols.h
+++ b/demos/player/playercontrols.h
@@ -41,9 +41,15 @@
 #ifndef PLAYERCONTROLS_H
 #define PLAYERCONTROLS_H
 
+#include <QtCore/qglobal.h>
+#include <QtGui/qwidget.h>
 #include <qmediaplayer.h>
 
-#include <QtGui/qwidget.h>
+#ifdef Q_OS_SYMBIAN
+#include <remconcoreapitarget.h>
+#include <remconcoreapitargetobserver.h>
+#include <remconinterfaceselector.h>
+#endif // Q_OS_SYMBIAN
 
 QT_BEGIN_NAMESPACE
 class QAbstractButton;
@@ -54,10 +60,15 @@ QT_END_NAMESPACE
 QT_USE_NAMESPACE
 
 class PlayerControls : public QWidget
+#ifdef Q_OS_SYMBIAN
+                     , public MRemConCoreApiTargetObserver
+#endif // Q_OS_SYMBIAN
 {
     Q_OBJECT
 public:
-    PlayerControls(QWidget *parent = 0);
+
+    PlayerControls(QWidget *parent, QMediaPlayer *player);
+    ~PlayerControls();
 
     QMediaPlayer::State state() const;
 
@@ -65,6 +76,13 @@ public:
     bool isMuted() const;
     qreal playbackRate() const;
 
+#ifdef Q_OS_SYMBIAN
+protected:
+    void MrccatoCommand(TRemConCoreApiOperationId aOperationId, TRemConCoreApiButtonAction aButtonAct);
+private:
+    void initRemCon();
+#endif // Q_OS_SYMBIAN
+
 public slots:
     void setState(QMediaPlayer::State state);
     void setVolume(int volume);
@@ -96,6 +114,11 @@ private:
     QAbstractButton *muteButton;
     QAbstractSlider *volumeSlider;
     QComboBox *rateBox;
+#ifdef Q_OS_SYMBIAN
+    CRemConInterfaceSelector *interfaceSelector;
+    CRemConCoreApiTarget *coreTarget;
+#endif // Q_OS_SYMBIAN
+    QMediaPlayer *iplayer;
 };
 
-#endif
+#endif // PLAYERCONTROLS_H
diff --git a/demos/qmlcontacts/contacts.qml b/demos/qmlcontacts/contacts.qml
index 1d7799c914..2fd6f28bbf 100644
--- a/demos/qmlcontacts/contacts.qml
+++ b/demos/qmlcontacts/contacts.qml
@@ -70,6 +70,16 @@ Item {
             statusString: contactModel.error
         }
 
+        // This component serves as a base from which new contacts are instantiated
+        Component {
+            id: contactComponent
+            Contact {
+                PhoneNumber {
+                    number: ""
+                }
+            }
+        }
+
         ContactListView {
             id: contactListView
             width: parent.width
@@ -80,13 +90,15 @@ Item {
             onOpenContact: {
                     screen.showContact = true;
                     contactView.contact = contact;
+                    contactView.update();
                     }
             onNewContact: {
-                    var contact = Qt.createQmlObject(
-                        "import QtMobility.contacts 1.1;" +
-                        "Contact {}", contactModel);
+                    // create new instance of contactComponent
+                    // using createQmlObject does not work here; phoneNumbers and emails list properties do not get initialized for some reason
+                    var contact = contactComponent.createObject(contactModel);
                     screen.showContact = true;
                     contactView.contact = contact;
+                    contactView.update();
                 }
         }
 
@@ -164,7 +176,7 @@ Item {
             Text {
                 text:messageBox.messageString
                 color:"red"
-                font.pointSize:20
+                font.pointSize:14
                 horizontalAlignment:Text.AlignHCenter
             }
 
diff --git a/demos/qmlcontacts/contents/ContactListView.qml b/demos/qmlcontacts/contents/ContactListView.qml
index 8ffbde530b..7b39e2be78 100644
--- a/demos/qmlcontacts/contents/ContactListView.qml
+++ b/demos/qmlcontacts/contents/ContactListView.qml
@@ -60,6 +60,7 @@ Item {
         focus: true
         keyNavigationWraps: true
         opacity: 0.8
+        clip: true
 
         model: contacts
 
@@ -164,10 +165,14 @@ Item {
                                 MediaButton {
                                     id: dialButton;
                                     text: "Dial";
+
+                                    onClicked: Qt.openUrlExternally("tel:" + model.contact.phoneNumber.number)
                                 }
                                 MediaButton {
                                     id: textButton
                                     text: "Send Text";
+
+                                    onClicked: Qt.openUrlExternally("sms:" + model.contact.phoneNumber.number)
                                 }
                                 Item {
                                     height:childrenRect.height
diff --git a/demos/qmlcontacts/contents/ContactView.qml b/demos/qmlcontacts/contents/ContactView.qml
index 2472d8a1b1..ea1255ac89 100644
--- a/demos/qmlcontacts/contents/ContactView.qml
+++ b/demos/qmlcontacts/contents/ContactView.qml
@@ -48,6 +48,12 @@ Item {
     signal deleted(int id)
     property bool showDetailed: false
 
+    // list<string> type properties do not update automatically as model, assigning them again triggers an update
+    function update() {
+        phoneNumberRepeater.model = contact.phoneNumbers
+        emailRepeater.model = contact.emails
+    }
+
     ListView {
         id: normalView
         focus: true
@@ -56,6 +62,8 @@ Item {
         anchors.top: parent.top
         anchors.bottom: toolBar.top
         opacity: 1
+        clip: true
+        spacing: 2
         transform: Scale {
             id: normalViewScale;
             xScale: 1
@@ -101,7 +109,9 @@ Item {
                 font.weight: Font.Bold
             }
             Column {
+                spacing: 2
                 Repeater {
+                    id: phoneNumberRepeater
                     model: contact ? contact.phoneNumbers : []
                     delegate:
                         FieldRow {
@@ -121,6 +131,7 @@ Item {
                             "import QtMobility.contacts 1.1;" +
                             "PhoneNumber {number: ''}", contact);
                         contact.addDetail(detail);
+                        update();
                     }
             }
 
@@ -134,7 +145,9 @@ Item {
                 font.weight: Font.Bold
             }
             Column {
+                spacing: 2
                 Repeater {
+                    id: emailRepeater
                     model: contact ? contact.emails : []
                     delegate:
                         FieldRow {
@@ -154,6 +167,7 @@ Item {
                             "import QtMobility.contacts 1.1;" +
                             "EmailAddress {emailAddress: ''}", contact);
                         contact.addDetail(detail);
+                        update();
                     }
             }
         }
@@ -167,6 +181,7 @@ Item {
         anchors.top: parent.top
         anchors.bottom: toolBar.top
         opacity: 1
+        clip: true
         transform: Scale {
             id: detailViewScale;
             xScale: 0
@@ -198,12 +213,13 @@ Item {
                             height: childrenRect.height
                             Text {
                                 id: fieldName
-                                width: parent.width * 0.5;
+                                width: parent.width * 0.4;
                                 height: 20;
                                 anchors.margins: 3
                                 anchors.left: parent.left
                                 text: modelData
                                 color: "white"
+                                elide: Text.ElideRight
                             }
                             Text {
                                 id: textRect
@@ -235,9 +251,14 @@ Item {
                 switch (index) {
                     case 0:
                         contact.save();
+                        showDetailed = false;
+                        break;
+                    case 1:
+                        showDetailed = false;
                         break;
                     case 2:
                         deleted(contact.contactId)
+                        showDetailed = false;
                         break;
                     case 3:
                         showDetailed = !showDetailed;
diff --git a/demos/qmlcontacts/contents/FieldRow.qml b/demos/qmlcontacts/contents/FieldRow.qml
index 87eae97f2c..0ee2555213 100644
--- a/demos/qmlcontacts/contents/FieldRow.qml
+++ b/demos/qmlcontacts/contents/FieldRow.qml
@@ -43,7 +43,7 @@ import Qt 4.7
 
 Item {
     property string label
-    property variant value
+    property string value
     property alias newValue: textEdit.text
 
     signal blur
@@ -51,7 +51,7 @@ Item {
     height: childrenRect.height
     Text {
         id: fieldName
-        width: parent.width * 0.5;
+        width: parent.width * 0.4;
         height: 20;
         anchors.margins: 3
         anchors.left: parent.left
@@ -64,17 +64,12 @@ Item {
         anchors.right: parent.right
         anchors.rightMargin: 3
         height: 30;
-        color: "#00000000";
+        color: "white"
         border.color: "#00000000";
         border.width: 0
-        TextInput {
-            id: textEdit
-            anchors.fill: parent
-            anchors.margins: 3
-            text: value.toString();
-            color: activeFocus? "black" : "#ffffaa";
-            onActiveFocusChanged: { if (!activeFocus) { blur(); } }
-        }
+        radius: 2
+        opacity: 0.5
+
         states: [
                 State {
                     name: "focused"
@@ -89,4 +84,13 @@ Item {
                 }
             ]
     }
+
+    TextInput {
+        id: textEdit
+        anchors.fill: textRect
+        anchors.margins: 3
+        text: value
+        color: "black"
+        onActiveFocusChanged: { if (!activeFocus) { blur(); } }
+    }
 }
diff --git a/demos/qmlcontacts/qmlapplicationviewer.cpp b/demos/qmlcontacts/qmlapplicationviewer.cpp
index 6a78cad75b..01859cded3 100644
--- a/demos/qmlcontacts/qmlapplicationviewer.cpp
+++ b/demos/qmlcontacts/qmlapplicationviewer.cpp
@@ -158,7 +158,7 @@ void QmlApplicationViewer::setOrientation(Orientation orientation)
 
 void QmlApplicationViewer::show()
 {
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR) || defined(MEEGO_EDITION_HARMATTAN)
     showFullScreen();
 #elif defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
     showMaximized();
diff --git a/demos/qmlcontacts/qmlcontacts.pro b/demos/qmlcontacts/qmlcontacts.pro
index 9f7b4f893d..66ded5229c 100644
--- a/demos/qmlcontacts/qmlcontacts.pro
+++ b/demos/qmlcontacts/qmlcontacts.pro
@@ -42,9 +42,7 @@ OTHER_FILES += \
 
 symbian: {
     load(data_caging_paths)
-    TARGET.CAPABILITY = ReadDeviceData \
-                        WriteDeviceData \
-                        ReadUserData \
+    TARGET.CAPABILITY = ReadUserData \
                         WriteUserData
     TARGET.UID3 = 0xA000E407
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
@@ -54,3 +52,8 @@ symbian: {
 
 RESOURCES += \
     qmlcontacts.qrc
+
+contains(MEEGO_EDITION,harmattan) {
+    target.path = /opt/qmlcontacts/bin
+    INSTALLS += target
+}
diff --git a/demos/serviceactions/mainwindow.cpp b/demos/serviceactions/mainwindow.cpp
index e090be196e..06569a688f 100644
--- a/demos/serviceactions/mainwindow.cpp
+++ b/demos/serviceactions/mainwindow.cpp
@@ -221,6 +221,7 @@ void AccountsWidget::loadFinished()
         {
             QMessageAccount account(accountIds[i]);
             m_accountsCombo->addItem(QString("%1 - %2").arg(i+1).arg(account.name()),account.name());
+            m_accountsCombo->setCurrentIndex(i);
         }
 
         m_stackedLayout->setCurrentWidget(m_accountsCombo);
diff --git a/demos/video/qmlvideo/images/close.png b/demos/video/qmlvideo/images/close.png
new file mode 100644
index 0000000000..6904df0e44
--- /dev/null
+++ b/demos/video/qmlvideo/images/close.png
diff --git a/demos/video/qmlvideo/images/folder.png b/demos/video/qmlvideo/images/folder.png
new file mode 100644
index 0000000000..e53e2ad464
--- /dev/null
+++ b/demos/video/qmlvideo/images/folder.png
diff --git a/demos/video/qmlvideo/images/leaves.jpg b/demos/video/qmlvideo/images/leaves.jpg
new file mode 100644
index 0000000000..66533b34af
--- /dev/null
+++ b/demos/video/qmlvideo/images/leaves.jpg
diff --git a/demos/video/qmlvideo/images/progress_handle.svg b/demos/video/qmlvideo/images/progress_handle.svg
new file mode 100644
index 0000000000..7ad9014e31
--- /dev/null
+++ b/demos/video/qmlvideo/images/progress_handle.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10px"
+   height="46px"
+   version="1.1">
+    <g>
+        <defs>
+            <linearGradient id="MyGradient1" x1="0%" y1="0%" x2="100%" y2="100%">
+                <stop offset="0%" stop-color="lightcyan" />
+                <stop offset="100%" stop-color="dodgerblue" />
+            </linearGradient>
+        </defs>
+        <rect
+            stroke="white"
+            fill="url(#MyGradient1)"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            width="8"
+            height="44"
+            x="1"
+            y="1"
+            rx="4"
+            ry="4"/>
+    </g>
+</svg>
diff --git a/demos/video/qmlvideo/images/progress_handle_pressed.svg b/demos/video/qmlvideo/images/progress_handle_pressed.svg
new file mode 100644
index 0000000000..c9c6c486c6
--- /dev/null
+++ b/demos/video/qmlvideo/images/progress_handle_pressed.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="10px"
+   height="46px"
+   version="1.1">
+    <g>
+        <defs>
+            <linearGradient id="MyGradient1" x1="0%" y1="0%" x2="100%" y2="100%">
+                <stop offset="0%" stop-color="skyblue" />
+                <stop offset="100%" stop-color="darkblue" />
+            </linearGradient>
+        </defs>
+        <rect
+            stroke="white"
+            fill="url(#MyGradient1)"
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            width="8"
+            height="44"
+            x="1"
+            y="1"
+            rx="4"
+            ry="4"/>
+    </g>
+</svg>
diff --git a/demos/video/qmlvideo/images/titlebar.png b/demos/video/qmlvideo/images/titlebar.png
new file mode 100644
index 0000000000..51c90082d0
--- /dev/null
+++ b/demos/video/qmlvideo/images/titlebar.png
diff --git a/demos/video/qmlvideo/images/titlebar.sci b/demos/video/qmlvideo/images/titlebar.sci
new file mode 100644
index 0000000000..0418d94cd6
--- /dev/null
+++ b/demos/video/qmlvideo/images/titlebar.sci
@@ -0,0 +1,5 @@
+border.left: 10
+border.top: 12
+border.bottom: 12
+border.right: 10
+source: titlebar.png
diff --git a/demos/video/qmlvideo/images/up.png b/demos/video/qmlvideo/images/up.png
new file mode 100644
index 0000000000..b05f8025d0
--- /dev/null
+++ b/demos/video/qmlvideo/images/up.png
diff --git a/demos/video/qmlvideo/main.cpp b/demos/video/qmlvideo/main.cpp
new file mode 100644
index 0000000000..78c0dc0bcf
--- /dev/null
+++ b/demos/video/qmlvideo/main.cpp
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QGraphicsObject>
+#include "qmlapplicationviewer.h"
+#include "trace.h"
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+#include "painteventmonitor.h"
+#include "performancemonitordeclarative.h"
+#endif
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    PerformanceMonitor::qmlRegisterTypes();
+#endif
+
+    QString source1, source2;
+    qreal volume = 0.5;
+    QStringList args = app.arguments();
+    PerformanceMonitor::State performanceMonitorState;
+    bool sourceIsUrl = false;
+    for (int i=1; i<args.count(); ++i) {
+        const QString &arg = args.at(i);
+        if (arg.startsWith('-')) {
+            if ("-volume" == arg) {
+                if (i+1 < args.count())
+                    volume = 0.01 * args.at(++i).toInt();
+                else
+                    qtTrace() << "Option \"-volume\" takes a value";
+            }
+#ifdef PERFORMANCEMONITOR_SUPPORT
+            else if (PerformanceMonitor::parseArgument(arg, performanceMonitorState)) {
+                // Do nothing
+            }
+#endif
+            else if ("-url" == arg) {
+                sourceIsUrl = true;
+            } else {
+                qtTrace() << "Option" << arg << "ignored";
+            }
+        } else {
+            if (source1.isEmpty())
+                source1 = arg;
+            else if (source2.isEmpty())
+                source2 = arg;
+            else
+                qtTrace() << "Argument" << arg << "ignored";
+        }
+    }
+
+    QUrl url1, url2;
+    if (sourceIsUrl) {
+        url1 = source1;
+        url2 = source2;
+    } else {
+        if (!source1.isEmpty())
+            url1 = QUrl::fromLocalFile(source1);
+        if (!source2.isEmpty())
+            url2 = QUrl::fromLocalFile(source2);
+    }
+
+    QmlApplicationViewer viewer;
+
+    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
+    viewer.setMainQmlFile(QLatin1String("qml/qmlvideo/main.qml"));
+    QGraphicsObject *rootObject = viewer.rootObject();
+    rootObject->setProperty("source1", url1);
+    rootObject->setProperty("source2", url2);
+    rootObject->setProperty("volume", volume);
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    if (performanceMonitorState.valid) {
+        rootObject->setProperty("perfMonitorsLogging", performanceMonitorState.logging);
+        rootObject->setProperty("perfMonitorsVisible", performanceMonitorState.visible);
+    }
+    PaintEventMonitor paintEventMonitor;
+    paintEventMonitor.setTarget(viewer.viewport());
+    QObject::connect(&paintEventMonitor, SIGNAL(targetPainted()),
+                     rootObject, SLOT(qmlFramePainted()));
+#endif
+
+    QString videoPath;
+    const QString moviesLocation = QDesktopServices::storageLocation(QDesktopServices::MoviesLocation);
+    if (!moviesLocation.isEmpty())
+        videoPath = moviesLocation;
+    viewer.rootContext()->setContextProperty("videoPath", videoPath);
+
+    QMetaObject::invokeMethod(rootObject, "init");
+
+    viewer.showExpanded();
+
+    return app.exec();
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/Button.qml b/demos/video/qmlvideo/qml/qmlvideo/Button.qml
new file mode 100644
index 0000000000..ffa17f325e
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/Button.qml
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: textColor
+    radius: 0.25 * height
+
+    property string text
+    property color bgColor: "white"
+    property color bgColorSelected: "red"
+    property color textColor: "black"
+    property alias enabled: mouseArea.enabled
+
+    signal clicked
+
+    Rectangle {
+        anchors { fill: parent; margins: 1 }
+        color: mouseArea.pressed ? bgColorSelected : bgColor
+        radius: 0.25 * height
+
+        Text {
+            id: text
+            anchors.centerIn: parent
+            text: root.text
+            font.pixelSize: 0.5 * parent.height
+            color: mouseArea.pressed ? bgColor : textColor
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        MouseArea {
+            id: mouseArea
+            anchors.fill: parent
+            onClicked: {
+                root.clicked()
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraBasic.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraBasic.qml
new file mode 100644
index 0000000000..227c2549d0
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraBasic.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneBasic {
+    contentType: "camera"
+    started: true
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraDrag.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraDrag.qml
new file mode 100644
index 0000000000..e70254f908
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraDrag.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneDrag {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraDummy.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
new file mode 100644
index 0000000000..640e633feb
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraDummy.qml
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+// Item which is loaded by CameraItem if QtMultimediaKit is not available
+Rectangle {
+    id: root
+    color: "grey"
+    height: width
+
+    signal fatalError
+    signal sizeChanged
+    signal framePainted
+
+    Text {
+        anchors.fill: parent
+        anchors.margins: 10
+        color: "white"
+        horizontalAlignment: Text.AlignHCenter
+        text: "Failed to create Camera item\n\nCheck that QtMultimediaKit is installed"
+        verticalAlignment: Text.AlignVCenter
+        wrapMode: Text.Wrap
+    }
+
+    onWidthChanged: height = width
+    onHeightChanged: root.sizeChanged()
+
+    function start() { }
+    function stop() { }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml
new file mode 100644
index 0000000000..d101675791
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreen.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneFullScreen {
+    contentType: "camera"
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml
new file mode 100644
index 0000000000..089f35fd7e
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraFullScreenInverted.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneFullScreenInverted {
+    contentType: "camera"
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraItem.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraItem.qml
new file mode 100644
index 0000000000..321cb018dd
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraItem.qml
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Camera {
+    id: root
+    height: width
+
+    signal fatalError
+    signal sizeChanged
+
+    onHeightChanged: root.sizeChanged()
+    onError: {
+        if (Camera.NoError != error) {
+            console.log("[qmlvideo] CameraItem.onError error " + error + " errorString " + errorString)
+            root.fatalError()
+        }
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraMove.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraMove.qml
new file mode 100644
index 0000000000..d5211dd752
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraMove.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneMove {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml
new file mode 100644
index 0000000000..28a4cfa8e1
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraOverlay.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneOverlay {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraResize.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraResize.qml
new file mode 100644
index 0000000000..83987959e2
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraResize.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneResize {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraRotate.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
new file mode 100644
index 0000000000..34780f3e49
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraRotate.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneRotate {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/CameraSpin.qml b/demos/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
new file mode 100644
index 0000000000..7ab190bf43
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/CameraSpin.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneSpin {
+    contentType: "camera"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/Content.qml b/demos/video/qmlvideo/qml/qmlvideo/Content.qml
new file mode 100644
index 0000000000..ca062740ce
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/Content.qml
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    border.color: "white"
+    border.width: showBorder ? 1 : 0
+    color: "transparent"
+    property string contentType // "camera" or "video"
+    property string source
+    property real volume
+    property bool dummy: false
+    property bool autoStart: true
+    property bool started: false
+    property bool showFrameRate: false
+    property bool showBorder: false
+
+    signal initialized
+    signal error
+    signal videoFramePainted
+
+    Loader {
+        id: contentLoader
+    }
+
+    Connections {
+        id: framePaintedConnection
+        onFramePainted: {
+            if (frameRateLoader.item)
+                frameRateLoader.item.notify()
+            root.videoFramePainted()
+        }
+        ignoreUnknownSignals: true
+    }
+
+    Connections {
+        id: errorConnection
+        onFatalError: {
+            console.log("[qmlvideo] Content.onFatalError")
+            stop()
+            root.error()
+        }
+        ignoreUnknownSignals: true
+    }
+
+    Loader {
+        id: frameRateLoader
+        source: root.showFrameRate ? "../frequencymonitor/FrequencyItem.qml" : ""
+        onLoaded: {
+            item.parent = root
+            item.anchors.top = root.top
+            item.anchors.right = root.right
+            item.anchors.margins = 10
+        }
+    }
+
+    onWidthChanged: {
+        if (contentItem())
+            contentItem().width = width
+    }
+
+    onHeightChanged: {
+        if (contentItem())
+            contentItem().height = height
+    }
+
+    function initialize() {
+        console.log("[qmlvideo] Content.initialize: contentType " + contentType)
+        if ("video" == contentType) {
+            console.log("[qmlvideo] Content.initialize: loading VideoItem.qml")
+            contentLoader.source = "VideoItem.qml"
+            if (Loader.Error == contentLoader.status) {
+                console.log("[qmlvideo] Content.initialize: loading VideoDummy.qml")
+                contentLoader.source = "VideoDummy.qml"
+                dummy = true
+            }
+            contentLoader.item.volume = volume
+        } else if ("camera" == contentType) {
+            console.log("[qmlvideo] Content.initialize: loading CameraItem.qml")
+            contentLoader.source = "CameraItem.qml"
+            if (Loader.Error == contentLoader.status) {
+                console.log("[qmlvideo] Content.initialize: loading CameraDummy.qml")
+                contentLoader.source = "CameraDummy.qml"
+                dummy = true
+            }
+        } else {
+            console.log("[qmlvideo] Content.initialize: error: invalid contentType")
+        }
+        if (contentLoader.item) {
+            contentLoader.item.sizeChanged.connect(updateRootSize)
+            contentLoader.item.parent = root
+            contentLoader.item.width = root.width
+            framePaintedConnection.target = contentLoader.item
+            errorConnection.target = contentLoader.item
+            if (root.autoStart)
+                root.start()
+        }
+        console.log("[qmlvideo] Content.initialize: complete")
+        root.initialized()
+    }
+
+    function start() {
+        console.log("[qmlvideo] Content.start")
+        if (contentLoader.item) {
+            if (root.contentType == "video")
+                contentLoader.item.source = root.source
+            contentLoader.item.start()
+            root.started = true
+        }
+    }
+
+    function stop() {
+        console.log("[qmlvideo] Content.stop")
+        if (contentLoader.item) {
+            contentLoader.item.stop()
+            if (root.contentType == "video")
+                contentLoader.item.source = ""
+            root.started = false
+        }
+    }
+
+    function contentItem() { return contentLoader.item }
+    function updateRootSize() { root.height = contentItem().height }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml b/demos/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
new file mode 100644
index 0000000000..dde2a500fc
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/DisableScreenSaver.qml
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMobility.systeminfo 1.1
+
+Item {
+    ScreenSaver {
+        screenSaverInhibited: true
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml b/demos/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
new file mode 100644
index 0000000000..c1264a1c13
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/ErrorDialog.qml
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: "transparent"
+    opacity: 0.0
+    property alias enabled: mouseArea.enabled
+    state: enabled ? "on" : "baseState"
+
+    states: [
+        State {
+            name: "on"
+            PropertyChanges {
+                target: root
+                opacity: 1.0
+            }
+        }
+    ]
+
+    transitions: [
+        Transition {
+            from: "*"
+            to: "*"
+            NumberAnimation {
+                properties: "opacity"
+                easing.type: Easing.OutQuart
+                duration: 500
+            }
+        }
+    ]
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+        opacity: 0.75
+    }
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: 300
+        height: 200
+        radius: 10
+        color: "white"
+
+        Text {
+            id: text
+            anchors.fill: parent
+            anchors.margins: 10
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+            color: "black"
+            wrapMode: Text.WordWrap
+        }
+    }
+
+    MouseArea {
+        id: mouseArea
+        anchors.fill: parent
+        onClicked: root.enabled = false
+    }
+
+    function show(msg) {
+        text.text = "<b>Error</b><br><br>" + msg
+        root.enabled = true
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/FileBrowser.qml b/demos/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
new file mode 100644
index 0000000000..8a50a507a8
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/FileBrowser.qml
@@ -0,0 +1,384 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.folderlistmodel 1.0
+
+Rectangle {
+    id: fileBrowser
+    color: "transparent"
+
+    property string folder
+    property bool shown: (loader.sourceComponent != undefined)
+
+    signal fileSelected(string file)
+
+    function selectFile(file) {
+        if (file != "")
+            folder = loader.item.folders.folder
+        loader.sourceComponent = undefined
+        fileBrowser.fileSelected(file)
+    }
+
+    Loader {
+        id: loader
+    }
+
+    function show() {
+        loader.sourceComponent = fileBrowserComponent
+        loader.item.parent = fileBrowser
+        loader.item.anchors.fill = fileBrowser
+        loader.item.folder = fileBrowser.folder
+    }
+
+    Component {
+        id: fileBrowserComponent
+
+        Rectangle {
+            id: root
+            color: "white"
+            property bool showFocusHighlight: false
+            property variant folders: folders1
+            property variant view: view1
+            property alias folder: folders1.folder
+            property color textColor: "black"
+
+            FolderListModel {
+                id: folders1
+                folder: folder
+            }
+
+            FolderListModel {
+                id: folders2
+                folder: folder
+            }
+
+            SystemPalette {
+                id: palette
+            }
+
+            Component {
+                id: folderDelegate
+
+                Rectangle {
+                    id: wrapper
+                    function launch() {
+                        if (folders.isFolder(index))
+                            down(filePath);
+                        else
+                            fileBrowser.selectFile(filePath)
+                    }
+                    width: root.width
+                    height: 52
+                    color: "transparent"
+
+                    Rectangle {
+                        id: highlight; visible: false
+                        anchors.fill: parent
+                        color: palette.highlight
+                        gradient: Gradient {
+                            GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                            GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+                        }
+                    }
+
+                    Item {
+                        width: 48; height: 48
+                        Image {
+                            source: "qrc:/images/folder.png"
+                            anchors.centerIn: parent
+                            visible: folders.isFolder(index)
+                        }
+                    }
+
+                    Text {
+                        id: nameText
+                        anchors.fill: parent; verticalAlignment: Text.AlignVCenter
+                        text: fileName
+                        anchors.leftMargin: 54
+                        font.pixelSize: 32
+                        color: (wrapper.ListView.isCurrentItem && root.showFocusHighlight) ? palette.highlightedText : textColor
+                        elide: Text.ElideRight
+                    }
+
+                    MouseArea {
+                        id: mouseRegion
+                        anchors.fill: parent
+                        onPressed: {
+                            root.showFocusHighlight = false;
+                            wrapper.ListView.view.currentIndex = index;
+                        }
+                        onClicked: { if (folders == wrapper.ListView.view.model) launch() }
+                    }
+
+                    states: [
+                        State {
+                            name: "pressed"
+                            when: mouseRegion.pressed
+                            PropertyChanges { target: highlight; visible: true }
+                            PropertyChanges { target: nameText; color: palette.highlightedText }
+                        }
+                    ]
+                }
+            }
+
+            Rectangle {
+                id: cancelButton
+                width: 100
+                height: titleBar.height - 7
+                color: "black"
+                anchors { bottom: parent.bottom; horizontalCenter: parent.horizontalCenter }
+
+                Text {
+                    anchors { fill: parent; margins: 4 }
+                    text: "Cancel"
+                    color: "white"
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                    font.pixelSize: 20
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: fileBrowser.selectFile("")
+                }
+            }
+
+            ListView {
+                id: view1
+                anchors.top: titleBar.bottom
+                anchors.bottom: cancelButton.top
+                x: 0
+                width: parent.width
+                model: folders1
+                delegate: folderDelegate
+                highlight: Rectangle {
+                    color: palette.highlight
+                    visible: root.showFocusHighlight && view1.count != 0
+                    gradient: Gradient {
+                        GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                        GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+                    }
+                    width: view1.currentItem == null ? 0 : view1.currentItem.width
+                }
+                highlightMoveSpeed: 1000
+                pressDelay: 100
+                focus: true
+                state: "current"
+                states: [
+                    State {
+                        name: "current"
+                        PropertyChanges { target: view1; x: 0 }
+                    },
+                    State {
+                        name: "exitLeft"
+                        PropertyChanges { target: view1; x: -root.width }
+                    },
+                    State {
+                        name: "exitRight"
+                        PropertyChanges { target: view1; x: root.width }
+                    }
+                ]
+                transitions: [
+                    Transition {
+                        to: "current"
+                        SequentialAnimation {
+                            NumberAnimation { properties: "x"; duration: 250 }
+                        }
+                    },
+                    Transition {
+                        NumberAnimation { properties: "x"; duration: 250 }
+                        NumberAnimation { properties: "x"; duration: 250 }
+                    }
+                ]
+                Keys.onPressed: root.keyPressed(event.key)
+            }
+
+            ListView {
+                id: view2
+                anchors.top: titleBar.bottom
+                anchors.bottom: parent.bottom
+                x: parent.width
+                width: parent.width
+                model: folders2
+                delegate: folderDelegate
+                highlight: Rectangle {
+                    color: palette.highlight
+                    visible: root.showFocusHighlight && view2.count != 0
+                    gradient: Gradient {
+                        GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                        GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+                    }
+                    width: view1.currentItem == null ? 0 : view1.currentItem.width
+                }
+                highlightMoveSpeed: 1000
+                pressDelay: 100
+                states: [
+                    State {
+                        name: "current"
+                        PropertyChanges { target: view2; x: 0 }
+                    },
+                    State {
+                        name: "exitLeft"
+                        PropertyChanges { target: view2; x: -root.width }
+                    },
+                    State {
+                        name: "exitRight"
+                        PropertyChanges { target: view2; x: root.width }
+                    }
+                ]
+                transitions: [
+                    Transition {
+                        to: "current"
+                        SequentialAnimation {
+                            NumberAnimation { properties: "x"; duration: 250 }
+                        }
+                    },
+                    Transition {
+                        NumberAnimation { properties: "x"; duration: 250 }
+                    }
+                ]
+                Keys.onPressed: root.keyPressed(event.key)
+            }
+
+            Keys.onPressed: {
+                root.keyPressed(event.key);
+                if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) {
+                    view.currentItem.launch();
+                    event.accepted = true;
+                } else if (event.key == Qt.Key_Left) {
+                    up();
+                }
+            }
+
+            BorderImage {
+                source: "qrc:/images/titlebar.sci";
+                width: parent.width;
+                height: 52
+                y: -7
+                id: titleBar
+
+                Rectangle {
+                    id: upButton
+                    width: 48
+                    height: titleBar.height - 7
+                    color: "transparent"
+                    Image { anchors.centerIn: parent; source: "qrc:/images/up.png" }
+                    MouseArea { id: upRegion; anchors.centerIn: parent
+                        width: 56
+                        height: 56
+                        onClicked: if (folders.parentFolder != "") up()
+                    }
+                    states: [
+                        State {
+                            name: "pressed"
+                            when: upRegion.pressed
+                            PropertyChanges { target: upButton; color: palette.highlight }
+                        }
+                    ]
+                }
+
+                Rectangle {
+                    color: "gray"
+                    x: 48
+                    width: 1
+                    height: 44
+                }
+
+                Text {
+                    anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
+                    anchors.leftMargin: 4; anchors.rightMargin: 4
+                    text: folders.folder
+                    color: "white"
+                    elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter
+                    font.pixelSize: 32
+                }
+            }
+
+            function down(path) {
+                if (folders == folders1) {
+                    view = view2
+                    folders = folders2;
+                    view1.state = "exitLeft";
+                } else {
+                    view = view1
+                    folders = folders1;
+                    view2.state = "exitLeft";
+                }
+                view.x = root.width;
+                view.state = "current";
+                view.focus = true;
+                folders.folder = path;
+            }
+
+            function up() {
+                var path = folders.parentFolder;
+                if (folders == folders1) {
+                    view = view2
+                    folders = folders2;
+                    view1.state = "exitRight";
+                } else {
+                    view = view1
+                    folders = folders1;
+                    view2.state = "exitRight";
+                }
+                view.x = -root.width;
+                view.state = "current";
+                view.focus = true;
+                folders.folder = path;
+            }
+
+            function keyPressed(key) {
+                switch (key) {
+                    case Qt.Key_Up:
+                    case Qt.Key_Down:
+                    case Qt.Key_Left:
+                    case Qt.Key_Right:
+                        root.showFocusHighlight = true;
+                    break;
+                    default:
+                        // do nothing
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/Scene.qml b/demos/video/qmlvideo/qml/qmlvideo/Scene.qml
new file mode 100644
index 0000000000..0f688807c7
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/Scene.qml
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: "black"
+    property alias buttonHeight: closeButton.height
+    property string source1
+    property string source2
+    property int contentWidth: 250
+    property real volume: 0.25
+    property int margins: 10
+    property QtObject content
+
+    signal close
+    signal videoFramePainted
+
+    Button {
+        id: closeButton
+        anchors {
+            top: parent.top
+            right: parent.right
+            margins: root.margins
+        }
+        width: 50
+        height: 30
+        z: 2.0
+        text: "Back"
+        onClicked: root.close()
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneBasic.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
new file mode 100644
index 0000000000..48d2205ac2
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property string contentType
+    property bool autoStart: false
+    property bool started: false
+
+    Content {
+        id: content
+        autoStart: parent.autoStart
+        started: parent.started
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: parent.contentType
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Text {
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            margins: 20
+        }
+        text: content.started ? "Tap the screen to stop content"
+                              : "Tap the screen to start content"
+        color: "yellow"
+        font.pixelSize: 20
+        z: 2.0
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        onClicked: {
+            console.log("[qmlvideo] SceneBasic.onClicked, started = " + content.started)
+            if (content.started)
+                content.stop()
+            else
+                content.start()
+        }
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneDrag.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneDrag.qml
new file mode 100644
index 0000000000..d9d3196369
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneDrag.qml
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property string contentType
+
+    Image {
+        id: background
+        source: "qrc:/images/leaves.jpg"
+        x: (parent.width - width) / 2
+        y: (parent.height - height) / 2
+
+        Content {
+            id: content
+            anchors.centerIn: parent
+            width: root.contentWidth
+            contentType: root.contentType
+            source: root.source1
+            volume: root.volume
+            onVideoFramePainted: root.videoFramePainted()
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        drag.target: background
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
new file mode 100644
index 0000000000..8e090f3794
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreen.qml
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+        state: "left"
+
+        states: [
+            State {
+                name: "fullScreen"
+                PropertyChanges { target: content; width: content.parent.width }
+                PropertyChanges { target: content; height: content.parent.height }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                ParallelAnimation {
+                    PropertyAnimation {
+                        property: "width"
+                        easing.type: Easing.Linear
+                        duration: 250
+                    }
+                    PropertyAnimation {
+                        property: "height"
+                        easing.type: Easing.Linear
+                        duration: 250
+                    }
+                }
+            }
+        ]
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: content.state = (content.state == "fullScreen") ? "baseState" : "fullScreen"
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Text {
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            margins: 20
+        }
+        text: "Tap on the content to toggle full-screen mode"
+        color: "yellow"
+        font.pixelSize: 20
+        z: 2.0
+    }
+
+    Component.onCompleted: root.content = content
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
new file mode 100644
index 0000000000..15f5538637
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneFullScreenInverted.qml
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.width
+        height: parent.height
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+        state: "left"
+
+        states: [
+            State {
+                name: "nonFullScreen"
+                PropertyChanges { target: content; width: content.parent.contentWidth }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                ParallelAnimation {
+                    PropertyAnimation {
+                        property: "width"
+                        easing.type: Easing.Linear
+                        duration: 250
+                    }
+                    PropertyAnimation {
+                        property: "height"
+                        easing.type: Easing.Linear
+                        duration: 250
+                    }
+                }
+            }
+        ]
+
+        MouseArea {
+            anchors.fill: parent
+            onClicked: content.state = (content.state == "nonFullScreen") ? "baseState" : "nonFullScreen"
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+
+        onInitialized: {
+            width = parent.width
+            height = parent.height
+        }
+    }
+
+    Text {
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            bottom: parent.bottom
+            margins: 20
+        }
+        text: "Tap on the content to toggle full-screen mode"
+        color: "yellow"
+        font.pixelSize: 20
+        z: 2.0
+    }
+
+    Component.onCompleted: root.content = content
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneMove.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneMove.qml
new file mode 100644
index 0000000000..cc9c5ccc57
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneMove.qml
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property string contentType
+
+    Content {
+        id: content
+        anchors.verticalCenter: parent.verticalCenter
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+
+        SequentialAnimation on x {
+            id: animation
+            loops: Animation.Infinite
+            property int from: margin
+            property int to: 100
+            property int duration: 1500
+            running: false
+            PropertyAnimation {
+                from: animation.from
+                to: animation.to
+                duration: animation.duration
+                easing.type: Easing.InOutCubic
+            }
+            PropertyAnimation {
+                from: animation.to
+                to: animation.from
+                duration: animation.duration
+                easing.type: Easing.InOutCubic
+            }
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    onWidthChanged: {
+        animation.to = root.width - content.width - margin
+        animation.start()
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneMulti.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
new file mode 100644
index 0000000000..9717fbec56
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneMulti.qml
@@ -0,0 +1,204 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+
+    property real itemWidth: (width / 3) - 40
+    property real itemTopMargin: 50
+
+    QtObject {
+        id: contentProxy
+        function initialize() {
+            video1.initialize()
+            video2.initialize()
+        }
+    }
+
+    Component {
+        id: startStopComponent
+
+        Rectangle {
+            id: root
+            color: "transparent"
+
+            function content() {
+                return root.parent
+            }
+
+            Text {
+                anchors {
+                    horizontalCenter: parent.horizontalCenter
+                    bottom: parent.bottom
+                    margins: 20
+                }
+                text: content() ? content().started ? "Tap to stop" : "Tap to start" : ""
+                color: "yellow"
+                font.pixelSize: 20
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: {
+                    if (content().started)
+                        content().stop()
+                    else
+                        content().start()
+                }
+            }
+        }
+    }
+
+    Content {
+        id: video1
+        anchors {
+            left: parent.left
+            leftMargin: 10
+            top: parent.top
+            topMargin: root.itemTopMargin
+        }
+        autoStart: false
+        contentType: "video"
+        showBorder: true
+        showFrameRate: started
+        source: parent.source1
+        width: itemWidth
+        volume: parent.volume
+
+        Loader {
+            id: video1StartStopLoader
+            onLoaded: {
+                item.parent = video1
+                item.anchors.fill = video1
+            }
+        }
+
+        onInitialized: video1StartStopLoader.sourceComponent = startStopComponent
+    }
+
+    Rectangle {
+        id: cameraHolder
+        anchors {
+            horizontalCenter: parent.horizontalCenter
+            top: parent.top
+            topMargin: root.itemTopMargin
+        }
+        border.width: 1
+        border.color: "white"
+        color: "transparent"
+        width: itemWidth
+        height: width
+        property bool started: false
+
+        Loader {
+            id: cameraLoader
+            onLoaded: {
+                item.parent = cameraHolder
+                item.centerIn = cameraHolder
+                item.contentType = "camera"
+                item.showFrameRate = true
+                item.width = itemWidth
+                item.z = 1.0
+                cameraErrorConnection.target = item
+                item.initialize()
+            }
+        }
+
+        Loader {
+            id: cameraStartStopLoader
+            sourceComponent: startStopComponent
+            onLoaded: {
+                item.parent = cameraHolder
+                item.anchors.fill = cameraHolder
+                item.z = 2.0
+            }
+        }
+
+        Connections {
+            id: cameraErrorConnection
+            onError: {
+                console.log("[qmlvideo] SceneMulti.camera.onError")
+                cameraHolder.stop()
+            }
+        }
+
+        function start() {
+            cameraLoader.source = "Content.qml"
+            cameraHolder.started = true
+        }
+
+        function stop() {
+            cameraLoader.source = ""
+            cameraHolder.started = false
+        }
+    }
+
+    Content {
+        id: video2
+        anchors {
+            right: parent.right
+            rightMargin: 10
+            top: parent.top
+            topMargin: root.itemTopMargin
+        }
+        autoStart: false
+        contentType: "video"
+        showBorder: true
+        showFrameRate: started
+        source: parent.source2
+        width: itemWidth
+        volume: parent.volume
+
+        Loader {
+            id: video2StartStopLoader
+            onLoaded: {
+                item.parent = video2
+                item.anchors.fill = video2
+            }
+        }
+
+        onInitialized: video2StartStopLoader.sourceComponent = startStopComponent
+    }
+
+    Component.onCompleted: root.content = contentProxy
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
new file mode 100644
index 0000000000..35ab70cc53
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneOverlay.qml
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Rectangle {
+        id: overlay
+        y: 0.5 * parent.height
+        width: content.width
+        height: content.height
+        color: "yellow"
+        opacity: 0.5
+
+        SequentialAnimation on x {
+            id: xAnimation
+            loops: Animation.Infinite
+            property int from: margin
+            property int to: 100
+            property int duration: 1500
+            running: false
+            PropertyAnimation {
+                from: xAnimation.from
+                to: xAnimation.to
+                duration: xAnimation.duration
+                easing.type: Easing.InOutCubic
+            }
+            PropertyAnimation {
+                from: xAnimation.to
+                to: xAnimation.from
+                duration: xAnimation.duration
+                easing.type: Easing.InOutCubic
+            }
+        }
+
+        SequentialAnimation on y {
+            id: yAnimation
+            loops: Animation.Infinite
+            property int from: margin
+            property int to: 180
+            property int duration: 1500
+            running: false
+            PropertyAnimation {
+                from: yAnimation.from
+                to: yAnimation.to
+                duration: yAnimation.duration
+                easing.type: Easing.InOutCubic
+            }
+            PropertyAnimation {
+                from: yAnimation.to
+                to: yAnimation.from
+                duration: yAnimation.duration
+                easing.type: Easing.InOutCubic
+            }
+        }
+    }
+
+    onWidthChanged: {
+        xAnimation.to = root.width - content.width - margin
+        xAnimation.start()
+    }
+
+    onHeightChanged: {
+        //yAnimation.to = root.height - content.height - margin
+        yAnimation.start()
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneResize.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneResize.qml
new file mode 100644
index 0000000000..41229783e3
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneResize.qml
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+
+        SequentialAnimation on scale {
+            id: animation
+            loops: Animation.Infinite
+            property int duration: 1500
+            running: true
+            PropertyAnimation {
+                from: 1.5
+                to: 0.5
+                duration: animation.duration
+                easing.type: Easing.InOutCubic
+            }
+            PropertyAnimation {
+                from: 0.5
+                to: 1.5
+                duration: animation.duration
+                easing.type: Easing.InOutCubic
+            }
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneRotate.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
new file mode 100644
index 0000000000..f76d68f89d
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneRotate.qml
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property int delta: 30
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Button {
+        id: rotatePositiveButton
+        anchors {
+            right: parent.right
+            bottom: rotateNegativeButton.top
+            margins: parent.margins
+        }
+        width: 90
+        height: root.buttonHeight
+        text: "Rotate +" + delta
+        onClicked: content.rotation = content.rotation + delta
+    }
+
+    Button {
+        id: rotateNegativeButton
+        anchors {
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+            margins: parent.margins
+        }
+        width: 90
+        height: root.buttonHeight
+        text: "Rotate -" + delta
+        onClicked: content.rotation = content.rotation - delta
+    }
+
+    Button {
+        id: rotateValueButton
+        anchors {
+            left: parent.left
+            verticalCenter: parent.verticalCenter
+            margins: parent.margins
+        }
+        width: 30
+        height: root.buttonHeight
+        enabled: false
+        text: content.rotation % 360
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
new file mode 100644
index 0000000000..5cbc57d77b
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    property int itemHeight: 25
+    property string sceneSource: ""
+
+    ListModel {
+        id: list
+        ListElement { name: "multi"; source: "SceneMulti.qml" }
+        ListElement { name: "video"; source: "VideoBasic.qml" }
+        ListElement { name: "video-drag"; source: "VideoDrag.qml" }
+        ListElement { name: "video-fillmode"; source: "VideoFillMode.qml" }
+        ListElement { name: "video-fullscreen"; source: "VideoFullScreen.qml" }
+        ListElement { name: "video-fullscreen-inverted"; source: "VideoFullScreenInverted.qml" }
+        ListElement { name: "video-metadata"; source: "VideoMetadata.qml" }
+        ListElement { name: "video-move"; source: "VideoMove.qml" }
+        ListElement { name: "video-overlay"; source: "VideoOverlay.qml" }
+        ListElement { name: "video-playbackrate"; source: "VideoPlaybackRate.qml" }
+        ListElement { name: "video-resize"; source: "VideoResize.qml" }
+        ListElement { name: "video-rotate"; source: "VideoRotate.qml" }
+        ListElement { name: "video-spin"; source: "VideoSpin.qml" }
+        ListElement { name: "video-seek"; source: "VideoSeek.qml" }
+        ListElement { name: "camera"; source: "CameraBasic.qml" }
+        ListElement { name: "camera-drag"; source: "CameraDrag.qml" }
+        ListElement { name: "camera-fullscreen"; source: "CameraFullScreen.qml" }
+        ListElement { name: "camera-fullscreen-inverted"; source: "CameraFullScreenInverted.qml" }
+        ListElement { name: "camera-move"; source: "CameraMove.qml" }
+        ListElement { name: "camera-overlay"; source: "CameraOverlay.qml" }
+        ListElement { name: "camera-resize"; source: "CameraResize.qml" }
+        ListElement { name: "camera-rotate"; source: "CameraRotate.qml" }
+        ListElement { name: "camera-spin"; source: "CameraSpin.qml" }
+    }
+
+    Component {
+        id: delegate
+        Item {
+            id: delegateItem
+            width: root.width
+            height: itemHeight
+
+            Button {
+                id: selectorItem
+                anchors.centerIn: parent
+                width: 0.9 * parent.width
+                height: 0.8 * itemHeight
+                text: name
+                onClicked: root.sceneSource = source
+            }
+        }
+    }
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: (itemHeight * list.count) + layout.anchors.topMargin + layout.spacing
+        clip: true
+
+        Column {
+            id: layout
+
+            anchors {
+                fill: parent
+                topMargin: 10
+            }
+
+            Repeater {
+                model: list
+                delegate: delegate
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SceneSpin.qml b/demos/video/qmlvideo/qml/qmlvideo/SceneSpin.qml
new file mode 100644
index 0000000000..22adbb13a1
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SceneSpin.qml
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property string contentType
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: root.contentType
+        source: parent.source1
+        volume: parent.volume
+
+        PropertyAnimation on rotation {
+            id: animation
+            loops: Animation.Infinite
+            running: true
+            from: 0
+            to: 360
+            duration: 3000
+            easing.type: Easing.Linear
+        }
+
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/SeekControl.qml b/demos/video/qmlvideo/qml/qmlvideo/SeekControl.qml
new file mode 100644
index 0000000000..dfbfe794e9
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/SeekControl.qml
@@ -0,0 +1,143 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import Qt 4.7
+
+Item {
+    id: seekControl
+    height: 46
+    property int duration: 0
+    property int playPosition: 0
+    property int seekPosition: 0
+    property bool enabled: true
+    property bool seeking: false
+
+    Rectangle {
+        id: background
+        anchors.fill: parent
+        color: "black"
+        opacity: 0.3
+    }
+
+    Rectangle {
+        id: progressBar
+        anchors { left: parent.left; top: parent.top; bottom: parent.bottom }
+        width: seekControl.duration == 0 ? 0 : background.width * seekControl.playPosition / seekControl.duration
+        color: "black"
+        opacity: 0.7
+    }
+
+    Text {
+        width: 90
+        anchors { left: parent.left; top: parent.top; bottom: parent.bottom; leftMargin: 10 }
+        font { family: "Nokia Sans S60"; pixelSize: 24 }
+        horizontalAlignment: Text.AlignLeft
+        verticalAlignment: Text.AlignVCenter
+        color: "white"
+        smooth: true
+        text: formatTime(playPosition)
+    }
+
+    Text {
+        width: 90
+        anchors { right: parent.right; top: parent.top; bottom: parent.bottom; rightMargin: 10 }
+        font { family: "Nokia Sans S60"; pixelSize: 24 }
+        horizontalAlignment: Text.AlignRight
+        verticalAlignment: Text.AlignVCenter
+        color: "white"
+        smooth: true
+        text: formatTime(duration)
+    }
+
+    Image {
+        id: progressHandle
+        height: 46
+        width: 10
+        source: mouseArea.pressed ? "qrc:/images/progress_handle_pressed.svg" : "qrc:/images/progress_handle.svg"
+        anchors.verticalCenter: progressBar.verticalCenter
+        x: seekControl.duration == 0 ? 0 : seekControl.playPosition / seekControl.duration * 630
+
+        MouseArea {
+            id: mouseArea
+            anchors { horizontalCenter: parent.horizontalCenter; bottom: parent.bottom }
+            height: 46+16
+            width: height
+            enabled: seekControl.enabled
+            drag {
+                target: progressHandle
+                axis: Drag.XAxis
+                minimumX: 0
+                maximumX: 631
+            }
+            onPressed: {
+                seekControl.seeking = true;
+            }
+            onCanceled: {
+                seekControl.seekPosition = progressHandle.x * seekControl.duration / 630
+                seekControl.seeking = false
+            }
+            onReleased: {
+                seekControl.seekPosition = progressHandle.x * seekControl.duration / 630
+                seekControl.seeking = false
+                mouse.accepted = true
+            }
+        }
+    }
+
+    Timer { // Update position also while user is dragging the progress handle
+        id: seekTimer
+        repeat: true
+        interval: 300
+        running: seekControl.seeking
+        onTriggered: {
+            seekControl.seekPosition = progressHandle.x*seekControl.duration/630
+        }
+    }
+
+    function formatTime(timeInMs) {
+        if (!timeInMs || timeInMs <= 0) return "0:00"
+        var seconds = timeInMs / 1000;
+        var minutes = Math.floor(seconds / 60)
+        seconds = Math.floor(seconds % 60)
+        if (seconds < 10) seconds = "0" + seconds;
+        return minutes + ":" + seconds
+    }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoBasic.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
new file mode 100644
index 0000000000..4eb254d513
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoBasic.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneBasic {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoDrag.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoDrag.qml
new file mode 100644
index 0000000000..a2e18b23cf
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoDrag.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneDrag {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoDummy.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
new file mode 100644
index 0000000000..c3616eaba3
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoDummy.qml
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+// Item which is loaded by VideoItem if QtMultimediaKit is not available
+Rectangle {
+    id: root
+    color: "grey"
+    height: width
+    property int duration: 0
+    property int position: 0
+    property string source
+    property real volume: 1.0
+    property real playbackRate: 1.0
+
+    signal fatalError
+    signal sizeChanged
+    signal framePainted
+
+    Text {
+        anchors.fill: parent
+        anchors.margins: 10
+        color: "white"
+        horizontalAlignment: Text.AlignHCenter
+        text: "Failed to create Video item\n\nCheck that QtMultimediaKit is installed"
+        verticalAlignment: Text.AlignVCenter
+        wrapMode: Text.Wrap
+    }
+
+    onWidthChanged: height = width
+    onHeightChanged: root.sizeChanged()
+
+    function start() { }
+    function stop() { }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
new file mode 100644
index 0000000000..4688c11cfa
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoFillMode.qml
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Scene {
+    id: root
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: "video"
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Button {
+        id: button
+        anchors {
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+            margins: parent.margins
+        }
+        width: 150
+        height: root.buttonHeight
+        text: "PreserveAspectFit"
+        onClicked: {
+            if (!content.dummy) {
+                var video = content.contentItem()
+                if (video.fillMode == Video.Stretch) {
+                    video.fillMode = Video.PreserveAspectFit
+                    text = "PreserveAspectFit"
+                } else if (video.fillMode == Video.PreserveAspectFit) {
+                    video.fillMode = Video.PreserveAspectCrop
+                    text = "PreserveAspectCrop"
+                } else {
+                    video.fillMode = Video.Stretch
+                    text = "Stretch"
+                }
+            }
+        }
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml
new file mode 100644
index 0000000000..98b1dd0032
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreen.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneFullScreen {
+    contentType: "video"
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml
new file mode 100644
index 0000000000..18f271564f
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoFullScreenInverted.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneFullScreenInverted {
+    contentType: "video"
+}
+
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoItem.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoItem.qml
new file mode 100644
index 0000000000..c240ca88d7
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoItem.qml
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Video {
+    id: root
+    autoLoad: false
+    height: width
+
+    signal sizeChanged
+    signal fatalError
+
+    onHeightChanged: root.sizeChanged()
+    onError: {
+        if (Video.NoError != error) {
+            console.log("[qmlvideo] VideoItem.onError error " + error + " errorString " + errorString)
+            root.fatalError()
+        }
+    }
+
+    function start() { play() }
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
new file mode 100644
index 0000000000..1ef0816cd8
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoMetadata.qml
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    contentType: "video"
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: "video"
+        source: parent.source1
+        volume: parent.volume
+        onInitialized: {
+            if (!dummy)
+                metadata.createObject(root)
+        }
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Component {
+        id: metadata
+        Column {
+            anchors.fill: parent
+            Text {
+                color: "yellow"
+                text: "Title:" + content.contentItem().metaData.title
+            }
+            Text {
+                color: "yellow"
+                text: "Size:" + content.contentItem().metaData.size
+            }
+            Text {
+                color: "yellow"
+                text: "Resolution:" + content.contentItem().metaData.resolution
+            }
+            Text {
+                color: "yellow"
+                text: "Media type:" + content.contentItem().metaData.mediaType
+            }
+            Text {
+                color: "yellow"
+                text: "Video codec:" + content.contentItem().metaData.videoCodec
+            }
+            Text {
+                color: "yellow"
+                text: "Video bit rate:" + content.contentItem().metaData.videoBitRate
+            }
+            Text {
+                color: "yellow"
+                text: "Video frame rate:" +content.contentItem().metaData.videoFrameRate
+            }
+            Text {
+                color: "yellow"
+                text: "Audio codec:" + content.contentItem().metaData.audioCodec
+            }
+            Text {
+                color: "yellow"
+                text: "Audio bit rate:" + content.contentItem().metaData.audioBitRate
+            }
+            Text {
+                color: "yellow"
+                text: "Date:" + content.contentItem().metaData.date
+            }
+            Text {
+                color: "yellow"
+                text: "Description:" + content.contentItem().metaData.description
+            }
+            Text {
+                color: "yellow"
+                text: "Copyright:" + content.contentItem().metaData.copyright
+            }
+            Text {
+                color: "yellow"
+                text: "Seekable:" + content.contentItem().metaData.seekable
+            }
+        }
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoMove.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoMove.qml
new file mode 100644
index 0000000000..dd9f4b7e80
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoMove.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneMove {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml
new file mode 100644
index 0000000000..65bbf11c74
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoOverlay.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneOverlay {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
new file mode 100644
index 0000000000..4d3a6c9027
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoPlaybackRate.qml
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property int margin: 20
+    property real delta: 0.1
+    property string contentType: "video"
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: "video"
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    Button {
+        id: increaseButton
+        anchors {
+            right: parent.right
+            bottom: decreaseButton.top
+            margins: parent.margins
+        }
+        width: 90
+        height: root.buttonHeight
+        text: "Increase"
+        onClicked: {
+            var video = content.contentItem()
+            video.playbackRate = video.playbackRate + delta
+        }
+    }
+
+    Button {
+        id: decreaseButton
+        anchors {
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+            margins: parent.margins
+        }
+        width: 90
+        height: root.buttonHeight
+        text: "Decrease"
+        onClicked: {
+            var video = content.contentItem()
+            video.playbackRate = video.playbackRate - delta
+        }
+    }
+
+    Button {
+        id: valueButton
+        anchors {
+            left: parent.left
+            verticalCenter: parent.verticalCenter
+            margins: parent.margins
+        }
+        width: 50
+        height: root.buttonHeight
+        enabled: false
+        text: Math.round(10 * content.contentItem().playbackRate) / 10
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoResize.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoResize.qml
new file mode 100644
index 0000000000..98b757addd
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoResize.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneResize {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoRotate.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoRotate.qml
new file mode 100644
index 0000000000..32800a9913
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoRotate.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneRotate {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoSeek.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
new file mode 100644
index 0000000000..06397d5786
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoSeek.qml
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Scene {
+    id: root
+    property string contentType: "video"
+
+    Content {
+        id: content
+        anchors.centerIn: parent
+        width: parent.contentWidth
+        contentType: "video"
+        source: parent.source1
+        volume: parent.volume
+        onVideoFramePainted: root.videoFramePainted()
+    }
+
+    SeekControl {
+        anchors {
+            left: parent.left
+            right: parent.right
+            leftMargin: 100
+            rightMargin: 140
+            bottom: parent.bottom
+        }
+        duration: content.contentItem() ? content.contentItem().duration : 0
+        playPosition: content.contentItem() ? content.contentItem().position : 0
+        onSeekPositionChanged: { content.contentItem().position = seekPosition }
+    }
+
+    Component.onCompleted: root.content = content
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/VideoSpin.qml b/demos/video/qmlvideo/qml/qmlvideo/VideoSpin.qml
new file mode 100644
index 0000000000..8e8f8957dd
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/VideoSpin.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+SceneSpin {
+    contentType: "video"
+}
diff --git a/demos/video/qmlvideo/qml/qmlvideo/main.qml b/demos/video/qmlvideo/qml/qmlvideo/main.qml
new file mode 100644
index 0000000000..e7a36c0ec0
--- /dev/null
+++ b/demos/video/qmlvideo/qml/qmlvideo/main.qml
@@ -0,0 +1,244 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    width: 640
+    height: 360
+    color: "black"
+
+    property string source1
+    property string source2
+    property color bgColor: "#002244"
+    property real volume: 0.25
+    property bool perfMonitorsLogging: false
+    property bool perfMonitorsVisible: false
+
+    QtObject {
+        id: d
+        property int itemHeight: 40
+        property int buttonHeight: 0.8 * itemHeight
+        property int margins: 10
+    }
+
+    // Create ScreenSaver element via Loader, so this app will still run if the
+    // SystemInfo module is not available
+    Loader {
+        source: "DisableScreenSaver.qml"
+    }
+
+    Loader {
+        id: performanceLoader
+
+        Connections {
+            target: inner
+            onVisibleChanged:
+                if (performanceLoader.item)
+                    performanceLoader.item.enabled = !inner.visible
+            ignoreUnknownSignals: true
+        }
+
+        function init() {
+            console.log("[qmlvideo] performanceLoader.init logging " + root.perfMonitorsLogging + " visible " + root.perfMonitorsVisible)
+            var enabled = root.perfMonitorsLogging || root.perfMonitorsVisible
+            source = enabled ? "../performancemonitor/PerformanceItem.qml" : ""
+        }
+
+        onLoaded: {
+            item.parent = root
+            item.anchors.fill = root
+            item.logging = root.perfMonitorsLogging
+            item.displayed = root.perfMonitorsVisible
+            item.enabled = false
+            item.init()
+        }
+    }
+
+    Rectangle {
+        id: inner
+        anchors.fill: parent
+        color: root.bgColor
+
+        Button {
+            id: openFile1Button
+            anchors {
+                top: parent.top
+                left: parent.left
+                right: exitButton.left
+                margins: d.margins
+            }
+            height: d.buttonHeight
+            text: (root.source1 == "") ? "Select file 1" : root.source1
+            onClicked: fileBrowser1.show()
+        }
+
+        Button {
+            id: openFile2Button
+            anchors {
+                top: openFile1Button.bottom
+                left: parent.left
+                right: exitButton.left
+                margins: d.margins
+            }
+            height: d.buttonHeight
+            text: (root.source2 == "") ? "Select file 2" : root.source2
+            onClicked: fileBrowser2.show()
+        }
+
+        Button {
+            id: exitButton
+            anchors {
+                top: parent.top
+                right: parent.right
+                margins: d.margins
+            }
+            width: 50
+            height: d.buttonHeight
+            text: "Exit"
+            onClicked: Qt.quit()
+        }
+
+        SceneSelectionPanel {
+            id: sceneSelectionPanel
+            itemHeight: d.itemHeight
+            color: "#004444"
+            anchors {
+                top: openFile2Button.bottom
+                left: parent.left
+                right: parent.right
+                bottom: parent.bottom
+                margins: d.margins
+            }
+            radius: 10
+            onSceneSourceChanged: {
+                console.log("[qmlvideo] main.onSceneSourceChanged source " + sceneSource)
+                sceneLoader.source = sceneSource
+                var scene = null
+                var innerVisible = true
+                if (sceneSource == "") {
+                    if (performanceLoader.item)
+                        performanceLoader.item.videoActive = false
+                } else {
+                    scene = sceneLoader.item
+                    if (scene) {
+                        if (scene.contentType === "video" && source1 === "") {
+                            errorDialog.show("You must first select a video file")
+                            sceneSource = ""
+                        } else {
+                            scene.parent = root
+                            scene.color = root.bgColor
+                            scene.buttonHeight = d.buttonHeight
+                            scene.source1 = source1
+                            scene.source2 = source2
+                            scene.volume = volume
+                            scene.anchors.fill = root
+                            scene.close.connect(closeScene)
+                            scene.content.initialize()
+                            innerVisible = false
+                        }
+                    }
+                }
+                videoFramePaintedConnection.target = scene
+                inner.visible = innerVisible
+            }
+        }
+    }
+
+    Loader {
+        id: sceneLoader
+    }
+
+    Connections {
+        id: videoFramePaintedConnection
+        onVideoFramePainted: {
+            if (performanceLoader.item)
+                performanceLoader.item.videoFramePainted()
+        }
+        ignoreUnknownSignals: true
+    }
+
+    FileBrowser {
+        id: fileBrowser1
+        anchors.fill: root
+        onFolderChanged: fileBrowser2.folder = folder
+        Component.onCompleted: fileSelected.connect(root.openFile1)
+    }
+
+    FileBrowser {
+        id: fileBrowser2
+        anchors.fill: root
+        onFolderChanged: fileBrowser1.folder = folder
+        Component.onCompleted: fileSelected.connect(root.openFile2)
+    }
+
+    function openFile1(path) {
+        root.source1 = path
+    }
+
+    function openFile2(path) {
+        root.source2 = path
+    }
+
+    ErrorDialog {
+        id: errorDialog
+        anchors.fill: parent
+        enabled: false
+    }
+
+    // Called from main() once root properties have been set
+    function init() {
+        performanceLoader.init()
+        fileBrowser1.folder = videoPath
+        fileBrowser2.folder = videoPath
+    }
+
+    function qmlFramePainted() {
+        if (performanceLoader.item)
+            performanceLoader.item.qmlFramePainted()
+    }
+
+    function closeScene() {
+        console.log("[qmlvideo] main.closeScene")
+        sceneSelectionPanel.sceneSource = ""
+    }
+}
diff --git a/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
new file mode 100644
index 0000000000..e82f482951
--- /dev/null
+++ b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -0,0 +1,231 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "qmlapplicationviewer.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtGui/QApplication>
+
+#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
+
+#ifdef HARMATTAN_BOOSTER
+#include <MDeclarativeCache>
+#endif
+
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+
+#include <qt_private/qdeclarativedebughelper_p.h>
+
+#if !defined(NO_JSDEBUGGER)
+#include <jsdebuggeragent.h>
+#endif
+#if !defined(NO_QMLOBSERVER)
+#include <qdeclarativeviewobserver.h>
+#endif
+
+// Enable debugging before any QDeclarativeEngine is created
+struct QmlJsDebuggingEnabler
+{
+    QmlJsDebuggingEnabler()
+    {
+        QDeclarativeDebugHelper::enableDebugging();
+    }
+};
+
+// Execute code in constructor before first QDeclarativeEngine is instantiated
+static QmlJsDebuggingEnabler enableDebuggingHelper;
+
+#endif // QMLJSDEBUGGER
+
+class QmlApplicationViewerPrivate
+{
+    QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
+
+    QString mainQmlFile;
+    QDeclarativeView *view;
+    friend class QmlApplicationViewer;
+    QString adjustPath(const QString &path);
+};
+
+QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
+{
+#ifdef Q_OS_UNIX
+#ifdef Q_OS_MAC
+    if (!QDir::isAbsolutePath(path))
+        return QCoreApplication::applicationDirPath()
+                + QLatin1String("/../Resources/") + path;
+#else
+    QString pathInInstallDir;
+    const QString applicationDirPath = QCoreApplication::applicationDirPath();
+    pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);
+
+    if (QFileInfo(pathInInstallDir).exists())
+        return pathInInstallDir;
+#endif
+#endif
+    return path;
+}
+
+QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
+    : QDeclarativeView(parent)
+    , d(new QmlApplicationViewerPrivate(this))
+{
+    connect(engine(), SIGNAL(quit()), SLOT(close()));
+    setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+#if !defined(NO_JSDEBUGGER)
+    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
+#endif
+#if !defined(NO_QMLOBSERVER)
+    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
+#endif
+#endif
+}
+
+QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView *view, QWidget *parent)
+    : QDeclarativeView(parent)
+    , d(new QmlApplicationViewerPrivate(view))
+{
+    connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
+    view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+#if !defined(NO_JSDEBUGGER)
+    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
+#endif
+#if !defined(NO_QMLOBSERVER)
+    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
+#endif
+#endif
+}
+
+QmlApplicationViewer::~QmlApplicationViewer()
+{
+    delete d;
+}
+
+QmlApplicationViewer *QmlApplicationViewer::create()
+{
+#ifdef HARMATTAN_BOOSTER
+    return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
+#else
+    return new QmlApplicationViewer();
+#endif
+}
+
+void QmlApplicationViewer::setMainQmlFile(const QString &file)
+{
+    d->mainQmlFile = d->adjustPath(file);
+    d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));
+}
+
+void QmlApplicationViewer::addImportPath(const QString &path)
+{
+    d->view->engine()->addImportPath(d->adjustPath(path));
+}
+
+void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
+{
+#if defined(Q_OS_SYMBIAN)
+    // If the version of Qt on the device is < 4.7.2, that attribute won't work
+    if (orientation != ScreenOrientationAuto) {
+        const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));
+        if (v.count() == 3 && (v.at(0).toInt() << 16 | v.at(1).toInt() << 8 | v.at(2).toInt()) < 0x040702) {
+            qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");
+            return;
+        }
+    }
+#endif // Q_OS_SYMBIAN
+
+    Qt::WidgetAttribute attribute;
+    switch (orientation) {
+#if QT_VERSION < 0x040702
+    // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
+    case ScreenOrientationLockPortrait:
+        attribute = static_cast<Qt::WidgetAttribute>(128);
+        break;
+    case ScreenOrientationLockLandscape:
+        attribute = static_cast<Qt::WidgetAttribute>(129);
+        break;
+    default:
+    case ScreenOrientationAuto:
+        attribute = static_cast<Qt::WidgetAttribute>(130);
+        break;
+#else // QT_VERSION < 0x040702
+    case ScreenOrientationLockPortrait:
+        attribute = Qt::WA_LockPortraitOrientation;
+        break;
+    case ScreenOrientationLockLandscape:
+        attribute = Qt::WA_LockLandscapeOrientation;
+        break;
+    default:
+    case ScreenOrientationAuto:
+        attribute = Qt::WA_AutoOrientation;
+        break;
+#endif // QT_VERSION < 0x040702
+    };
+    setAttribute(attribute, true);
+}
+
+void QmlApplicationViewer::showExpanded()
+{
+#if defined(Q_OS_SYMBIAN) || defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
+    d->view->showFullScreen();
+#elif defined(Q_WS_MAEMO_5)
+    d->view->showMaximized();
+#else
+    d->view->show();
+#endif
+}
+
+QApplication *createApplication(int &argc, char **argv)
+{
+#ifdef HARMATTAN_BOOSTER
+    return MDeclarativeCache::qApplication(argc, argv);
+#else
+    return new QApplication(argc, argv);
+#endif
+}
diff --git a/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h
new file mode 100644
index 0000000000..21f5feaf08
--- /dev/null
+++ b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QMLAPPLICATIONVIEWER_H
+#define QMLAPPLICATIONVIEWER_H
+
+#include <QtDeclarative/QDeclarativeView>
+
+class QmlApplicationViewer : public QDeclarativeView
+{
+    Q_OBJECT
+
+public:
+    enum ScreenOrientation {
+        ScreenOrientationLockPortrait,
+        ScreenOrientationLockLandscape,
+        ScreenOrientationAuto
+    };
+
+    explicit QmlApplicationViewer(QWidget *parent = 0);
+    virtual ~QmlApplicationViewer();
+
+    static QmlApplicationViewer *create();
+
+    void setMainQmlFile(const QString &file);
+    void addImportPath(const QString &path);
+
+    // Note that this will only have an effect on Symbian and Fremantle.
+    void setOrientation(ScreenOrientation orientation);
+
+    void showExpanded();
+
+private:
+    explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
+    class QmlApplicationViewerPrivate *d;
+};
+
+QApplication *createApplication(int &argc, char **argv);
+
+#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
new file mode 100644
index 0000000000..e0c8efe529
--- /dev/null
+++ b/demos/video/qmlvideo/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -0,0 +1,147 @@
+# Based on file auto-generated by Qt Creator (version 0x60010)
+# Modified to install into the correct destination folder
+
+include(../../../../features/basic_examples_setup.pri)
+
+QT += declarative
+
+SOURCES += $$PWD/qmlapplicationviewer.cpp
+HEADERS += $$PWD/qmlapplicationviewer.h
+INCLUDEPATH += $$PWD
+
+# Include JS debugger library if QMLJSDEBUGGER_PATH is set
+!isEmpty(QMLJSDEBUGGER_PATH) {
+    include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
+} else {
+    DEFINES -= QMLJSDEBUGGER
+}
+
+contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
+    DEFINES += HARMATTAN_BOOSTER
+}
+
+# The code below handles deployment to Symbian and Maemo, aswell as copying
+# of the application data to shadow build directories on desktop.
+
+defineTest(qtcAddDeployment) {
+for(deploymentfolder, DEPLOYMENTFOLDERS) {
+    item = item$${deploymentfolder}
+    itemsources = $${item}.sources
+    $$itemsources = $$eval($${deploymentfolder}.source)
+    itempath = $${item}.path
+    $$itempath= $$eval($${deploymentfolder}.target)
+    export($$itemsources)
+    export($$itempath)
+    DEPLOYMENT += $$item
+}
+
+MAINPROFILEPWD = $$PWD
+
+symbian {
+    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+} else:win32 {
+    copyCommand =
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+        source = $$replace(source, /, \\)
+        sourcePathSegments = $$split(source, \\)
+        target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+        target = $$replace(target, /$, )
+        target = $$target/$$last(sourcePathSegments)
+        target = $$replace(target, /, \\)
+        !isEqual(source,$$target) {
+            !isEmpty(copyCommand):copyCommand += &&
+            isEqual(QMAKE_DIR_SEP, \\) {
+                copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
+            } else {
+                source = $$replace(source, \\\\, /)
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                target = $$replace(target, \\\\, /)
+                copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
+            }
+        }
+    }
+    !isEmpty(copyCommand) {
+        copyCommand = @echo Copying application data... && $$copyCommand
+        copydeploymentfolders.commands = $$copyCommand
+        first.depends = $(first) copydeploymentfolders
+        export(first.depends)
+        export(copydeploymentfolders.commands)
+        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+    }
+} else:unix {
+    maemo5 {
+        desktopfile.files = $${TARGET}.desktop
+        desktopfile.path = /usr/share/applications/hildon
+        icon.files = $${TARGET}64.png
+        icon.path = /usr/share/icons/hicolor/64x64/apps
+    } else:!isEmpty(MEEGO_VERSION_MAJOR) {
+        desktopfile.files = $${TARGET}_harmattan.desktop
+        desktopfile.path = /usr/share/applications
+        icon.files = $${TARGET}80.png
+        icon.path = /usr/share/icons/hicolor/80x80/apps
+    } else { # Assumed to be a Desktop Unix
+        copyCommand =
+        for(deploymentfolder, DEPLOYMENTFOLDERS) {
+            source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+            source = $$replace(source, \\\\, /)
+            macx {
+                target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+            } else {
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+            }
+            target = $$replace(target, \\\\, /)
+            target = $$replace(target, /$, )
+            sourcePathSegments = $$split(source, /)
+            targetFullPath = $$target/$$last(sourcePathSegments)
+            !isEqual(source,$$targetFullPath) {
+                !isEmpty(copyCommand):copyCommand += &&
+                copyCommand += $(MKDIR) \"$$target\"
+                copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
+            }
+        }
+        !isEmpty(copyCommand) {
+            copyCommand = @echo Copying application data... && $$copyCommand
+            copydeploymentfolders.commands = $$copyCommand
+            first.depends = $(first) copydeploymentfolders
+            export(first.depends)
+            export(copydeploymentfolders.commands)
+            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+        }
+    }
+    installPrefix = $${QT_MOBILITY_DEMOS}/$${TARGET}
+    !isEmpty(MEEGO_VERSION_MAJOR): installPrefix = /opt/$${TARGET}
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        item = item$${deploymentfolder}
+        itemfiles = $${item}.files
+        $$itemfiles = $$eval($${deploymentfolder}.source)
+        itempath = $${item}.path
+        $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
+        export($$itemfiles)
+        export($$itempath)
+        INSTALLS += $$item
+    }
+
+    !isEmpty(desktopfile.path) {
+        export(icon.files)
+        export(icon.path)
+        export(desktopfile.files)
+        export(desktopfile.path)
+        INSTALLS += icon desktopfile
+    }
+
+    target.path = $${installPrefix}/bin
+    export(target.path)
+    INSTALLS += target
+}
+
+export (ICON)
+export (INSTALLS)
+export (DEPLOYMENT)
+export (TARGET.EPOCHEAPSIZE)
+export (TARGET.CAPABILITY)
+export (LIBS)
+export (QMAKE_EXTRA_TARGETS)
+}
+
diff --git a/demos/video/qmlvideo/qmlvideo.png b/demos/video/qmlvideo/qmlvideo.png
new file mode 100644
index 0000000000..707d5c4e85
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo.png
diff --git a/demos/video/qmlvideo/qmlvideo.pro b/demos/video/qmlvideo/qmlvideo.pro
new file mode 100644
index 0000000000..08dc1c9f0b
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo.pro
@@ -0,0 +1,35 @@
+TEMPLATE = app
+TARGET = qmlvideo
+
+SOURCES += main.cpp
+HEADERS += trace.h
+RESOURCES += qmlvideo.qrc
+
+qml_folder.source = qml/qmlvideo
+qml_folder.target = qml
+DEPLOYMENTFOLDERS = qml_folder
+
+images_folder.source = images
+images_folder.target =
+DEPLOYMENTFOLDERS += images_folder
+
+SNIPPETS_PATH = ../snippets
+include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
+performanceItemAddDeployment()
+
+symbian {
+    TARGET.CAPABILITY += NetworkServices UserEnvironment
+}
+
+include(qmlapplicationviewer/qmlapplicationviewer.pri)
+qtcAddDeployment()
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
+
diff --git a/demos/video/qmlvideo/qmlvideo.qrc b/demos/video/qmlvideo/qmlvideo.qrc
new file mode 100644
index 0000000000..4896b336f8
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo.qrc
@@ -0,0 +1,12 @@
+<RCC>
+    <qresource prefix="/images">
+        <file alias="leaves.jpg">images/leaves.jpg</file>
+        <file alias="close.png">images/close.png</file>
+        <file alias="folder.png">images/folder.png</file>
+        <file alias="titlebar.png">images/titlebar.png</file>
+        <file alias="titlebar.sci">images/titlebar.sci</file>
+        <file alias="up.png">images/up.png</file>
+        <file alias="progress_handle.svg">images/progress_handle.svg</file>
+        <file alias="progress_handle_pressed.svg">images/progress_handle_pressed.svg</file>
+    </qresource>
+</RCC>
diff --git a/demos/video/qmlvideo/qmlvideo.svg b/demos/video/qmlvideo/qmlvideo.svg
new file mode 100644
index 0000000000..566acfada0
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="44px"
+   version="1.1"
+   viewBox="0 0 44 44"
+   width="44px"
+   x="0px"
+   y="0px"
+   id="svg2"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="qt.svg">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 22 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="44 : 22 : 1"
+       inkscape:persp3d-origin="22 : 14.666667 : 1"
+       id="perspective2836" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="21.454545"
+     inkscape:cx="49.412871"
+     inkscape:cy="21.894358"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3" />
+  <g
+     transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
+     id="g3">
+    <path
+       d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
+       style="fill:#006225"
+       id="path5"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
+       style="fill:#80c342"
+       id="path7" />
+    <path
+       d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
+       style="fill:#006225"
+       id="path11" />
+    <path
+       d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
+       style="fill:#006225"
+       id="path13" />
+    <path
+       id="path17"
+       style="fill:#ffffff"
+       d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
+    <path
+       d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
+       style="fill:#006225"
+       id="path19" />
+    <path
+       id="path21"
+       style="fill:#006225"
+       d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
+  </g>
+</svg>
diff --git a/demos/video/qmlvideo/qmlvideo_harmattan.desktop b/demos/video/qmlvideo/qmlvideo_harmattan.desktop
new file mode 100644
index 0000000000..b2c45dd31f
--- /dev/null
+++ b/demos/video/qmlvideo/qmlvideo_harmattan.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=qmlvideo
+Exec=/opt/qmlvideo/bin/qmlvideo
+Icon=
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/README b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/README
new file mode 100644
index 0000000000..28b7e589ac
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/README
@@ -0,0 +1,6 @@
+The Debian Package qmlvideo
+----------------------------
+
+Comments regarding the Package
+
+ -- unknown <>  Thu, 20 Oct 2011 09:42:19 +0100
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/changelog b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/changelog
new file mode 100644
index 0000000000..c6240129ee
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/changelog
@@ -0,0 +1,5 @@
+qmlvideo (0.0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- unknown <>  Thu, 20 Oct 2011 09:42:19 +0100
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/compat b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/compat
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/compat
@@ -0,0 +1 @@
+7
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/control b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/control
new file mode 100644
index 0000000000..5fa88691a2
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/control
@@ -0,0 +1,14 @@
+Source: qmlvideo
+Section: user/other
+Priority: optional
+Maintainer: unknown <>
+Build-Depends: debhelper (>= 5), libqt4-dev
+Standards-Version: 3.7.3
+Homepage: <insert the upstream URL, if relevant>
+
+Package: qmlvideo
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
+XSBC-Maemo-Display-Name: qmlvideo
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/copyright b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/copyright
new file mode 100644
index 0000000000..99706fa0d4
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/copyright
@@ -0,0 +1,40 @@
+This package was debianized by unknown <> on
+Thu, 20 Oct 2011 09:42:19 +0100.
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+    <put author's name and email here>
+    <likewise for another author>
+
+Copyright:
+
+    <Copyright (C) YYYY Name OfAuthor>
+    <likewise for another author>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2011, unknown <> and
+is licensed under the GPL, see above.
+
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/manifest.aegis b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/manifest.aegis
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/manifest.aegis
diff --git a/demos/video/qmlvideo/qtc_packaging/debian_harmattan/rules b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/rules
new file mode 100644
index 0000000000..f7ea2a21a0
--- /dev/null
+++ b/demos/video/qmlvideo/qtc_packaging/debian_harmattan/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+
+configure-stamp:
+	dh_testdir
+	# qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp
+	dh_testdir
+
+	# Add here commands to compile the package.
+	# $(MAKE) # Uncomment this line for use without Qt Creator
+	#docbook-to-man debian/qmlvideo.sgml > qmlvideo.1
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/qmlvideo.
+	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/qmlvideo install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	# dh_shlibdeps # Uncomment this line for use without Qt Creator
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
diff --git a/demos/video/qmlvideo/trace.h b/demos/video/qmlvideo/trace.h
new file mode 100644
index 0000000000..2705bbafa6
--- /dev/null
+++ b/demos/video/qmlvideo/trace.h
@@ -0,0 +1,95 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef TRACE_H
+#define TRACE_H
+
+#include <QtCore/QDebug>
+
+#define ENABLE_TRACE
+//#define VERBOSE_TRACE
+
+namespace Trace {
+
+class NullDebug
+{
+public:
+    template <typename T>
+    NullDebug& operator<<(const T&) { return *this; }
+};
+
+inline NullDebug nullDebug() { return NullDebug(); }
+
+template <typename T>
+struct PtrWrapper
+{
+    PtrWrapper(const T *ptr) : m_ptr(ptr) { }
+    const T *const m_ptr;
+};
+
+} // namespace Trace
+
+template <typename T>
+inline QDebug& operator<<(QDebug &debug, const Trace::PtrWrapper<T> &wrapper)
+{
+    debug.nospace() << "[" << (void*)wrapper.m_ptr << "]";
+    return debug.space();
+}
+
+template<typename T>
+inline const void *qtVoidPtr(const T *ptr)
+{ return static_cast<const void *>(ptr); }
+
+#define qtThisPtr() qtVoidPtr(this)
+
+#ifdef ENABLE_TRACE
+        inline QDebug qtTrace() { return qDebug() << "[qmlvideo]"; }
+#    ifdef VERBOSE_TRACE
+        inline QDebug qtVerboseTrace() { return qtTrace(); }
+#    else
+        inline Trace::NullDebug qtVerboseTrace() { return Trace::nullDebug(); }
+#    endif
+#else
+    inline Trace::NullDebug qtTrace() { return Trace::nullDebug(); }
+    inline Trace::NullDebug qtVerboseTrace() { return Trace::nullDebug(); }
+#endif
+
+#endif // TRACE_H
diff --git a/demos/video/qmlvideofx/filereader.cpp b/demos/video/qmlvideofx/filereader.cpp
new file mode 100644
index 0000000000..426e10a343
--- /dev/null
+++ b/demos/video/qmlvideofx/filereader.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "filereader.h"
+#include "trace.h"
+#include <QtCore/QCoreApplication>
+#include <QtCore/QFile>
+#include <QtCore/QFileInfo>
+#include <QtCore/QTextStream>
+
+QString adjustPath(const QString &path)
+{
+#ifdef Q_OS_UNIX
+#ifdef Q_OS_MAC
+    if (!QDir::isAbsolutePath(path))
+        return QCoreApplication::applicationDirPath()
+                + QLatin1String("/../Resources/") + path;
+#else
+    QString pathInInstallDir;
+    const QString applicationDirPath = QCoreApplication::applicationDirPath();
+    pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);
+
+    if (QFileInfo(pathInInstallDir).exists())
+        return pathInInstallDir;
+#endif
+#endif
+    return path;
+}
+
+QString FileReader::readFile(const QString &fileName)
+{
+    qtTrace() << "FileReader::readFile" << "fileName" << fileName << "adjusted" << adjustPath(fileName);
+    QString content;
+    QFile file(adjustPath(fileName));
+    if (file.open(QIODevice::ReadOnly)) {
+        QTextStream stream(&file);
+        content = stream.readAll();
+    }
+    return content;
+}
diff --git a/demos/video/qmlvideofx/filereader.h b/demos/video/qmlvideofx/filereader.h
new file mode 100644
index 0000000000..ff4ff35345
--- /dev/null
+++ b/demos/video/qmlvideofx/filereader.h
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtCore/QObject>
+
+class FileReader : public QObject
+{
+    Q_OBJECT
+public:
+    Q_INVOKABLE QString readFile(const QString &fileName);
+};
+
diff --git a/demos/video/qmlvideofx/images/close.png b/demos/video/qmlvideofx/images/close.png
new file mode 100644
index 0000000000..6904df0e44
--- /dev/null
+++ b/demos/video/qmlvideofx/images/close.png
diff --git a/demos/video/qmlvideofx/images/folder.png b/demos/video/qmlvideofx/images/folder.png
new file mode 100644
index 0000000000..e53e2ad464
--- /dev/null
+++ b/demos/video/qmlvideofx/images/folder.png
diff --git a/demos/video/qmlvideofx/images/qt-logo.png b/demos/video/qmlvideofx/images/qt-logo.png
new file mode 100644
index 0000000000..7d3e97eb36
--- /dev/null
+++ b/demos/video/qmlvideofx/images/qt-logo.png
diff --git a/demos/video/qmlvideofx/images/titlebar.png b/demos/video/qmlvideofx/images/titlebar.png
new file mode 100644
index 0000000000..51c90082d0
--- /dev/null
+++ b/demos/video/qmlvideofx/images/titlebar.png
diff --git a/demos/video/qmlvideofx/images/titlebar.sci b/demos/video/qmlvideofx/images/titlebar.sci
new file mode 100644
index 0000000000..0418d94cd6
--- /dev/null
+++ b/demos/video/qmlvideofx/images/titlebar.sci
@@ -0,0 +1,5 @@
+border.left: 10
+border.top: 12
+border.bottom: 12
+border.right: 10
+source: titlebar.png
diff --git a/demos/video/qmlvideofx/images/up.png b/demos/video/qmlvideofx/images/up.png
new file mode 100644
index 0000000000..b05f8025d0
--- /dev/null
+++ b/demos/video/qmlvideofx/images/up.png
diff --git a/demos/video/qmlvideofx/main.cpp b/demos/video/qmlvideofx/main.cpp
new file mode 100644
index 0000000000..7f9295e0a1
--- /dev/null
+++ b/demos/video/qmlvideofx/main.cpp
@@ -0,0 +1,168 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopServices>
+#include <QtGui/QGraphicsObject>
+#include "filereader.h"
+#include "qmlapplicationviewer.h"
+#include "trace.h"
+
+#ifdef SMALL_SCREEN_LAYOUT
+    static const QLatin1String MainQmlFile("main-smallscreen.qml");
+#else
+    static const QLatin1String MainQmlFile("main-largescreen.qml");
+#endif
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+#include "painteventmonitor.h"
+#include "performancemonitordeclarative.h"
+#endif
+
+#ifndef USE_OPENGL_GRAPHICS_SYSTEM
+#include <QtOpenGL/QGLWidget>
+#include <QtOpenGL/qgl.h>
+#endif
+
+int main(int argc, char *argv[])
+{
+#ifdef USE_OPENGL_GRAPHICS_SYSTEM
+    QApplication::setGraphicsSystem("opengl");
+#endif
+
+    QApplication app(argc, argv);
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    PerformanceMonitor::qmlRegisterTypes();
+#endif
+
+    QUrl fileName;
+    qreal volume = 0.5;
+    QStringList args = app.arguments();
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    PerformanceMonitor::State performanceMonitorState;
+#endif
+    for (int i=1; i<args.count(); ++i) {
+        const QString &arg = args.at(i);
+        if (arg.startsWith('-')) {
+            if ("-volume" == arg) {
+                if (i+1 < args.count())
+                    volume = 0.01 * args.at(++i).toInt();
+                else
+                    qtTrace() << "Option \"-volume\" takes a value";
+            }
+#ifdef PERFORMANCEMONITOR_SUPPORT
+            else if (PerformanceMonitor::parseArgument(arg, performanceMonitorState)) {
+                // Do nothing
+            }
+#endif
+            else {
+                qtTrace() << "Option" << arg << "ignored";
+            }
+        } else {
+            if (fileName.isEmpty())
+                fileName = QUrl::fromLocalFile(arg);
+            else
+                qtTrace() << "Argument" << arg << "ignored";
+        }
+    }
+
+    QmlApplicationViewer viewer;
+
+#ifndef USE_OPENGL_GRAPHICS_SYSTEM
+    QGLFormat format = QGLFormat::defaultFormat();
+    format.setSampleBuffers(false);
+    format.setSwapInterval(1);
+    QGLWidget* glWidget = new QGLWidget(format);
+    glWidget->setAutoFillBackground(false);
+    viewer.setViewport(glWidget);
+#endif
+
+    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
+    viewer.setMainQmlFile(QLatin1String("qml/qmlvideofx/") + MainQmlFile);
+    viewer.setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    QGraphicsObject *rootObject = viewer.rootObject();
+    rootObject->setProperty("fileName", fileName);
+    viewer.rootObject()->setProperty("volume", volume);
+
+#ifdef PERFORMANCEMONITOR_SUPPORT
+    if (performanceMonitorState.valid) {
+        rootObject->setProperty("perfMonitorsLogging", performanceMonitorState.logging);
+        rootObject->setProperty("perfMonitorsVisible", performanceMonitorState.visible);
+    }
+    PaintEventMonitor paintEventMonitor;
+    paintEventMonitor.setTarget(viewer.viewport());
+    QObject::connect(&paintEventMonitor, SIGNAL(targetPainted()),
+                     rootObject, SLOT(qmlFramePainted()));
+#endif
+
+    FileReader fileReader;
+    viewer.rootContext()->setContextProperty("fileReader", &fileReader);
+
+    QString imagePath = "../../images";
+    const QString picturesLocation = QDesktopServices::storageLocation(QDesktopServices::PicturesLocation);
+    if (!picturesLocation.isEmpty())
+        imagePath = picturesLocation;
+    viewer.rootContext()->setContextProperty("imagePath", imagePath);
+
+    QString videoPath;
+    const QString moviesLocation = QDesktopServices::storageLocation(QDesktopServices::MoviesLocation);
+    if (!moviesLocation.isEmpty())
+        videoPath = moviesLocation;
+    viewer.rootContext()->setContextProperty("videoPath", videoPath);
+
+#ifdef SMALL_SCREEN_PHYSICAL
+    viewer.setOrientation(QmlApplicationViewer::ScreenOrientationLockLandscape);
+    viewer.showFullScreen();
+#else
+    viewer.showExpanded();
+#endif
+
+    // Delay invocation of init until the event loop has started, to work around
+    // a GL context issue on Harmattan: without this, we get the following error
+    // when the first ShaderEffectItem is created:
+    // "QGLShaderProgram::addShader: Program and shader are not associated with same context"
+    QMetaObject::invokeMethod(viewer.rootObject(), "init", Qt::QueuedConnection);
+
+    return app.exec();
+}
+
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Button.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Button.qml
new file mode 100644
index 0000000000..ffa17f325e
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Button.qml
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: textColor
+    radius: 0.25 * height
+
+    property string text
+    property color bgColor: "white"
+    property color bgColorSelected: "red"
+    property color textColor: "black"
+    property alias enabled: mouseArea.enabled
+
+    signal clicked
+
+    Rectangle {
+        anchors { fill: parent; margins: 1 }
+        color: mouseArea.pressed ? bgColorSelected : bgColor
+        radius: 0.25 * height
+
+        Text {
+            id: text
+            anchors.centerIn: parent
+            text: root.text
+            font.pixelSize: 0.5 * parent.height
+            color: mouseArea.pressed ? bgColor : textColor
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
+        }
+
+        MouseArea {
+            id: mouseArea
+            anchors.fill: parent
+            onClicked: {
+                root.clicked()
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Content.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Content.qml
new file mode 100644
index 0000000000..c63618b896
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Content.qml
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    id: root
+    color: "black"
+    property alias effect: effectLoader.item
+    property alias gripSize: divider.gripSize
+    property string effectSource
+    property real volume: 0.5
+
+    signal videoFramePainted
+
+    Divider {
+        id: divider
+        visible: false
+        z: 1.0
+        onValueChanged: updateDivider()
+    }
+
+    ShaderEffectSource {
+        id: theSource
+        smooth: true
+        hideSource: true
+    }
+
+    Loader {
+        id: contentLoader
+    }
+
+    Loader {
+        id: effectLoader
+        source: effectSource
+    }
+
+    Connections {
+        id: videoFramePaintedConnection
+        onFramePainted: {
+            if (performanceLoader.item)
+               root.videoFramePainted()
+        }
+        ignoreUnknownSignals: true
+    }
+
+    onWidthChanged: {
+        if (effectLoader.item)
+        effectLoader.item.targetWidth = root.width
+    }
+
+    onHeightChanged: {
+        if (effectLoader.item)
+        effectLoader.item.targetHeight = root.height
+    }
+
+    onEffectSourceChanged: {
+        console.log("[qmlvideofx] Content.onEffectSourceChanged " + effectSource)
+        effectLoader.source = effectSource
+        effectLoader.item.parent = root
+        effectLoader.item.targetWidth = root.width
+        effectLoader.item.targetHeight = root.height
+        updateSource()
+        effectLoader.item.source = theSource
+        divider.visible = effectLoader.item.divider
+        updateDivider()
+    }
+
+    function init() {
+        console.log("[qmlvideofx] Content.init")
+        openImage("qrc:/images/qt-logo.png")
+        root.effectSource = "EffectPassThrough.qml"
+    }
+
+    function updateDivider() {
+        if (effectLoader.item && effectLoader.item.divider)
+            effectLoader.item.dividerValue = divider.value
+    }
+
+    function updateSource() {
+        console.log("[qmlvideofx] Content.updateSource")
+        if (contentLoader.item) {
+            contentLoader.item.parent = root
+            contentLoader.item.anchors.fill = root
+            theSource.sourceItem = contentLoader.item
+            if (effectLoader.item)
+                effectLoader.item.anchors.fill = contentLoader.item
+        }
+    }
+
+    function openImage(path) {
+        console.log("[qmlvideofx] Content.openImage \"" + path + "\"")
+        stop()
+        contentLoader.source = "ContentImage.qml"
+        videoFramePaintedConnection.target = null
+        contentLoader.item.source = path
+        updateSource()
+    }
+
+    function openVideo(path) {
+        console.log("[qmlvideofx] Content.openVideo \"" + path + "\"")
+        stop()
+        contentLoader.source = "ContentVideo.qml"
+        videoFramePaintedConnection.target = contentLoader.item
+        contentLoader.item.source = path
+        contentLoader.item.volume = volume
+        contentLoader.item.play()
+        updateSource()
+    }
+
+    function openCamera() {
+        console.log("[qmlvideofx] Content.openCamera")
+        stop()
+        contentLoader.source = "ContentCamera.qml"
+        videoFramePaintedConnection.target = contentLoader.item
+        updateSource()
+    }
+
+    function stop() {
+        console.log("[qmlvideofx] Content.stop")
+        if (contentLoader.source == "ContentVideo.qml")
+            contentLoader.item.stop()
+        theSource.sourceItem = null
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml b/demos/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
new file mode 100644
index 0000000000..31cfdb7aec
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/ContentCamera.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Camera {
+
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml b/demos/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml
new file mode 100644
index 0000000000..180dbec25e
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/ContentImage.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Image {
+    fillMode: Image.PreserveAspectFit
+    smooth: true
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml b/demos/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
new file mode 100644
index 0000000000..533c3e2fb2
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMultimediaKit 1.1
+
+Video {
+    volume: 0.5
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml b/demos/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
new file mode 100644
index 0000000000..4e42f8f5ba
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/DisableScreenSaver.qml
@@ -0,0 +1,50 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import QtMobility.systeminfo 1.1
+
+Item {
+    ScreenSaver {
+        screenSaverInhibited: true
+    }
+}
+
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Divider.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Divider.qml
new file mode 100644
index 0000000000..5e6d6e5e51
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Divider.qml
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    anchors.fill: parent
+    color: "transparent"
+    property alias value: slider.value
+    property alias lineWidth: line.width
+    property alias gripSize: slider.gripSize
+
+    Rectangle {
+        id: line
+        anchors { top: parent.top; bottom: parent.bottom }
+        x: parent.value * parent.width - (width / 2)
+        width: 2
+        color: "red"
+    }
+
+    Slider {
+        id: slider
+        increment: 0.0
+        lineColor: "transparent"
+        fillColor: "transparent"
+        gripColor: "red"
+        anchors {
+            top: parent.top
+            topMargin: gripSize / 2
+            left: parent.left
+            right: parent.right
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Effect.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Effect.qml
new file mode 100644
index 0000000000..eba2d3c5c3
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Effect.qml
@@ -0,0 +1,76 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+ShaderEffectItem {
+    property variant source
+    property ListModel parameters: ListModel { }
+    property bool divider: true
+    property real dividerValue: 0.5
+    property real targetWidth: 0
+    property real targetHeight: 0
+    property string fragmentShaderFilename
+    property string vertexShaderFilename
+
+    QtObject {
+        id: d
+        property string fragmentShaderCommon: "
+            #ifdef GL_ES
+                precision mediump float;
+            #else
+            #   define lowp
+            #   define mediump
+            #   define highp
+            #endif // GL_ES
+        "
+    }
+
+    // The following is a workaround for the fact that ShaderEffectItem
+    // doesn't provide a way for shader programs to be read from a file,
+    // rather than being inline in the QML file
+
+    onFragmentShaderFilenameChanged:
+        fragmentShader = d.fragmentShaderCommon + fileReader.readFile(fragmentShaderFilename)
+    onVertexShaderFilenameChanged:
+        vertexShader = fileReader.readFile(vertexShaderFilename)
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
new file mode 100644
index 0000000000..11eec98815
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectBillboard.qml
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "grid spacing"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real grid: parameters.get(0).value * 10
+
+    property real step_x: 0.0015625
+    property real step_y: targetHeight ? (step_x * targetWidth / targetHeight) : 0.0
+
+    fragmentShaderFilename: "shaders/billboard.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
new file mode 100644
index 0000000000..78916fc3e9
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectBlackAndWhite.qml
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "threshold"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real threshold: parameters.get(0).value
+
+    fragmentShaderFilename: "shaders/blackandwhite.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
new file mode 100644
index 0000000000..5d764ab9ed
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectEmboss.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    fragmentShaderFilename: "shaders/emboss.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
new file mode 100644
index 0000000000..4a491b2941
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectGaussianBlur.qml
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20100909/shader-library-gaussian-blur-post-processing-filter-in-glsl/
+
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Item {
+    id: root
+    property bool divider: true
+    property real dividerValue: 0.5
+    property ListModel parameters: ListModel {
+        ListElement {
+            name: "radius"
+            value: 0.5
+        }
+    }
+
+    property alias targetWidth: verticalShader.targetWidth
+    property alias targetHeight: verticalShader.targetHeight
+    property alias source: verticalShader.source
+
+    Effect {
+        id: verticalShader
+        anchors.fill:  parent
+        dividerValue: parent.dividerValue
+        property real blurSize: 4.0 * parent.parameters.get(0).value / targetHeight
+        fragmentShaderFilename: "shaders/gaussianblur_v.fsh"
+    }
+
+    Effect {
+        id: horizontalShader
+        anchors.fill: parent
+        dividerValue: parent.dividerValue
+        property real blurSize: 4.0 * parent.parameters.get(0).value / parent.targetWidth
+        fragmentShaderFilename: "shaders/gaussianblur_h.fsh"
+        source: horizontalShaderSource
+
+        ShaderEffectSource {
+            id: horizontalShaderSource
+            sourceItem: verticalShader
+            smooth: true
+            hideSource: true
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
new file mode 100644
index 0000000000..f8ed7eea75
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectGlow.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    fragmentShaderFilename: "shaders/glow.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
new file mode 100644
index 0000000000..0252d79345
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectIsolate.qml
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "hue"
+            value: 0.5
+        }
+        ListElement {
+            name: "width"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real targetHue: parameters.get(0).value * 360
+    property real windowWidth: parameters.get(1).value * 60
+
+    fragmentShaderFilename: "shaders/isolate.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
new file mode 100644
index 0000000000..a55fa37903
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    id: root
+    divider: false
+    parameters: ListModel {
+        ListElement {
+            name: "radius"
+            value: 0.5
+        }
+        ListElement {
+            name: "diffraction"
+            value: 0.5
+        }
+    }
+
+    property real posX: -1
+    property real posY: -1
+
+    QtObject {
+        id: d
+        property real oldTargetWidth: root.targetWidth
+        property real oldTargetHeight: root.targetHeight
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real radius: parameters.get(0).value * 100
+    property real diffractionIndex: parameters.get(1).value
+
+    onTargetWidthChanged: {
+        if (posX == -1)
+            posX = targetWidth / 2
+        else if (d.oldTargetWidth != 0)
+            posX *= (targetWidth / d.oldTargetWidth)
+        d.oldTargetWidth = targetWidth
+    }
+
+    onTargetHeightChanged: {
+        if (posY == -1)
+            posY = targetHeight / 2
+        else if (d.oldTargetHeight != 0)
+            posY *= (targetHeight / d.oldTargetHeight)
+        d.oldTargetHeight = targetHeight
+    }
+
+    fragmentShaderFilename: "shaders/magnify.fsh"
+
+    MouseArea {
+        anchors.fill: parent
+        onPositionChanged: { root.posX = mouse.x; root.posY = root.targetHeight - mouse.y }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
new file mode 100644
index 0000000000..2e24a1699a
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPageCurl.qml
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    divider: false
+    parameters: ListModel {
+        ListElement {
+            name: "extent"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real curlExtent: 1.0 - parameters.get(0).value
+
+    fragmentShaderFilename: "shaders/pagecurl.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml
new file mode 100644
index 0000000000..e07427ced5
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPassThrough.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    divider: false
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
new file mode 100644
index 0000000000..8f2b2eb9d1
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "granularity"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real granularity: parameters.get(0).value * 20
+
+    fragmentShaderFilename: "shaders/pixelate.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
new file mode 100644
index 0000000000..ecd5f62cc7
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectPosterize.qml
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "gamma"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real gamma: parameters.get(0).value
+
+    property real numColors: 8.0
+
+    fragmentShaderFilename: "shaders/posterize.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
new file mode 100644
index 0000000000..c9064a43fe
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "amplitude"
+            value: 0.5
+        }
+        ListElement {
+            name: "frequency"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real amplitude: parameters.get(0).value * 0.03
+    property real n: parameters.get(1).value * 7
+
+    property real time: 0
+    NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
+
+    fragmentShaderFilename: "shaders/ripple.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml
new file mode 100644
index 0000000000..93bf657d96
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    property int itemHeight: 25
+    property string effectSource: ""
+
+    signal clicked
+
+    QtObject {
+        id: d
+        property Item selectedItem
+    }
+
+    ListModel {
+        id: sources
+        ListElement { name: "No effect"; source: "EffectPassThrough.qml" }
+        ListElement { name: "Billboard"; source: "EffectBillboard.qml" }
+        ListElement { name: "Black & white"; source: "EffectBlackAndWhite.qml" }
+        ListElement { name: "Blur"; source: "EffectGaussianBlur.qml" }
+        ListElement { name: "Edge detection"; source: "EffectSobelEdgeDetection1.qml" }
+        //ListElement { name: "Edge detection (Sobel, #2)"; source: "EffectSobelEdgeDetection2.qml" }
+        ListElement { name: "Emboss"; source: "EffectEmboss.qml" }
+        ListElement { name: "Glow"; source: "EffectGlow.qml" }
+        ListElement { name: "Isolate"; source: "EffectIsolate.qml" }
+        ListElement { name: "Magnify"; source: "EffectMagnify.qml" }
+        ListElement { name: "Page curl"; source: "EffectPageCurl.qml" }
+        ListElement { name: "Pixelate"; source: "EffectPixelate.qml" }
+        ListElement { name: "Posterize"; source: "EffectPosterize.qml" }
+        ListElement { name: "Ripple"; source: "EffectRipple.qml" }
+        ListElement { name: "Sepia"; source: "EffectSepia.qml" }
+        ListElement { name: "Sharpen"; source: "EffectSharpen.qml" }
+        ListElement { name: "Shockwave"; source: "EffectShockwave.qml" }
+        ListElement { name: "Tilt shift"; source: "EffectTiltShift.qml" }
+        ListElement { name: "Toon"; source: "EffectToon.qml" }
+        ListElement { name: "Warhol"; source: "EffectWarhol.qml" }
+        ListElement { name: "Wobble"; source: "EffectWobble.qml" }
+        ListElement { name: "Vignette"; source: "EffectVignette.qml" }
+    }
+
+    Component {
+        id: sourceDelegate
+        Item {
+            id: sourceDelegateItem
+            width: root.width
+            height: itemHeight
+
+            Button {
+                id: sourceSelectorItem
+                anchors.centerIn: parent
+                width: 0.9 * parent.width
+                height: 0.8 * itemHeight
+                text: name
+                onClicked: {
+                    if (d.selectedItem)
+                        d.selectedItem.state = "baseState"
+                    d.selectedItem = sourceDelegateItem
+                    d.selectedItem.state = "selected"
+                    effectSource = source
+                    root.clicked()
+                }
+            }
+
+            states: [
+                State {
+                    name: "selected"
+                    PropertyChanges {
+                        target: sourceSelectorItem
+                        bgColor: "#ff8888"
+                    }
+                }
+            ]
+
+            Component.onCompleted: {
+                if (name == "No effect") {
+                    state = "selected"
+                    d.selectedItem = sourceDelegateItem
+                }
+            }
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    ColorAnimation {
+                        properties: "color"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+        }
+    }
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: (itemHeight * sources.count) + layout.anchors.topMargin + layout.spacing
+        clip: true
+
+        Column {
+            id: layout
+
+            anchors {
+                fill: parent
+                topMargin: 10
+            }
+
+            Repeater {
+                model: sources
+                delegate: sourceDelegate
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
new file mode 100644
index 0000000000..0a944b91e8
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSepia.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    fragmentShaderFilename: "shaders/sepia.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
new file mode 100644
index 0000000000..5cc4c81ddb
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSharpen.qml
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "sharpness"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real amount: parameters.get(0).value * 18
+
+    fragmentShaderFilename: "shaders/sharpen.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
new file mode 100644
index 0000000000..3c26d37533
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectShockwave.qml
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    id: root
+    parameters: ListModel {
+        ListElement {
+            name: "amplitude"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real granularity: parameters.get(0).value * 20
+    property real weight: parameters.get(0).value
+
+    property real centerX
+    property real centerY
+    property real time
+
+    SequentialAnimation {
+        running: true
+        loops: Animation.Infinite
+        ScriptAction {
+            script: {
+                centerX = Math.random()
+                centerY = Math.random()
+            }
+        }
+        NumberAnimation {
+            target: root
+            property: "time"
+            from: 0
+            to: 1
+            duration: 1000
+        }
+    }
+
+    fragmentShaderFilename: "shaders/shockwave.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
new file mode 100644
index 0000000000..1e59252d60
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection1.qml
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "threshold"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real mixLevel: parameters.get(0).value
+    property real targetSize: 250 - (200 * mixLevel) // TODO: fix ...
+    property real resS: targetSize
+    property real resT: targetSize
+
+    fragmentShaderFilename: "shaders/sobeledgedetection1.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
new file mode 100644
index 0000000000..a66cad096c
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectSobelEdgeDetection2.qml
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "threshold"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real weight: parameters.get(0).value
+
+    fragmentShaderFilename: "shaders/sobeledgedetection2.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
new file mode 100644
index 0000000000..fcf5b3bd64
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectTiltShift.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    fragmentShaderFilename: "shaders/tiltshift.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
new file mode 100644
index 0000000000..5167c94070
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectToon.qml
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "threshold"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real threshold: parameters.get(0).value
+    property real targetSize: 250 - (200 * threshold) // TODO: fix ...
+    property real resS: targetSize
+    property real resT: targetSize
+
+    // TODO
+    property real magTol: 0.3
+    property real quantize: 8.0
+
+    fragmentShaderFilename: "shaders/toon.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
new file mode 100644
index 0000000000..2e3d3a092b
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectVignette.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    fragmentShaderFilename: "shaders/vignette.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
new file mode 100644
index 0000000000..ebfb2c534b
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectWarhol.qml
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    fragmentShaderFilename: "shaders/warhol.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml b/demos/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
new file mode 100644
index 0000000000..cb6f16e2de
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/EffectWobble.qml
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Effect {
+    parameters: ListModel {
+        ListElement {
+            name: "amplitude"
+            value: 0.5
+        }
+    }
+
+    // Transform slider values, and bind result to shader uniforms
+    property real amplitude: parameters.get(0).value * 0.05
+
+    property real frequency: 20
+    property real time: 0
+
+    NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }
+
+    fragmentShaderFilename: "shaders/wobble.fsh"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml b/demos/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
new file mode 100644
index 0000000000..8a50a507a8
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/FileBrowser.qml
@@ -0,0 +1,384 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import Qt.labs.folderlistmodel 1.0
+
+Rectangle {
+    id: fileBrowser
+    color: "transparent"
+
+    property string folder
+    property bool shown: (loader.sourceComponent != undefined)
+
+    signal fileSelected(string file)
+
+    function selectFile(file) {
+        if (file != "")
+            folder = loader.item.folders.folder
+        loader.sourceComponent = undefined
+        fileBrowser.fileSelected(file)
+    }
+
+    Loader {
+        id: loader
+    }
+
+    function show() {
+        loader.sourceComponent = fileBrowserComponent
+        loader.item.parent = fileBrowser
+        loader.item.anchors.fill = fileBrowser
+        loader.item.folder = fileBrowser.folder
+    }
+
+    Component {
+        id: fileBrowserComponent
+
+        Rectangle {
+            id: root
+            color: "white"
+            property bool showFocusHighlight: false
+            property variant folders: folders1
+            property variant view: view1
+            property alias folder: folders1.folder
+            property color textColor: "black"
+
+            FolderListModel {
+                id: folders1
+                folder: folder
+            }
+
+            FolderListModel {
+                id: folders2
+                folder: folder
+            }
+
+            SystemPalette {
+                id: palette
+            }
+
+            Component {
+                id: folderDelegate
+
+                Rectangle {
+                    id: wrapper
+                    function launch() {
+                        if (folders.isFolder(index))
+                            down(filePath);
+                        else
+                            fileBrowser.selectFile(filePath)
+                    }
+                    width: root.width
+                    height: 52
+                    color: "transparent"
+
+                    Rectangle {
+                        id: highlight; visible: false
+                        anchors.fill: parent
+                        color: palette.highlight
+                        gradient: Gradient {
+                            GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                            GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+                        }
+                    }
+
+                    Item {
+                        width: 48; height: 48
+                        Image {
+                            source: "qrc:/images/folder.png"
+                            anchors.centerIn: parent
+                            visible: folders.isFolder(index)
+                        }
+                    }
+
+                    Text {
+                        id: nameText
+                        anchors.fill: parent; verticalAlignment: Text.AlignVCenter
+                        text: fileName
+                        anchors.leftMargin: 54
+                        font.pixelSize: 32
+                        color: (wrapper.ListView.isCurrentItem && root.showFocusHighlight) ? palette.highlightedText : textColor
+                        elide: Text.ElideRight
+                    }
+
+                    MouseArea {
+                        id: mouseRegion
+                        anchors.fill: parent
+                        onPressed: {
+                            root.showFocusHighlight = false;
+                            wrapper.ListView.view.currentIndex = index;
+                        }
+                        onClicked: { if (folders == wrapper.ListView.view.model) launch() }
+                    }
+
+                    states: [
+                        State {
+                            name: "pressed"
+                            when: mouseRegion.pressed
+                            PropertyChanges { target: highlight; visible: true }
+                            PropertyChanges { target: nameText; color: palette.highlightedText }
+                        }
+                    ]
+                }
+            }
+
+            Rectangle {
+                id: cancelButton
+                width: 100
+                height: titleBar.height - 7
+                color: "black"
+                anchors { bottom: parent.bottom; horizontalCenter: parent.horizontalCenter }
+
+                Text {
+                    anchors { fill: parent; margins: 4 }
+                    text: "Cancel"
+                    color: "white"
+                    horizontalAlignment: Text.AlignHCenter
+                    verticalAlignment: Text.AlignVCenter
+                    font.pixelSize: 20
+                }
+
+                MouseArea {
+                    anchors.fill: parent
+                    onClicked: fileBrowser.selectFile("")
+                }
+            }
+
+            ListView {
+                id: view1
+                anchors.top: titleBar.bottom
+                anchors.bottom: cancelButton.top
+                x: 0
+                width: parent.width
+                model: folders1
+                delegate: folderDelegate
+                highlight: Rectangle {
+                    color: palette.highlight
+                    visible: root.showFocusHighlight && view1.count != 0
+                    gradient: Gradient {
+                        GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                        GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+                    }
+                    width: view1.currentItem == null ? 0 : view1.currentItem.width
+                }
+                highlightMoveSpeed: 1000
+                pressDelay: 100
+                focus: true
+                state: "current"
+                states: [
+                    State {
+                        name: "current"
+                        PropertyChanges { target: view1; x: 0 }
+                    },
+                    State {
+                        name: "exitLeft"
+                        PropertyChanges { target: view1; x: -root.width }
+                    },
+                    State {
+                        name: "exitRight"
+                        PropertyChanges { target: view1; x: root.width }
+                    }
+                ]
+                transitions: [
+                    Transition {
+                        to: "current"
+                        SequentialAnimation {
+                            NumberAnimation { properties: "x"; duration: 250 }
+                        }
+                    },
+                    Transition {
+                        NumberAnimation { properties: "x"; duration: 250 }
+                        NumberAnimation { properties: "x"; duration: 250 }
+                    }
+                ]
+                Keys.onPressed: root.keyPressed(event.key)
+            }
+
+            ListView {
+                id: view2
+                anchors.top: titleBar.bottom
+                anchors.bottom: parent.bottom
+                x: parent.width
+                width: parent.width
+                model: folders2
+                delegate: folderDelegate
+                highlight: Rectangle {
+                    color: palette.highlight
+                    visible: root.showFocusHighlight && view2.count != 0
+                    gradient: Gradient {
+                        GradientStop { id: t1; position: 0.0; color: palette.highlight }
+                        GradientStop { id: t2; position: 1.0; color: Qt.lighter(palette.highlight) }
+                    }
+                    width: view1.currentItem == null ? 0 : view1.currentItem.width
+                }
+                highlightMoveSpeed: 1000
+                pressDelay: 100
+                states: [
+                    State {
+                        name: "current"
+                        PropertyChanges { target: view2; x: 0 }
+                    },
+                    State {
+                        name: "exitLeft"
+                        PropertyChanges { target: view2; x: -root.width }
+                    },
+                    State {
+                        name: "exitRight"
+                        PropertyChanges { target: view2; x: root.width }
+                    }
+                ]
+                transitions: [
+                    Transition {
+                        to: "current"
+                        SequentialAnimation {
+                            NumberAnimation { properties: "x"; duration: 250 }
+                        }
+                    },
+                    Transition {
+                        NumberAnimation { properties: "x"; duration: 250 }
+                    }
+                ]
+                Keys.onPressed: root.keyPressed(event.key)
+            }
+
+            Keys.onPressed: {
+                root.keyPressed(event.key);
+                if (event.key == Qt.Key_Return || event.key == Qt.Key_Select || event.key == Qt.Key_Right) {
+                    view.currentItem.launch();
+                    event.accepted = true;
+                } else if (event.key == Qt.Key_Left) {
+                    up();
+                }
+            }
+
+            BorderImage {
+                source: "qrc:/images/titlebar.sci";
+                width: parent.width;
+                height: 52
+                y: -7
+                id: titleBar
+
+                Rectangle {
+                    id: upButton
+                    width: 48
+                    height: titleBar.height - 7
+                    color: "transparent"
+                    Image { anchors.centerIn: parent; source: "qrc:/images/up.png" }
+                    MouseArea { id: upRegion; anchors.centerIn: parent
+                        width: 56
+                        height: 56
+                        onClicked: if (folders.parentFolder != "") up()
+                    }
+                    states: [
+                        State {
+                            name: "pressed"
+                            when: upRegion.pressed
+                            PropertyChanges { target: upButton; color: palette.highlight }
+                        }
+                    ]
+                }
+
+                Rectangle {
+                    color: "gray"
+                    x: 48
+                    width: 1
+                    height: 44
+                }
+
+                Text {
+                    anchors.left: upButton.right; anchors.right: parent.right; height: parent.height
+                    anchors.leftMargin: 4; anchors.rightMargin: 4
+                    text: folders.folder
+                    color: "white"
+                    elide: Text.ElideLeft; horizontalAlignment: Text.AlignRight; verticalAlignment: Text.AlignVCenter
+                    font.pixelSize: 32
+                }
+            }
+
+            function down(path) {
+                if (folders == folders1) {
+                    view = view2
+                    folders = folders2;
+                    view1.state = "exitLeft";
+                } else {
+                    view = view1
+                    folders = folders1;
+                    view2.state = "exitLeft";
+                }
+                view.x = root.width;
+                view.state = "current";
+                view.focus = true;
+                folders.folder = path;
+            }
+
+            function up() {
+                var path = folders.parentFolder;
+                if (folders == folders1) {
+                    view = view2
+                    folders = folders2;
+                    view1.state = "exitRight";
+                } else {
+                    view = view1
+                    folders = folders1;
+                    view2.state = "exitRight";
+                }
+                view.x = -root.width;
+                view.state = "current";
+                view.focus = true;
+                folders.folder = path;
+            }
+
+            function keyPressed(key) {
+                switch (key) {
+                    case Qt.Key_Up:
+                    case Qt.Key_Down:
+                    case Qt.Key_Left:
+                    case Qt.Key_Right:
+                        root.showFocusHighlight = true;
+                    break;
+                    default:
+                        // do nothing
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml b/demos/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml
new file mode 100644
index 0000000000..8881c928f6
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/FileOpen.qml
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: "white"
+    property int buttonHeight: 35
+    property int topMargin: 0
+
+    signal openImage
+    signal openVideo
+    signal openCamera
+    signal close
+
+    Rectangle {
+        anchors {
+            top: parent.top;
+            topMargin: root.topMargin
+            bottom: parent.bottom;
+            horizontalCenter: parent.horizontalCenter
+        }
+        width: 0.9 * parent.width
+        color: "transparent"
+
+        Column {
+            anchors.fill: parent
+            spacing: 5
+            Button {
+                text: "Open image"
+                height: buttonHeight
+                width: parent.width
+                onClicked: root.openImage()
+            }
+            Button {
+                text: "Open video"
+                height: buttonHeight
+                width: parent.width
+                onClicked: root.openVideo()
+            }
+            Button {
+                text: "Start camera"
+                height: buttonHeight
+                width: parent.width
+                onClicked: root.openCamera()
+            }
+            Button {
+                text: "Reset"
+                height: buttonHeight
+                width: parent.width
+                onClicked: root.close()
+            }
+        }
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml b/demos/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml
new file mode 100644
index 0000000000..311f88f13f
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/HintedMouseArea.qml
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Mouse area which flashes to indicate its location on the screen
+
+import QtQuick 1.0
+
+MouseArea {
+    property alias hintColor: hintRect.color
+    property bool hintEnabled: true
+
+    Rectangle {
+        id: hintRect
+        anchors.fill: parent
+        color: "yellow"
+        opacity: 0
+
+        states: [
+            State {
+                name: "high"
+                PropertyChanges {
+                    target: hintRect
+                    opacity: 0.8
+                }
+            },
+            State {
+                name: "low"
+                PropertyChanges {
+                    target: hintRect
+                    opacity: 0.4
+                }
+            }
+        ]
+
+        transitions: [
+            Transition {
+                from: "low"
+                to: "high"
+                SequentialAnimation {
+                    NumberAnimation {
+                        properties: "opacity"
+                        easing.type: Easing.InOutSine
+                        duration: 500
+                    }
+                    ScriptAction { script: hintRect.state = "low" }
+                }
+            },
+            Transition {
+                from: "*"
+                to: "low"
+                SequentialAnimation {
+                    NumberAnimation {
+                        properties: "opacity"
+                        easing.type: Easing.InOutSine
+                        duration: 500
+                    }
+                    ScriptAction { script: hintRect.state = "high" }
+                }
+            },
+            Transition {
+                from: "*"
+                to: "baseState"
+                NumberAnimation {
+                    properties: "opacity"
+                    easing.type: Easing.InOutSine
+                    duration: 500
+                }
+            }
+        ]
+    }
+
+    onHintEnabledChanged: hintRect.state = hintEnabled ? "low" : "baseState"
+
+    Component.onCompleted: hintRect.state = "low"
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml b/demos/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml
new file mode 100644
index 0000000000..d4820cc7d4
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: "transparent"
+    height: view.model.count * sliderHeight
+    property color lineColor: "black"
+    property real gripSize: 25
+    property real spacing: 10
+    property real sliderHeight: 40
+
+    property ListModel model: ListModel { }
+
+    Rectangle {
+        anchors.fill: parent
+        color: "black"
+        opacity: 0.5
+        radius: 10
+    }
+
+    Component {
+        id: editDelegate
+
+        Rectangle {
+            id: delegate
+            width: parent.width
+            height: root.sliderHeight
+            color: "transparent"
+
+            Text {
+                id: text
+                text: name
+                color: "white"
+                anchors {
+                    top: parent.top
+                    bottom: parent.bottom
+                    left: parent.left
+                }
+                font.pixelSize: 0.5 * parent.height
+                horizontalAlignment: Text.AlignRight
+                verticalAlignment: Text.AlignVCenter
+                width: 150
+            }
+
+            Slider {
+                anchors {
+                    top: parent.top
+                    bottom: parent.bottom
+                    left: text.right
+                    leftMargin: 20
+                    right: parent.right
+                    rightMargin: 20
+                }
+                gripSize: root.gripSize
+                value: model.value
+                onValueChanged: view.model.setProperty(index, "value", value)
+            }
+        }
+    }
+
+    ListView {
+        id: view
+        anchors.fill: parent
+        model: root.model
+        delegate: editDelegate
+        interactive: false
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/Slider.qml b/demos/video/qmlvideofx/qml/qmlvideofx/Slider.qml
new file mode 100644
index 0000000000..ce07e88b0e
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/Slider.qml
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    color: "transparent"
+    radius: 5
+    property alias value: grip.value
+    property color fillColor: "white"
+    property color lineColor: "black"
+    property color gripColor: "white"
+    property real gripSize: 20
+    property real gripTolerance: 3.0
+    property real increment: 0.1
+    property bool enabled: true
+
+    Rectangle {
+        anchors { left: parent.left; right: parent.right; verticalCenter: parent.verticalCenter }
+        height: 3
+        color: displayedColor(root.lineColor)
+
+        Rectangle {
+            anchors { fill: parent; margins: 1 }
+            color: root.fillColor
+        }
+    }
+
+    MouseArea {
+        anchors.fill: parent
+        enabled: root.enabled
+        onClicked: {
+            if (parent.width) {
+                var newValue = mouse.x / parent.width
+                if (Math.abs(newValue - parent.value) > parent.increment) {
+                    if (newValue > parent.value)
+                        parent.value = Math.min(1.0, parent.value + parent.increment)
+                    else
+                        parent.value = Math.max(0.0, parent.value - parent.increment)
+                }
+            }
+        }
+    }
+
+    Rectangle {
+        id: grip
+        property real value: 0.5
+        x: (value * parent.width) - width/2
+        anchors.verticalCenter: parent.verticalCenter
+        width: root.gripTolerance * root.gripSize
+        height: width
+        radius: width/2
+        color: "transparent"
+
+        MouseArea {
+            id: mouseArea
+            enabled: root.enabled
+            anchors.fill:  parent
+            drag {
+                target: grip
+                axis: Drag.XAxis
+                minimumX: -parent.width/2
+                maximumX: root.width - parent.width/2
+            }
+            onPositionChanged:  {
+                if (drag.active)
+                    updatePosition()
+            }
+            onReleased: {
+                updatePosition()
+            }
+            function updatePosition() {
+                value = (grip.x + grip.width/2) / grip.parent.width
+            }
+        }
+
+        Rectangle {
+            anchors.centerIn: parent
+            width: root.gripSize
+            height: width
+            radius: width/2
+            color: root.gripColor
+        }
+    }
+
+    function displayedColor(c) {
+        var tint = Qt.rgba(c.r, c.g, c.b, 0.25)
+        return enabled ? c : Qt.tint(c, tint)
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml b/demos/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml
new file mode 100644
index 0000000000..5e624eaae6
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/main-largescreen.qml
@@ -0,0 +1,186 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    width: 900
+    height: 600
+    color: "grey"
+    property string fileName
+    property alias volume: content.volume
+    property bool perfMonitorsLogging: false
+    property bool perfMonitorsVisible: false
+
+    QtObject {
+        id: d
+        property real gripSize: 20
+    }
+
+    Rectangle {
+        id: inner
+        anchors.fill: parent
+        color: "grey"
+
+        Content {
+            id: content
+            anchors {
+                top: parent.top
+                bottom: parent.bottom
+                left: parent.left
+                right: effectSelectionPanel.left
+                margins: 5
+            }
+            gripSize: d.gripSize
+            width: 600
+            height: 600
+        }
+
+        Loader {
+            id: performanceLoader
+            function init() {
+                console.log("[qmlvideofx] performanceLoader.init logging " + root.perfMonitorsLogging + " visible " + root.perfMonitorsVisible)
+                var enabled = root.perfMonitorsLogging || root.perfMonitorsVisible
+                source = enabled ? "../performancemonitor/PerformanceItem.qml" : ""
+            }
+            onLoaded: {
+                item.parent = content
+                item.anchors.top = content.top
+                item.anchors.left = content.left
+                item.anchors.right = content.right
+                item.logging = root.perfMonitorsLogging
+                item.displayed = root.perfMonitorsVisible
+                item.init()
+            }
+        }
+
+        ParameterPanel {
+            id: parameterPanel
+            anchors {
+                left: parent.left
+                bottom: parent.bottom
+                right: effectSelectionPanel.left
+                margins: 20
+            }
+            gripSize: d.gripSize
+        }
+
+        EffectSelectionPanel {
+            id: effectSelectionPanel
+            anchors {
+                top: parent.top
+                bottom: fileOpen.top
+                right: parent.right
+                margins: 5
+            }
+            width: 300
+            itemHeight: 40
+             onEffectSourceChanged: {
+                content.effectSource = effectSource
+                parameterPanel.model = content.effect.parameters
+             }
+        }
+
+        FileOpen {
+            id: fileOpen
+            anchors {
+                right: parent.right
+                bottom: parent.bottom
+                margins: 5
+            }
+            width: effectSelectionPanel.width
+            height: 165
+            buttonHeight: 32
+            topMargin: 10
+        }
+    }
+
+    FileBrowser {
+        id: imageFileBrowser
+        anchors.fill: root
+        Component.onCompleted: fileSelected.connect(content.openImage)
+    }
+
+    FileBrowser {
+        id: videoFileBrowser
+        anchors.fill: root
+        Component.onCompleted: fileSelected.connect(content.openVideo)
+    }
+
+    Component.onCompleted: {
+        fileOpen.openImage.connect(openImage)
+        fileOpen.openVideo.connect(openVideo)
+        fileOpen.openCamera.connect(openCamera)
+        fileOpen.close.connect(close)
+    }
+
+    function init() {
+        console.log("[qmlvideofx] main.init")
+        imageFileBrowser.folder = imagePath
+        videoFileBrowser.folder = videoPath
+        content.init()
+        performanceLoader.init()
+        if (fileName != "")
+            content.openVideo(fileName)
+    }
+
+    function qmlFramePainted() {
+        if (performanceLoader.item)
+            performanceLoader.item.qmlFramePainted()
+    }
+
+    function openImage() {
+        imageFileBrowser.show()
+    }
+
+    function openVideo() {
+        videoFileBrowser.show()
+    }
+
+    function openCamera() {
+        content.openCamera()
+    }
+
+    function close() {
+        content.openImage("qrc:/images/qt-logo.png")
+    }
+}
diff --git a/demos/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml b/demos/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml
new file mode 100644
index 0000000000..dd03f779e4
--- /dev/null
+++ b/demos/video/qmlvideofx/qml/qmlvideofx/main-smallscreen.qml
@@ -0,0 +1,413 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    width: 640
+    height: 360
+    color: "grey"
+    property string fileName
+    property alias volume: content.volume
+    property bool perfMonitorsLogging: false
+    property bool perfMonitorsVisible: false
+
+    QtObject {
+        id: d
+        property bool dialogShown: (fileOpenContainer.state == "shown" ||
+                                    effectSelectionPanel.state == "shown" ||
+                                    videoFileBrowser.shown ||
+                                    imageFileBrowser.shown)
+        property real gripSize: 40
+    }
+
+    // Create ScreenSaver element via Loader, so this app will still run if the
+    // SystemInfo module is not available
+    Loader {
+        source: "DisableScreenSaver.qml"
+    }
+
+    Loader {
+        id: performanceLoader
+
+        Connections {
+            target: d
+            onDialogShownChanged:
+                if (performanceLoader.item)
+                    performanceLoader.item.enabled = !d.dialogShown
+            ignoreUnknownSignals: true
+        }
+
+        function init() {
+            console.log("[qmlvideofx] performanceLoader.init logging " + root.perfMonitorsLogging + " visible " + root.perfMonitorsVisible)
+            var enabled = root.perfMonitorsLogging || root.perfMonitorsVisible
+            source = enabled ? "../performancemonitor/PerformanceItem.qml" : ""
+        }
+
+        onLoaded: {
+            item.parent = root
+            item.anchors.top = root.top
+            item.anchors.topMargin = 100
+            item.anchors.left = root.left
+            item.anchors.right = root.right
+            item.anchors.bottom = root.verticalCenter
+            item.logging = root.perfMonitorsLogging
+            item.displayed = root.perfMonitorsVisible
+            item.init()
+        }
+    }
+
+    Rectangle {
+        id: inner
+        anchors.fill: parent
+        color: "grey"
+
+        Content {
+            id: content
+            anchors.fill: parent
+            gripSize: d.gripSize
+            onVideoFramePainted: performanceLoader.item.videoFramePainted()
+        }
+
+        ParameterPanel {
+            id: parameterPanel
+
+            anchors {
+                left: parent.left;
+                right: parent.right;
+                margins: 10
+            }
+            y: parent.height
+            gripSize: d.gripSize
+
+            states: [
+                State {
+                    name: "shown"
+                    PropertyChanges {
+                        target: parameterPanel
+                        y: parent.height - (parameterPanel.height + 10)
+                    }
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    NumberAnimation {
+                        properties: "y"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+
+            enabled: false
+            state: (enabled && !d.dialogShown) ? "shown" : "baseState"
+        }
+
+        EffectSelectionPanel {
+            id: effectSelectionPanel
+            anchors {
+                top: parent.top;
+                bottom: parameterPanel.top;
+                margins: 10
+            }
+            x: parent.width
+            width: parent.width - 40
+            opacity: 0.75
+            radius: 20
+            itemHeight: 50
+
+            states: [
+                State {
+                    name: "shown"
+                    PropertyChanges {
+                        target: effectSelectionPanel
+                        x: 20
+                    }
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    NumberAnimation {
+                        properties: "x"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+
+            onEffectSourceChanged: {
+                content.effectSource = effectSource
+                if (content.effect.parameters.count) {
+                    parameterPanel.model = content.effect.parameters
+                    parameterPanel.enabled = true
+                } else {
+                    parameterPanel.enabled = false
+                }
+            }
+
+            onClicked: state = "baseState"
+        }
+
+        Rectangle {
+            id: fileOpenContainer
+            anchors {
+                top: parent.top
+                bottom: parameterPanel.top
+                margins: 10
+            }
+            x: -width
+            width: parent.width - 40
+            color: "transparent"
+
+            Column {
+                anchors.fill: parent
+
+                FileOpen {
+                    id: fileOpen
+                    color: "transparent"
+                    width: parent.width
+                    height: 200
+                    opacity: 0.75
+                    radius: 20
+                    buttonHeight: 40
+                }
+
+                MouseArea {
+                    width: parent.width
+                    height: 250
+                    onClicked: fileOpenContainer.state = "baseState"
+                }
+            }
+
+            states: [
+                State {
+                    name: "shown"
+                    PropertyChanges {
+                        target: fileOpenContainer
+                        x: 20
+                    }
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    NumberAnimation {
+                        properties: "x"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+        }
+
+        Rectangle {
+            id: splashScreen
+            anchors {
+                horizontalCenter: parent.horizontalCenter
+                verticalCenter: parent.verticalCenter
+            }
+            width: 300
+            height: 200
+            radius: 0.1 * height
+            color: "white"
+            opacity: 0.9
+            border { color: "black"; width: 2 }
+
+            Text {
+                anchors {
+                    fill: parent
+                    margins: 5
+                }
+                horizontalAlignment: Text.AlignHCenter
+                verticalAlignment: Text.AlignVCenter
+                font.pixelSize: 24
+                text: "Tap on left side to switch between sources.\n\nTap on right side to switch between effects."
+                wrapMode: Text.WordWrap
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: parent.state = "hidden"
+            }
+
+            states: [
+                State {
+                    name: "hidden"
+                    PropertyChanges {
+                        target: splashScreen
+                        opacity: 0.0
+                    }
+                }
+            ]
+
+            transitions: [
+                Transition {
+                    from: "*"
+                    to: "*"
+                    NumberAnimation {
+                        properties: "opacity"
+                        easing.type: Easing.OutQuart
+                        duration: 500
+                    }
+                }
+            ]
+        }
+
+        HintedMouseArea {
+            id: fileOpenMouseArea
+            anchors {
+                left: parent.left;
+                top: parent.top;
+                bottom: parameterPanel.top;
+                topMargin: 75
+            }
+            width: 100
+            onClicked: {
+                fileOpenMouseArea.hintEnabled = false
+                effectSelectionPanelMouseArea.hintEnabled = false
+                splashScreen.state = "hidden"
+                fileOpenContainer.state = "shown"
+            }
+            enabled: !d.dialogShown
+        }
+
+        HintedMouseArea {
+            id: effectSelectionPanelMouseArea
+            anchors {
+                right: parent.right;
+                top: parent.top;
+                bottom: parameterPanel.top;
+                topMargin: 75
+            }
+            width: 100
+            onClicked: {
+                fileOpenMouseArea.hintEnabled = false
+                effectSelectionPanelMouseArea.hintEnabled = false
+                splashScreen.state = "hidden"
+                effectSelectionPanel.state = "shown"
+            }
+            enabled: !d.dialogShown
+        }
+
+        Image {
+            source: "qrc:/images/close.png"
+
+            anchors {
+                top: parent.top
+                right: parent.right
+                margins: 5
+            }
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: Qt.quit()
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        fileOpen.openImage.connect(openImage)
+        fileOpen.openVideo.connect(openVideo)
+        fileOpen.openCamera.connect(openCamera)
+        fileOpen.close.connect(close)
+    }
+
+    FileBrowser {
+        id: imageFileBrowser
+        anchors.fill: root
+        Component.onCompleted: fileSelected.connect(content.openImage)
+    }
+
+    FileBrowser {
+        id: videoFileBrowser
+        anchors.fill: root
+        Component.onCompleted: fileSelected.connect(content.openVideo)
+    }
+
+    // Called from main() once root properties have been set
+    function init() {
+        console.log("[qmlvideofx] main.init")
+        content.init()
+        performanceLoader.init()
+        imageFileBrowser.folder = imagePath
+        videoFileBrowser.folder = videoPath
+        if (fileName != "") {
+            fileOpenMouseArea.hintEnabled = false
+            effectSelectionPanelMouseArea.hintEnabled = false
+            splashScreen.state = "hidden"
+            content.openVideo(fileName)
+        }
+    }
+
+    function qmlFramePainted() {
+        if (performanceLoader.item)
+            performanceLoader.item.qmlFramePainted()
+    }
+
+    function openImage() {
+        fileOpenContainer.state = "baseState"
+        imageFileBrowser.show()
+    }
+
+    function openVideo() {
+        fileOpenContainer.state = "baseState"
+        videoFileBrowser.show()
+    }
+
+    function openCamera() {
+        fileOpenContainer.state = "baseState"
+        content.openCamera()
+    }
+
+    function close() {
+        fileOpenContainer.state = "baseState"
+        content.openImage("qrc:/images/qt-logo.png")
+    }
+}
diff --git a/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
new file mode 100644
index 0000000000..e82f482951
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.cpp
@@ -0,0 +1,231 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "qmlapplicationviewer.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QFileInfo>
+#include <QtDeclarative/QDeclarativeComponent>
+#include <QtDeclarative/QDeclarativeEngine>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtGui/QApplication>
+
+#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
+
+#ifdef HARMATTAN_BOOSTER
+#include <MDeclarativeCache>
+#endif
+
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+
+#include <qt_private/qdeclarativedebughelper_p.h>
+
+#if !defined(NO_JSDEBUGGER)
+#include <jsdebuggeragent.h>
+#endif
+#if !defined(NO_QMLOBSERVER)
+#include <qdeclarativeviewobserver.h>
+#endif
+
+// Enable debugging before any QDeclarativeEngine is created
+struct QmlJsDebuggingEnabler
+{
+    QmlJsDebuggingEnabler()
+    {
+        QDeclarativeDebugHelper::enableDebugging();
+    }
+};
+
+// Execute code in constructor before first QDeclarativeEngine is instantiated
+static QmlJsDebuggingEnabler enableDebuggingHelper;
+
+#endif // QMLJSDEBUGGER
+
+class QmlApplicationViewerPrivate
+{
+    QmlApplicationViewerPrivate(QDeclarativeView *view_) : view(view_) {}
+
+    QString mainQmlFile;
+    QDeclarativeView *view;
+    friend class QmlApplicationViewer;
+    QString adjustPath(const QString &path);
+};
+
+QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
+{
+#ifdef Q_OS_UNIX
+#ifdef Q_OS_MAC
+    if (!QDir::isAbsolutePath(path))
+        return QCoreApplication::applicationDirPath()
+                + QLatin1String("/../Resources/") + path;
+#else
+    QString pathInInstallDir;
+    const QString applicationDirPath = QCoreApplication::applicationDirPath();
+    pathInInstallDir = QString::fromAscii("%1/../%2").arg(applicationDirPath, path);
+
+    if (QFileInfo(pathInInstallDir).exists())
+        return pathInInstallDir;
+#endif
+#endif
+    return path;
+}
+
+QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
+    : QDeclarativeView(parent)
+    , d(new QmlApplicationViewerPrivate(this))
+{
+    connect(engine(), SIGNAL(quit()), SLOT(close()));
+    setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+#if !defined(NO_JSDEBUGGER)
+    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
+#endif
+#if !defined(NO_QMLOBSERVER)
+    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
+#endif
+#endif
+}
+
+QmlApplicationViewer::QmlApplicationViewer(QDeclarativeView *view, QWidget *parent)
+    : QDeclarativeView(parent)
+    , d(new QmlApplicationViewerPrivate(view))
+{
+    connect(view->engine(), SIGNAL(quit()), view, SLOT(close()));
+    view->setResizeMode(QDeclarativeView::SizeRootObjectToView);
+    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
+#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
+#if !defined(NO_JSDEBUGGER)
+    new QmlJSDebugger::JSDebuggerAgent(d->view->engine());
+#endif
+#if !defined(NO_QMLOBSERVER)
+    new QmlJSDebugger::QDeclarativeViewObserver(d->view, d->view);
+#endif
+#endif
+}
+
+QmlApplicationViewer::~QmlApplicationViewer()
+{
+    delete d;
+}
+
+QmlApplicationViewer *QmlApplicationViewer::create()
+{
+#ifdef HARMATTAN_BOOSTER
+    return new QmlApplicationViewer(MDeclarativeCache::qDeclarativeView(), 0);
+#else
+    return new QmlApplicationViewer();
+#endif
+}
+
+void QmlApplicationViewer::setMainQmlFile(const QString &file)
+{
+    d->mainQmlFile = d->adjustPath(file);
+    d->view->setSource(QUrl::fromLocalFile(d->mainQmlFile));
+}
+
+void QmlApplicationViewer::addImportPath(const QString &path)
+{
+    d->view->engine()->addImportPath(d->adjustPath(path));
+}
+
+void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
+{
+#if defined(Q_OS_SYMBIAN)
+    // If the version of Qt on the device is < 4.7.2, that attribute won't work
+    if (orientation != ScreenOrientationAuto) {
+        const QStringList v = QString::fromAscii(qVersion()).split(QLatin1Char('.'));
+        if (v.count() == 3 && (v.at(0).toInt() << 16 | v.at(1).toInt() << 8 | v.at(2).toInt()) < 0x040702) {
+            qWarning("Screen orientation locking only supported with Qt 4.7.2 and above");
+            return;
+        }
+    }
+#endif // Q_OS_SYMBIAN
+
+    Qt::WidgetAttribute attribute;
+    switch (orientation) {
+#if QT_VERSION < 0x040702
+    // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
+    case ScreenOrientationLockPortrait:
+        attribute = static_cast<Qt::WidgetAttribute>(128);
+        break;
+    case ScreenOrientationLockLandscape:
+        attribute = static_cast<Qt::WidgetAttribute>(129);
+        break;
+    default:
+    case ScreenOrientationAuto:
+        attribute = static_cast<Qt::WidgetAttribute>(130);
+        break;
+#else // QT_VERSION < 0x040702
+    case ScreenOrientationLockPortrait:
+        attribute = Qt::WA_LockPortraitOrientation;
+        break;
+    case ScreenOrientationLockLandscape:
+        attribute = Qt::WA_LockLandscapeOrientation;
+        break;
+    default:
+    case ScreenOrientationAuto:
+        attribute = Qt::WA_AutoOrientation;
+        break;
+#endif // QT_VERSION < 0x040702
+    };
+    setAttribute(attribute, true);
+}
+
+void QmlApplicationViewer::showExpanded()
+{
+#if defined(Q_OS_SYMBIAN) || defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
+    d->view->showFullScreen();
+#elif defined(Q_WS_MAEMO_5)
+    d->view->showMaximized();
+#else
+    d->view->show();
+#endif
+}
+
+QApplication *createApplication(int &argc, char **argv)
+{
+#ifdef HARMATTAN_BOOSTER
+    return MDeclarativeCache::qApplication(argc, argv);
+#else
+    return new QApplication(argc, argv);
+#endif
+}
diff --git a/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
new file mode 100644
index 0000000000..21f5feaf08
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.h
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QMLAPPLICATIONVIEWER_H
+#define QMLAPPLICATIONVIEWER_H
+
+#include <QtDeclarative/QDeclarativeView>
+
+class QmlApplicationViewer : public QDeclarativeView
+{
+    Q_OBJECT
+
+public:
+    enum ScreenOrientation {
+        ScreenOrientationLockPortrait,
+        ScreenOrientationLockLandscape,
+        ScreenOrientationAuto
+    };
+
+    explicit QmlApplicationViewer(QWidget *parent = 0);
+    virtual ~QmlApplicationViewer();
+
+    static QmlApplicationViewer *create();
+
+    void setMainQmlFile(const QString &file);
+    void addImportPath(const QString &path);
+
+    // Note that this will only have an effect on Symbian and Fremantle.
+    void setOrientation(ScreenOrientation orientation);
+
+    void showExpanded();
+
+private:
+    explicit QmlApplicationViewer(QDeclarativeView *view, QWidget *parent);
+    class QmlApplicationViewerPrivate *d;
+};
+
+QApplication *createApplication(int &argc, char **argv);
+
+#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
new file mode 100644
index 0000000000..e0c8efe529
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -0,0 +1,147 @@
+# Based on file auto-generated by Qt Creator (version 0x60010)
+# Modified to install into the correct destination folder
+
+include(../../../../features/basic_examples_setup.pri)
+
+QT += declarative
+
+SOURCES += $$PWD/qmlapplicationviewer.cpp
+HEADERS += $$PWD/qmlapplicationviewer.h
+INCLUDEPATH += $$PWD
+
+# Include JS debugger library if QMLJSDEBUGGER_PATH is set
+!isEmpty(QMLJSDEBUGGER_PATH) {
+    include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
+} else {
+    DEFINES -= QMLJSDEBUGGER
+}
+
+contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
+    DEFINES += HARMATTAN_BOOSTER
+}
+
+# The code below handles deployment to Symbian and Maemo, aswell as copying
+# of the application data to shadow build directories on desktop.
+
+defineTest(qtcAddDeployment) {
+for(deploymentfolder, DEPLOYMENTFOLDERS) {
+    item = item$${deploymentfolder}
+    itemsources = $${item}.sources
+    $$itemsources = $$eval($${deploymentfolder}.source)
+    itempath = $${item}.path
+    $$itempath= $$eval($${deploymentfolder}.target)
+    export($$itemsources)
+    export($$itempath)
+    DEPLOYMENT += $$item
+}
+
+MAINPROFILEPWD = $$PWD
+
+symbian {
+    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+} else:win32 {
+    copyCommand =
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+        source = $$replace(source, /, \\)
+        sourcePathSegments = $$split(source, \\)
+        target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+        target = $$replace(target, /$, )
+        target = $$target/$$last(sourcePathSegments)
+        target = $$replace(target, /, \\)
+        !isEqual(source,$$target) {
+            !isEmpty(copyCommand):copyCommand += &&
+            isEqual(QMAKE_DIR_SEP, \\) {
+                copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
+            } else {
+                source = $$replace(source, \\\\, /)
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                target = $$replace(target, \\\\, /)
+                copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
+            }
+        }
+    }
+    !isEmpty(copyCommand) {
+        copyCommand = @echo Copying application data... && $$copyCommand
+        copydeploymentfolders.commands = $$copyCommand
+        first.depends = $(first) copydeploymentfolders
+        export(first.depends)
+        export(copydeploymentfolders.commands)
+        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+    }
+} else:unix {
+    maemo5 {
+        desktopfile.files = $${TARGET}.desktop
+        desktopfile.path = /usr/share/applications/hildon
+        icon.files = $${TARGET}64.png
+        icon.path = /usr/share/icons/hicolor/64x64/apps
+    } else:!isEmpty(MEEGO_VERSION_MAJOR) {
+        desktopfile.files = $${TARGET}_harmattan.desktop
+        desktopfile.path = /usr/share/applications
+        icon.files = $${TARGET}80.png
+        icon.path = /usr/share/icons/hicolor/80x80/apps
+    } else { # Assumed to be a Desktop Unix
+        copyCommand =
+        for(deploymentfolder, DEPLOYMENTFOLDERS) {
+            source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+            source = $$replace(source, \\\\, /)
+            macx {
+                target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+            } else {
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+            }
+            target = $$replace(target, \\\\, /)
+            target = $$replace(target, /$, )
+            sourcePathSegments = $$split(source, /)
+            targetFullPath = $$target/$$last(sourcePathSegments)
+            !isEqual(source,$$targetFullPath) {
+                !isEmpty(copyCommand):copyCommand += &&
+                copyCommand += $(MKDIR) \"$$target\"
+                copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
+            }
+        }
+        !isEmpty(copyCommand) {
+            copyCommand = @echo Copying application data... && $$copyCommand
+            copydeploymentfolders.commands = $$copyCommand
+            first.depends = $(first) copydeploymentfolders
+            export(first.depends)
+            export(copydeploymentfolders.commands)
+            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+        }
+    }
+    installPrefix = $${QT_MOBILITY_DEMOS}/$${TARGET}
+    !isEmpty(MEEGO_VERSION_MAJOR): installPrefix = /opt/$${TARGET}
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        item = item$${deploymentfolder}
+        itemfiles = $${item}.files
+        $$itemfiles = $$eval($${deploymentfolder}.source)
+        itempath = $${item}.path
+        $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
+        export($$itemfiles)
+        export($$itempath)
+        INSTALLS += $$item
+    }
+
+    !isEmpty(desktopfile.path) {
+        export(icon.files)
+        export(icon.path)
+        export(desktopfile.files)
+        export(desktopfile.path)
+        INSTALLS += icon desktopfile
+    }
+
+    target.path = $${installPrefix}/bin
+    export(target.path)
+    INSTALLS += target
+}
+
+export (ICON)
+export (INSTALLS)
+export (DEPLOYMENT)
+export (TARGET.EPOCHEAPSIZE)
+export (TARGET.CAPABILITY)
+export (LIBS)
+export (QMAKE_EXTRA_TARGETS)
+}
+
diff --git a/demos/video/qmlvideofx/qmlvideofx.png b/demos/video/qmlvideofx/qmlvideofx.png
new file mode 100644
index 0000000000..707d5c4e85
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx.png
diff --git a/demos/video/qmlvideofx/qmlvideofx.pro b/demos/video/qmlvideofx/qmlvideofx.pro
new file mode 100644
index 0000000000..13f2d2d464
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx.pro
@@ -0,0 +1,49 @@
+TEMPLATE = app
+TARGET = qmlvideofx
+QT += opengl
+
+SOURCES += filereader.cpp \
+           main.cpp
+HEADERS += filereader.h \
+           trace.h
+RESOURCES += qmlvideofx.qrc
+
+qml_folder.source = qml/qmlvideofx
+qml_folder.target = qml
+DEPLOYMENTFOLDERS += qml_folder
+
+images_folder.source = images
+images_folder.target =
+DEPLOYMENTFOLDERS += images_folder
+
+shaders_folder.source = shaders
+shaders_folder.target =
+DEPLOYMENTFOLDERS += shaders_folder
+
+SNIPPETS_PATH = ../snippets
+include($$SNIPPETS_PATH/performancemonitor/performancemonitordeclarative.pri)
+performanceItemAddDeployment()
+
+symbian|contains(MEEGO_EDITION,harmattan): {
+    DEFINES += SMALL_SCREEN_LAYOUT
+    DEFINES += SMALL_SCREEN_PHYSICAL
+}
+
+symbian {
+    DEFINES += USE_OPENGL_GRAPHICS_SYSTEM
+    TARGET.CAPABILITY += UserEnvironment
+    TARGET.EPOCHEAPSIZE = 0x020000 0x4000000
+}
+
+include(qmlapplicationviewer/qmlapplicationviewer.pri)
+qtcAddDeployment()
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
+
diff --git a/demos/video/qmlvideofx/qmlvideofx.qrc b/demos/video/qmlvideofx/qmlvideofx.qrc
new file mode 100644
index 0000000000..6ca4ef54bf
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx.qrc
@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/images">
+        <file alias="close.png">images/close.png</file>
+        <file alias="folder.png">images/folder.png</file>
+        <file alias="titlebar.png">images/titlebar.png</file>
+        <file alias="titlebar.sci">images/titlebar.sci</file>
+        <file alias="up.png">images/up.png</file>
+        <file alias="qt-logo.png">images/qt-logo.png</file>
+    </qresource>
+</RCC>
diff --git a/demos/video/qmlvideofx/qmlvideofx.svg b/demos/video/qmlvideofx/qmlvideofx.svg
new file mode 100644
index 0000000000..566acfada0
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="44px"
+   version="1.1"
+   viewBox="0 0 44 44"
+   width="44px"
+   x="0px"
+   y="0px"
+   id="svg2"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="qt.svg">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 22 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="44 : 22 : 1"
+       inkscape:persp3d-origin="22 : 14.666667 : 1"
+       id="perspective2836" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1020"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="21.454545"
+     inkscape:cx="49.412871"
+     inkscape:cy="21.894358"
+     inkscape:window-x="-4"
+     inkscape:window-y="-4"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g3" />
+  <g
+     transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
+     id="g3">
+    <path
+       d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
+       style="fill:#006225"
+       id="path5"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
+       style="fill:#80c342"
+       id="path7" />
+    <path
+       d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
+       style="fill:#006225"
+       id="path11" />
+    <path
+       d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
+       style="fill:#006225"
+       id="path13" />
+    <path
+       id="path17"
+       style="fill:#ffffff"
+       d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
+    <path
+       d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
+       style="fill:#006225"
+       id="path19" />
+    <path
+       id="path21"
+       style="fill:#006225"
+       d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
+  </g>
+</svg>
diff --git a/demos/video/qmlvideofx/qmlvideofx_harmattan.desktop b/demos/video/qmlvideofx/qmlvideofx_harmattan.desktop
new file mode 100644
index 0000000000..12e33c9b9e
--- /dev/null
+++ b/demos/video/qmlvideofx/qmlvideofx_harmattan.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=qmlvideofx
+Exec=/opt/qmlvideofx/bin/qmlvideofx
+Icon=
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/README b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/README
new file mode 100644
index 0000000000..f9b68e1350
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/README
@@ -0,0 +1,6 @@
+The Debian Package qmlvideofx
+----------------------------
+
+Comments regarding the Package
+
+ -- unknown <>  Wed, 19 Oct 2011 14:56:46 +0100
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/changelog b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/changelog
new file mode 100644
index 0000000000..a88b72d187
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/changelog
@@ -0,0 +1,5 @@
+qmlvideofx (0.0.1) unstable; urgency=low
+
+  * Initial Release.
+
+ -- unknown <>  Wed, 19 Oct 2011 14:56:46 +0100
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/compat b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/compat
new file mode 100644
index 0000000000..7f8f011eb7
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/compat
@@ -0,0 +1 @@
+7
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/control b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/control
new file mode 100644
index 0000000000..ca365e0908
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/control
@@ -0,0 +1,14 @@
+Source: qmlvideofx
+Section: user/other
+Priority: optional
+Maintainer: unknown <>
+Build-Depends: debhelper (>= 5), libqt4-dev
+Standards-Version: 3.7.3
+Homepage: <insert the upstream URL, if relevant>
+
+Package: qmlvideofx
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: <insert up to 60 chars description>
+ <insert long description, indented with spaces>
+XSBC-Maemo-Display-Name: qmlvideofx
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/copyright b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/copyright
new file mode 100644
index 0000000000..1d6654ae54
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/copyright
@@ -0,0 +1,40 @@
+This package was debianized by unknown <> on
+Wed, 19 Oct 2011 14:56:46 +0100.
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+    <put author's name and email here>
+    <likewise for another author>
+
+Copyright:
+
+    <Copyright (C) YYYY Name OfAuthor>
+    <likewise for another author>
+
+License:
+
+    This package is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This package is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this package; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is (C) 2011, unknown <> and
+is licensed under the GPL, see above.
+
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/manifest.aegis b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/manifest.aegis
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/manifest.aegis
diff --git a/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/rules b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/rules
new file mode 100644
index 0000000000..baa61bc466
--- /dev/null
+++ b/demos/video/qmlvideofx/qtc_packaging/debian_harmattan/rules
@@ -0,0 +1,87 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+configure: configure-stamp
+
+configure-stamp:
+	dh_testdir
+	# qmake PREFIX=/usr# Uncomment this line for use without Qt Creator
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp: configure-stamp
+	dh_testdir
+
+	# Add here commands to compile the package.
+	# $(MAKE) # Uncomment this line for use without Qt Creator
+	#docbook-to-man debian/qmlvideofx.sgml > qmlvideofx.1
+
+	touch $@
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Add here commands to clean up after the build process.
+	$(MAKE) clean
+
+	dh_clean
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/qmlvideofx.
+	$(MAKE) INSTALL_ROOT="$(CURDIR)"/debian/qmlvideofx install
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	# dh_shlibdeps # Uncomment this line for use without Qt Creator
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
+
diff --git a/demos/video/qmlvideofx/shaders/billboard.fsh b/demos/video/qmlvideofx/shaders/billboard.fsh
new file mode 100644
index 0000000000..0264f450c6
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/billboard.fsh
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float grid;
+uniform float dividerValue;
+uniform float step_x;
+uniform float step_y;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    float offx = floor(uv.x  / (grid * step_x));
+    float offy = floor(uv.y  / (grid * step_y));
+    vec3 res = texture2D(source, vec2(offx * grid * step_x , offy * grid * step_y)).rgb;
+    vec2 prc = fract(uv / vec2(grid * step_x, grid * step_y));
+    vec2 pw = pow(abs(prc - 0.5), vec2(2.0));
+    float  rs = pow(0.45, 2.0);
+    float gr = smoothstep(rs - 0.1, rs + 0.1, pw.x + pw.y);
+    float y = (res.r + res.g + res.b) / 3.0;
+    vec3 ra = res / y;
+    float ls = 0.3;
+    float lb = ceil(y / ls);
+    float lf = ls * lb + 0.3;
+    res = lf * res;
+    vec3 col = mix(res, vec3(0.1, 0.1, 0.1), gr);
+    if (uv.x < dividerValue)
+        gl_FragColor = qt_Opacity * vec4(col, 1.0);
+    else
+        gl_FragColor = qt_Opacity * texture2D(source, uv);
+}
diff --git a/demos/video/qmlvideofx/shaders/blackandwhite.fsh b/demos/video/qmlvideofx/shaders/blackandwhite.fsh
new file mode 100644
index 0000000000..4ec9c76688
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/blackandwhite.fsh
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float threshold;
+uniform float dividerValue;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec4 orig = texture2D(source, uv);
+    vec3 col = orig.rgb;
+    float y = 0.3 *col.r + 0.59 * col.g + 0.11 * col.b;
+    y = y < threshold ? 0.0 : 1.0;
+    if (uv.x < dividerValue)
+        gl_FragColor = qt_Opacity * vec4(y, y, y, 1.0);
+    else
+        gl_FragColor = qt_Opacity * orig;
+}
diff --git a/demos/video/qmlvideofx/shaders/emboss.fsh b/demos/video/qmlvideofx/shaders/emboss.fsh
new file mode 100644
index 0000000000..091e260505
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/emboss.fsh
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float dividerValue;
+const float step_w = 0.0015625;
+const float step_h = 0.0027778;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec3 t1 = texture2D(source, vec2(uv.x - step_w, uv.y - step_h)).rgb;
+    vec3 t2 = texture2D(source, vec2(uv.x, uv.y - step_h)).rgb;
+    vec3 t3 = texture2D(source, vec2(uv.x + step_w, uv.y - step_h)).rgb;
+    vec3 t4 = texture2D(source, vec2(uv.x - step_w, uv.y)).rgb;
+    vec3 t5 = texture2D(source, uv).rgb;
+    vec3 t6 = texture2D(source, vec2(uv.x + step_w, uv.y)).rgb;
+    vec3 t7 = texture2D(source, vec2(uv.x - step_w, uv.y + step_h)).rgb;
+    vec3 t8 = texture2D(source, vec2(uv.x, uv.y + step_h)).rgb;
+    vec3 t9 = texture2D(source, vec2(uv.x + step_w, uv.y + step_h)).rgb;
+    vec3 rr = -4.0 * t1 - 4.0 * t2 - 4.0 * t4 + 12.0 * t5;
+    float y = (rr.r + rr.g + rr.b) / 3.0;
+    vec3 col = vec3(y, y, y) + 0.3;
+    if (uv.x < dividerValue)
+        gl_FragColor = qt_Opacity * vec4(col, 1.0);
+    else
+        gl_FragColor = qt_Opacity * texture2D(source, uv);
+}
diff --git a/demos/video/qmlvideofx/shaders/gaussianblur_h.fsh b/demos/video/qmlvideofx/shaders/gaussianblur_h.fsh
new file mode 100644
index 0000000000..e2d4e7d10e
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/gaussianblur_h.fsh
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+uniform float dividerValue;
+uniform float blurSize;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec4 c = vec4(0.0);
+    if (uv.x < dividerValue) {
+        c += texture2D(source, uv - vec2(4.0*blurSize, 0.0)) * 0.05;
+        c += texture2D(source, uv - vec2(3.0*blurSize, 0.0)) * 0.09;
+        c += texture2D(source, uv - vec2(2.0*blurSize, 0.0)) * 0.12;
+        c += texture2D(source, uv - vec2(1.0*blurSize, 0.0)) * 0.15;
+        c += texture2D(source, uv) * 0.18;
+        c += texture2D(source, uv + vec2(1.0*blurSize, 0.0)) * 0.15;
+        c += texture2D(source, uv + vec2(2.0*blurSize, 0.0)) * 0.12;
+        c += texture2D(source, uv + vec2(3.0*blurSize, 0.0)) * 0.09;
+        c += texture2D(source, uv + vec2(4.0*blurSize, 0.0)) * 0.05;
+    } else {
+        c = texture2D(source, qt_TexCoord0);
+    }
+    gl_FragColor = qt_Opacity * c;
+}
diff --git a/demos/video/qmlvideofx/shaders/gaussianblur_v.fsh b/demos/video/qmlvideofx/shaders/gaussianblur_v.fsh
new file mode 100644
index 0000000000..9aaddf0926
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/gaussianblur_v.fsh
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+uniform float dividerValue;
+uniform float blurSize;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec4 c = vec4(0.0);
+    if (uv.x < dividerValue) {
+        c += texture2D(source, uv - vec2(0.0, 4.0*blurSize)) * 0.05;
+        c += texture2D(source, uv - vec2(0.0, 3.0*blurSize)) * 0.09;
+        c += texture2D(source, uv - vec2(0.0, 2.0*blurSize)) * 0.12;
+        c += texture2D(source, uv - vec2(0.0, 1.0*blurSize)) * 0.15;
+        c += texture2D(source, uv) * 0.18;
+        c += texture2D(source, uv + vec2(0.0, 1.0*blurSize)) * 0.15;
+        c += texture2D(source, uv + vec2(0.0, 2.0*blurSize)) * 0.12;
+        c += texture2D(source, uv + vec2(0.0, 3.0*blurSize)) * 0.09;
+        c += texture2D(source, uv + vec2(0.0, 4.0*blurSize)) * 0.05;
+    } else {
+        c = texture2D(source, qt_TexCoord0);
+    }
+    // First pass we don't apply opacity
+    gl_FragColor = c;
+}
diff --git a/demos/video/qmlvideofx/shaders/glow.fsh b/demos/video/qmlvideofx/shaders/glow.fsh
new file mode 100644
index 0000000000..8c40452d50
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/glow.fsh
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float dividerValue;
+const float step_w = 0.0015625;
+const float step_h = 0.0027778;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec3 t1 = texture2D(source, vec2(uv.x - step_w, uv.y - step_h)).rgb;
+    vec3 t2 = texture2D(source, vec2(uv.x, uv.y - step_h)).rgb;
+    vec3 t3 = texture2D(source, vec2(uv.x + step_w, uv.y - step_h)).rgb;
+    vec3 t4 = texture2D(source, vec2(uv.x - step_w, uv.y)).rgb;
+    vec3 t5 = texture2D(source, uv).rgb;
+    vec3 t6 = texture2D(source, vec2(uv.x + step_w, uv.y)).rgb;
+    vec3 t7 = texture2D(source, vec2(uv.x - step_w, uv.y + step_h)).rgb;
+    vec3 t8 = texture2D(source, vec2(uv.x, uv.y + step_h)).rgb;
+    vec3 t9 = texture2D(source, vec2(uv.x + step_w, uv.y + step_h)).rgb;
+    vec3 xx = t1 + 2.0*t2 + t3 - t7 - 2.0*t8 - t9;
+    vec3 yy = t1 - t3 + 2.0*t4 - 2.0*t6 + t7 - t9;
+    vec3 rr = sqrt(xx * xx + yy * yy);
+    vec3 col = rr * 2.0 * t5;
+    if (uv.x < dividerValue)
+        gl_FragColor = qt_Opacity * vec4(col, 1.0);
+    else
+        gl_FragColor = qt_Opacity * texture2D(source, uv);
+}
diff --git a/demos/video/qmlvideofx/shaders/isolate.fsh b/demos/video/qmlvideofx/shaders/isolate.fsh
new file mode 100644
index 0000000000..2b0fad5668
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/isolate.fsh
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float targetHue;
+uniform float windowWidth;
+uniform float dividerValue;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void rgb2hsl(vec3 rgb, out float h, out float s, float l)
+{
+    float maxval = max(rgb.r, max(rgb.g, rgb.b));
+    float minval = min(rgb.r, min(rgb.g, rgb.b));
+    float delta = maxval - minval;
+    l = (minval + maxval) / 2.0;
+    s = 0.0;
+    if (l > 0.0 && l < 1.0)
+        s = delta / (l < 0.5 ? 2.0 * l : 2.0 - 2.0 * l);
+    h = 0.0;
+    if (delta > 0.0)
+    {
+        if (rgb.r == maxval && rgb.g != maxval)
+            h += (rgb.g - rgb.b ) / delta;
+        if (rgb.g == maxval && rgb.b != maxval)
+            h += 2.0  + (rgb.b - rgb.r) / delta;
+        if (rgb.b == maxval && rgb.r != maxval)
+            h += 4.0 + (rgb.r - rgb.g) / delta;
+        h *= 60.0;
+    }
+}
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec3 col = texture2D(source, uv).rgb;
+    float h, s, l;
+    rgb2hsl(col, h, s, l);
+    float h2 = (h > targetHue) ? h - 360.0 : h + 360.0;
+    float y = 0.3 * col.r + 0.59 * col.g + 0.11 * col.b;
+    vec3 result;
+    if (uv.x > dividerValue || (abs(h - targetHue) < windowWidth) || (abs(h2 - targetHue) < windowWidth))
+        result = col;
+    else
+        result = vec3(y, y, y);
+    gl_FragColor = qt_Opacity * vec4(result, 1.0);
+}
diff --git a/demos/video/qmlvideofx/shaders/magnify.fsh b/demos/video/qmlvideofx/shaders/magnify.fsh
new file mode 100644
index 0000000000..ddc023ff02
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/magnify.fsh
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://www.reddit.com/r/programming/comments/losip/shader_toy/c2upn1e
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+uniform float radius;
+uniform float diffractionIndex;
+uniform float targetWidth;
+uniform float targetHeight;
+uniform float posX;
+uniform float posY;
+
+void main()
+{
+    vec2 tc = qt_TexCoord0;
+    vec2 center = vec2(posX, posY);
+    vec2 xy = gl_FragCoord.xy - center.xy;
+    float r = sqrt(xy.x * xy.x + xy.y * xy.y);
+    if (r < radius) {
+        float h = diffractionIndex * 0.5 * radius;
+        vec2 new_xy = r < radius ? xy * (radius - h) / sqrt(radius * radius - r * r) : xy;
+        vec2 targetSize = vec2(targetWidth, targetHeight);
+        tc = (new_xy + center) / targetSize;
+    }
+    gl_FragColor = qt_Opacity * texture2D(source, tc);
+}
diff --git a/demos/video/qmlvideofx/shaders/pagecurl.fsh b/demos/video/qmlvideofx/shaders/pagecurl.fsh
new file mode 100644
index 0000000000..5334b869d6
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/pagecurl.fsh
@@ -0,0 +1,183 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://rectalogic.github.com/webvfx/examples_2transition-shader-pagecurl_8html-example.html
+
+uniform float dividerValue;
+uniform float curlExtent;
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+const float minAmount = -0.16;
+const float maxAmount = 1.3;
+const float PI = 3.141592653589793;
+const float scale = 512.0;
+const float sharpness = 3.0;
+const vec4 bgColor = vec4(1.0, 1.0, 0.8, 1.0);
+
+float amount = curlExtent * (maxAmount - minAmount) + minAmount;
+float cylinderCenter = amount;
+// 360 degrees * amount
+float cylinderAngle = 2.0 * PI * amount;
+const float cylinderRadius = 1.0 / PI / 2.0;
+
+vec3 hitPoint(float hitAngle, float yc, vec3 point, mat3 rrotation)
+{
+    float hitPoint = hitAngle / (2.0 * PI);
+    point.y = hitPoint;
+    return rrotation * point;
+}
+
+vec4 antiAlias(vec4 color1, vec4 color2, float distance)
+{
+    distance *= scale;
+    if (distance < 0.0) return color2;
+    if (distance > 2.0) return color1;
+    float dd = pow(1.0 - distance / 2.0, sharpness);
+    return ((color2 - color1) * dd) + color1;
+}
+
+float distanceToEdge(vec3 point)
+{
+    float dx = abs(point.x > 0.5 ? 1.0 - point.x : point.x);
+    float dy = abs(point.y > 0.5 ? 1.0 - point.y : point.y);
+    if (point.x < 0.0) dx = -point.x;
+    if (point.x > 1.0) dx = point.x - 1.0;
+    if (point.y < 0.0) dy = -point.y;
+    if (point.y > 1.0) dy = point.y - 1.0;
+    if ((point.x < 0.0 || point.x > 1.0) && (point.y < 0.0 || point.y > 1.0)) return sqrt(dx * dx + dy * dy);
+    return min(dx, dy);
+}
+
+vec4 seeThrough(float yc, vec2 p, mat3 rotation, mat3 rrotation)
+{
+    float hitAngle = PI - (acos(yc / cylinderRadius) - cylinderAngle);
+    vec3 point = hitPoint(hitAngle, yc, rotation * vec3(p, 1.0), rrotation);
+    if (yc <= 0.0 && (point.x < 0.0 || point.y < 0.0 || point.x > 1.0 || point.y > 1.0))
+        return bgColor;
+    if (yc > 0.0)
+        return texture2D(source, p);
+    vec4 color = texture2D(source, point.xy);
+    vec4 tcolor = vec4(0.0);
+    return antiAlias(color, tcolor, distanceToEdge(point));
+}
+
+vec4 seeThroughWithShadow(float yc, vec2 p, vec3 point, mat3 rotation, mat3 rrotation)
+{
+    float shadow = distanceToEdge(point) * 30.0;
+    shadow = (1.0 - shadow) / 3.0;
+    if (shadow < 0.0)
+        shadow = 0.0;
+    else
+        shadow *= amount;
+    vec4 shadowColor = seeThrough(yc, p, rotation, rrotation);
+    shadowColor.r -= shadow;
+    shadowColor.g -= shadow;
+    shadowColor.b -= shadow;
+    return shadowColor;
+}
+
+vec4 backside(float yc, vec3 point)
+{
+    vec4 color = texture2D(source, point.xy);
+    float gray = (color.r + color.b + color.g) / 15.0;
+    gray += (8.0 / 10.0) * (pow(1.0 - abs(yc / cylinderRadius), 2.0 / 10.0) / 2.0 + (5.0 / 10.0));
+    color.rgb = vec3(gray);
+    return color;
+}
+
+void main(void)
+{
+    const float angle = 30.0 * PI / 180.0;
+    float c = cos(-angle);
+    float s = sin(-angle);
+    mat3 rotation = mat3(
+        c, s, 0,
+        -s, c, 0,
+        0.12, 0.258, 1
+    );
+    c = cos(angle);
+    s = sin(angle);
+    mat3 rrotation = mat3(
+        c, s, 0,
+        -s, c, 0,
+        0.15, -0.5, 1
+    );
+    vec3 point = rotation * vec3(qt_TexCoord0, 1.0);
+    float yc = point.y - cylinderCenter;
+    vec4 color = vec4(1.0, 0.0, 0.0, 1.0);
+    if (yc < -cylinderRadius) {
+        // See through to background
+        color = bgColor;
+    } else if (yc > cylinderRadius) {
+        // Flat surface
+        color = texture2D(source, qt_TexCoord0);
+    } else {
+        float hitAngle = (acos(yc / cylinderRadius) + cylinderAngle) - PI;
+        float hitAngleMod = mod(hitAngle, 2.0 * PI);
+        if ((hitAngleMod > PI && amount < 0.5) || (hitAngleMod > PI/2.0 && amount < 0.0)) {
+            color = seeThrough(yc, qt_TexCoord0, rotation, rrotation);
+        } else {
+            point = hitPoint(hitAngle, yc, point, rrotation);
+            if (point.x < 0.0 || point.y < 0.0 || point.x > 1.0 || point.y > 1.0) {
+                color = seeThroughWithShadow(yc, qt_TexCoord0, point, rotation, rrotation);
+            } else {
+                color = backside(yc, point);
+                vec4 otherColor;
+                if (yc < 0.0) {
+                    float shado = 1.0 - (sqrt(pow(point.x - 0.5, 2.0) + pow(point.y - 0.5, 2.0)) / 0.71);
+                    shado *= pow(-yc / cylinderRadius, 3.0);
+                    shado *= 0.5;
+                    otherColor = vec4(0.0, 0.0, 0.0, shado);
+                } else {
+                    otherColor = texture2D(source, qt_TexCoord0);
+                }
+                color = antiAlias(color, otherColor, cylinderRadius - abs(yc));
+
+                // This second antialiasing step causes the shader to fail to render, on
+                // Symbian devices (tested so far using IVE3.5).  Running out of scratch
+                // memory?
+            }
+        }
+    }
+    gl_FragColor = qt_Opacity * color;
+}
diff --git a/demos/video/qmlvideofx/shaders/pixelate.fsh b/demos/video/qmlvideofx/shaders/pixelate.fsh
new file mode 100644
index 0000000000..577e2582af
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/pixelate.fsh
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20101029/shader-library-pixelation-post-processing-effect-glsl/
+
+uniform float dividerValue;
+uniform float granularity;
+uniform float targetWidth;
+uniform float targetHeight;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec2 tc = qt_TexCoord0;
+    if (uv.x < dividerValue && granularity > 0.0) {
+        float dx = granularity / targetWidth;
+        float dy = granularity / targetHeight;
+        tc = vec2(dx*(floor(uv.x/dx) + 0.5),
+                  dy*(floor(uv.y/dy) + 0.5));
+    }
+    gl_FragColor = qt_Opacity * texture2D(source, tc);
+}
diff --git a/demos/video/qmlvideofx/shaders/posterize.fsh b/demos/video/qmlvideofx/shaders/posterize.fsh
new file mode 100644
index 0000000000..2769aac2f6
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/posterize.fsh
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20091027/shader-library-posterization-post-processing-effect-glsl/
+
+uniform float dividerValue;
+uniform float gamma;
+uniform float numColors;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec4 c = vec4(0.0);
+    if (uv.x < dividerValue) {
+        vec3 x = texture2D(source, uv).rgb;
+        x = pow(x, vec3(gamma, gamma, gamma));
+        x = x * numColors;
+        x = floor(x);
+        x = x / numColors;
+        x = pow(x, vec3(1.0/gamma));
+        c = vec4(x, 1.0);
+    } else {
+        c = texture2D(source, uv);
+    }
+    gl_FragColor = qt_Opacity * c;
+}
diff --git a/demos/video/qmlvideofx/shaders/ripple.fsh b/demos/video/qmlvideofx/shaders/ripple.fsh
new file mode 100644
index 0000000000..bd79c763b6
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/ripple.fsh
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://labs.qt.nokia.com/2011/03/22/the-convenient-power-of-qml-scene-graph/
+
+uniform float dividerValue;
+uniform float targetWidth;
+uniform float targetHeight;
+uniform float time;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+const float PI = 3.1415926535;
+const int ITER = 7;
+const float RATE = 0.1;
+uniform float amplitude;
+uniform float n;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec2 tc = uv;
+    vec2 p = vec2(-1.0 + 2.0 * gl_FragCoord.x / targetWidth, -1.0 + 2.0 * gl_FragCoord.y / targetHeight);
+    float diffx = 0.0;
+    float diffy = 0.0;
+    vec4 col;
+    if (uv.x < dividerValue) {
+        for (int i=0; i<ITER; ++i) {
+            float theta = float(i) * PI / float(ITER);
+            vec2 r = vec2(cos(theta) * p.x + sin(theta) * p.y, -1.0 * sin(theta) * p.x + cos(theta) * p.y);
+            float diff = (sin(2.0 * PI * n * (r.y + time * RATE)) + 1.0) / 2.0;
+            diffx += diff * sin(theta);
+            diffy += diff * cos(theta);
+        }
+        tc = 0.5*(vec2(1.0,1.0) + p) + amplitude * vec2(diffx, diffy);
+    }
+    gl_FragColor = qt_Opacity * texture2D(source, tc);
+}
diff --git a/demos/video/qmlvideofx/shaders/selectionpanel.fsh b/demos/video/qmlvideofx/shaders/selectionpanel.fsh
new file mode 100644
index 0000000000..250accb143
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/selectionpanel.fsh
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
diff --git a/demos/video/qmlvideofx/shaders/sepia.fsh b/demos/video/qmlvideofx/shaders/sepia.fsh
new file mode 100644
index 0000000000..46b0935ae9
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/sepia.fsh
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float dividerValue;
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec4 orig = texture2D(source, uv);
+    vec3 col = orig.rgb;
+    float y = 0.3 * col.r + 0.59 * col.g + 0.11 * col.b;
+    if (uv.x < dividerValue)
+        gl_FragColor = qt_Opacity * vec4(y + 0.15, y + 0.07, y - 0.12, 1.0);
+    else
+        gl_FragColor = qt_Opacity * orig;
+}
diff --git a/demos/video/qmlvideofx/shaders/sharpen.fsh b/demos/video/qmlvideofx/shaders/sharpen.fsh
new file mode 100644
index 0000000000..f4cbc67d39
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/sharpen.fsh
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float dividerValue;
+uniform float amount;
+const float step_w = 0.0015625;
+const float step_h = 0.0027778;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+vec3 sharpen(vec3 t1, vec3 t2, vec3 t3, vec3 t4, vec3 t5, vec3 t6, vec3 t7, vec3 t8, vec3 t9)
+{
+    return -t1 - t2 - t3 - t4 + amount * t5 - t6 - t7 - t8 - t9;
+}
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec3 t1 = texture2D(source, vec2(uv.x - step_w, uv.y - step_h)).rgb;
+    vec3 t2 = texture2D(source, vec2(uv.x, uv.y - step_h)).rgb;
+    vec3 t3 = texture2D(source, vec2(uv.x + step_w, uv.y - step_h)).rgb;
+    vec3 t4 = texture2D(source, vec2(uv.x - step_w, uv.y)).rgb;
+    vec3 t5 = texture2D(source, uv).rgb;
+    vec3 t6 = texture2D(source, vec2(uv.x + step_w, uv.y)).rgb;
+    vec3 t7 = texture2D(source, vec2(uv.x - step_w, uv.y + step_h)).rgb;
+    vec3 t8 = texture2D(source, vec2(uv.x, uv.y + step_h)).rgb;
+    vec3 t9 = texture2D(source, vec2(uv.x + step_w, uv.y + step_h)).rgb;
+    vec3 col = sharpen(t1, t2, t3, t4, t5, t6, t7, t8, t9);
+    if (uv.x < dividerValue)
+        gl_FragColor = qt_Opacity * vec4(col, 1.0);
+    else
+        gl_FragColor = qt_Opacity * texture2D(source, uv);
+}
diff --git a/demos/video/qmlvideofx/shaders/shockwave.fsh b/demos/video/qmlvideofx/shaders/shockwave.fsh
new file mode 100644
index 0000000000..33c382657d
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/shockwave.fsh
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20091116/shader-library-2d-shockwave-post-processing-filter-glsl/
+
+uniform float centerX;
+uniform float centerY;
+uniform float dividerValue;
+uniform float granularity;
+uniform float time;
+uniform float weight;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec2 tc = qt_TexCoord0;
+    vec2 center = vec2(centerX, centerY);
+    const vec3 shock = vec3(10.0, 1.5, 0.1);
+    if (uv.x < dividerValue) {
+        float distance = distance(uv, center);
+        if ((distance <= (time + shock.z)) &&
+            (distance >= (time - shock.z))) {
+            float diff = (distance - time);
+            float powDiff = 1.0 - pow(abs(diff*shock.x), shock.y*weight);
+            float diffTime = diff  * powDiff;
+            vec2 diffUV = normalize(uv - center);
+            tc += (diffUV * diffTime);
+        }
+    }
+    gl_FragColor = qt_Opacity * texture2D(source, tc);
+}
diff --git a/demos/video/qmlvideofx/shaders/sobeledgedetection1.fsh b/demos/video/qmlvideofx/shaders/sobeledgedetection1.fsh
new file mode 100644
index 0000000000..d71b4e8336
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/sobeledgedetection1.fsh
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on "Graphics Shaders: Theory and Practice" (http://cgeducation.org/ShadersBook/)
+
+uniform float dividerValue;
+uniform float mixLevel;
+uniform float resS;
+uniform float resT;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec4 c = vec4(0.0);
+    if (uv.x < dividerValue) {
+        vec2 st = qt_TexCoord0.st;
+        vec3 irgb = texture2D(source, st).rgb;
+        vec2 stp0 = vec2(1.0 / resS, 0.0);
+        vec2 st0p = vec2(0.0       , 1.0 / resT);
+        vec2 stpp = vec2(1.0 / resS, 1.0 / resT);
+        vec2 stpm = vec2(1.0 / resS, -1.0 / resT);
+        const vec3 W = vec3(0.2125, 0.7154, 0.0721);
+        float i00   = dot(texture2D(source, st).rgb, W);
+        float im1m1 = dot(texture2D(source, st-stpp).rgb, W);
+        float ip1p1 = dot(texture2D(source, st+stpp).rgb, W);
+        float im1p1 = dot(texture2D(source, st-stpm).rgb, W);
+        float ip1m1 = dot(texture2D(source, st+stpm).rgb, W);
+        float im10  = dot(texture2D(source, st-stp0).rgb, W);
+        float ip10  = dot(texture2D(source, st+stp0).rgb, W);
+        float i0m1  = dot(texture2D(source, st-st0p).rgb, W);
+        float i0p1  = dot(texture2D(source, st+st0p).rgb, W);
+        float h = -1.0*im1p1 - 2.0*i0p1 - 1.0*ip1p1 + 1.0*im1m1 + 2.0*i0m1 + 1.0*ip1m1;
+        float v = -1.0*im1m1 - 2.0*im10 - 1.0*im1p1 + 1.0*ip1m1 + 2.0*ip10 + 1.0*ip1p1;
+        float mag = 1.0 - length(vec2(h, v));
+        vec3 target = vec3(mag, mag, mag);
+        c = vec4(target, 1.0);
+    } else {
+        c = texture2D(source, qt_TexCoord0);
+    }
+    gl_FragColor = qt_Opacity * c;
+}
diff --git a/demos/video/qmlvideofx/shaders/sobeledgedetection2.fsh b/demos/video/qmlvideofx/shaders/sobeledgedetection2.fsh
new file mode 100644
index 0000000000..bb97da10b6
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/sobeledgedetection2.fsh
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://rastergrid.com/blog/downloads/frei-chen-edge-detector/
+
+#version 130
+uniform sampler2D source;
+uniform float dividerValue;
+uniform float weight;
+mat3 G[2] = mat3[](
+    mat3( 1.0, 2.0, 1.0, 0.0, 0.0, 0.0, -1.0, -2.0, -1.0 ),
+    mat3( 1.0, 0.0, -1.0, 2.0, 0.0, -2.0, 1.0, 0.0, -1.0 )
+);
+uniform lowp float qt_Opacity;
+in vec2 qt_TexCoord0;
+out vec4 FragmentColor;
+void main() {
+    vec2 uv = qt_TexCoord0.xy;
+    vec4 c = vec4(0.0);
+    if (uv.x < dividerValue) {
+        mat3 intensity;
+        float conv[2];
+        vec3 sample;
+        for (int i=0; i<3; ++i) {
+            for (int j=0; j<3; ++j) {
+                sample = texelFetch(source, ivec2(gl_FragCoord) + ivec2(i-1, j-1), 0).rgb;
+                intensity[i][j] = length(sample) * weight;
+            }
+        }
+        for (int i=0; i<2; ++i) {
+            float dp3 = dot(G[i][0], intensity[0]) + dot(G[i][1], intensity[1]) + dot(G[i][2], intensity[2]);
+            conv[i] = dp3 * dp3;
+        }
+        c = vec4(0.5 * sqrt(conv[0]*conv[0] + conv[1]*conv[1]));
+    } else {
+        c = texture2D(source, qt_TexCoord0);
+    }
+    FragmentColor = qt_Opacity * c;
+}
diff --git a/demos/video/qmlvideofx/shaders/tiltshift.fsh b/demos/video/qmlvideofx/shaders/tiltshift.fsh
new file mode 100644
index 0000000000..5f52d42ec4
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/tiltshift.fsh
@@ -0,0 +1,75 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float dividerValue;
+const float step_w = 0.0015625;
+const float step_h = 0.0027778;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+vec3 blur()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    float y = uv.y < 0.4 ? uv.y : 1.0 - uv.y;
+    float dist = 8.0 - 20.0 * y;
+    vec3 acc = vec3(0.0, 0.0, 0.0);
+    for (float y=-2.0; y<=2.0; ++y) {
+        for (float x=-2.0; x<=2.0; ++x) {
+            acc += texture2D(source, vec2(uv.x + dist * x * step_w, uv.y + 0.5 * dist * y * step_h)).rgb;
+        }
+    }
+    return acc / 25.0;
+}
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec3 col;
+    if (uv.x > dividerValue || (uv.y >= 0.4 && uv.y <= 0.6))
+        col = texture2D(source, uv).rgb;
+    else
+        col = blur();
+    gl_FragColor = qt_Opacity * vec4(col, 1.0);
+}
diff --git a/demos/video/qmlvideofx/shaders/toon.fsh b/demos/video/qmlvideofx/shaders/toon.fsh
new file mode 100644
index 0000000000..5c895fa3dc
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/toon.fsh
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://www.geeks3d.com/20101029/shader-library-pixelation-post-processing-effect-glsl/
+
+uniform float dividerValue;
+uniform float threshold;
+uniform float resS;
+uniform float resT;
+uniform float magTol;
+uniform float quantize;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec4 color = vec4(1.0, 0.0, 0.0, 1.1);
+    vec2 uv = qt_TexCoord0.xy;
+    if (uv.x < dividerValue) {
+        vec2 st = qt_TexCoord0.st;
+        vec3 rgb = texture2D(source, st).rgb;
+        vec2 stp0 = vec2(1.0/resS,  0.0);
+        vec2 st0p = vec2(0.0     ,  1.0/resT);
+        vec2 stpp = vec2(1.0/resS,  1.0/resT);
+        vec2 stpm = vec2(1.0/resS, -1.0/resT);
+        float i00 =   dot( texture2D(source, st).rgb, vec3(0.2125,0.7154,0.0721));
+        float im1m1 = dot( texture2D(source, st-stpp).rgb, vec3(0.2125,0.7154,0.0721));
+        float ip1p1 = dot( texture2D(source, st+stpp).rgb, vec3(0.2125,0.7154,0.0721));
+        float im1p1 = dot( texture2D(source, st-stpm).rgb, vec3(0.2125,0.7154,0.0721));
+        float ip1m1 = dot( texture2D(source, st+stpm).rgb, vec3(0.2125,0.7154,0.0721));
+        float im10 =  dot( texture2D(source, st-stp0).rgb, vec3(0.2125,0.7154,0.0721));
+        float ip10 =  dot( texture2D(source, st+stp0).rgb, vec3(0.2125,0.7154,0.0721));
+        float i0m1 =  dot( texture2D(source, st-st0p).rgb, vec3(0.2125,0.7154,0.0721));
+        float i0p1 =  dot( texture2D(source, st+st0p).rgb, vec3(0.2125,0.7154,0.0721));
+        float h = -1.*im1p1 - 2.*i0p1 - 1.*ip1p1  +  1.*im1m1 + 2.*i0m1 + 1.*ip1m1;
+        float v = -1.*im1m1 - 2.*im10 - 1.*im1p1  +  1.*ip1m1 + 2.*ip10 + 1.*ip1p1;
+        float mag = sqrt(h*h + v*v);
+        if (mag > magTol) {
+            color = vec4(0.0, 0.0, 0.0, 1.0);
+        }
+        else {
+            rgb.rgb *= quantize;
+            rgb.rgb += vec3(0.5, 0.5, 0.5);
+            ivec3 irgb = ivec3(rgb.rgb);
+            rgb.rgb = vec3(irgb) / quantize;
+            color = vec4(rgb, 1.0);
+        }
+    } else {
+        color = texture2D(source, uv);
+    }
+    gl_FragColor = qt_Opacity * color;
+}
diff --git a/demos/video/qmlvideofx/shaders/vignette.fsh b/demos/video/qmlvideofx/shaders/vignette.fsh
new file mode 100644
index 0000000000..6f89f192e5
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/vignette.fsh
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float dividerValue;
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec4 orig = texture2D(source, uv);
+    float cr = pow(0.1, 2.0);
+    float pt = pow(uv.x - 0.5, 2.0) + pow(uv.y - 0.5, 2.0);
+    float d = pt - cr;
+    float cf = 1.0;
+    if (d > 0.0)
+        cf = 1.0 - 2.0 * d;
+    vec3 col = cf * orig.rgb;
+    if (uv.x < dividerValue)
+        gl_FragColor = qt_Opacity * vec4(col, 1.0);
+    else
+        gl_FragColor = qt_Opacity * orig;
+}
diff --git a/demos/video/qmlvideofx/shaders/warhol.fsh b/demos/video/qmlvideofx/shaders/warhol.fsh
new file mode 100644
index 0000000000..5bd438e562
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/warhol.fsh
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://kodemongki.blogspot.com/2011/06/kameraku-custom-shader-effects-example.html
+
+uniform float dividerValue;
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec4 orig = texture2D(source, uv);
+    vec3 col = orig.rgb;
+    float y = 0.3 *col.r + 0.59 * col.g + 0.11 * col.b;
+    y = y < 0.3 ? 0.0 : (y < 0.6 ? 0.5 : 1.0);
+    if (y == 0.5)
+        col = vec3(0.8, 0.0, 0.0);
+    else if (y == 1.0)
+        col = vec3(0.9, 0.9, 0.0);
+    else
+        col = vec3(0.0, 0.0, 0.0);
+    if (uv.x < dividerValue)
+        gl_FragColor = qt_Opacity * vec4(col, 1.0);
+    else
+        gl_FragColor = qt_Opacity * orig;
+}
diff --git a/demos/video/qmlvideofx/shaders/wobble.fsh b/demos/video/qmlvideofx/shaders/wobble.fsh
new file mode 100644
index 0000000000..5a8771d216
--- /dev/null
+++ b/demos/video/qmlvideofx/shaders/wobble.fsh
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+// Based on http://labs.qt.nokia.com/2011/03/22/the-convenient-power-of-qml-scene-graph/
+
+uniform float amplitude;
+uniform float dividerValue;
+uniform float frequency;
+uniform float time;
+
+uniform sampler2D source;
+uniform lowp float qt_Opacity;
+varying vec2 qt_TexCoord0;
+
+void main()
+{
+    vec2 uv = qt_TexCoord0.xy;
+    vec2 tc = qt_TexCoord0;
+    if (uv.x < dividerValue) {
+        vec2 p = sin(time + frequency * qt_TexCoord0);
+        tc += amplitude * vec2(p.y, -p.x);
+    }
+    gl_FragColor = qt_Opacity * texture2D(source, tc);
+}
diff --git a/demos/video/qmlvideofx/trace.h b/demos/video/qmlvideofx/trace.h
new file mode 100644
index 0000000000..1a695bd246
--- /dev/null
+++ b/demos/video/qmlvideofx/trace.h
@@ -0,0 +1,96 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef TRACE_H
+#define TRACE_H
+
+#include <QtCore/QDebug>
+
+#define ENABLE_TRACE
+//#define VERBOSE_TRACE
+
+namespace Trace {
+
+class NullDebug
+{
+public:
+    template <typename T>
+    NullDebug& operator<<(const T&) { return *this; }
+};
+
+inline NullDebug nullDebug() { return NullDebug(); }
+
+template <typename T>
+struct PtrWrapper
+{
+    PtrWrapper(const T *ptr) : m_ptr(ptr) { }
+    const T *const m_ptr;
+};
+
+} // namespace Trace
+
+template <typename T>
+inline QDebug& operator<<(QDebug &debug, const Trace::PtrWrapper<T> &wrapper)
+{
+    debug.nospace() << "[" << (void*)wrapper.m_ptr << "]";
+    return debug.space();
+}
+
+template<typename T>
+inline const void *qtVoidPtr(const T *ptr)
+{ return static_cast<const void *>(ptr); }
+
+#define qtThisPtr() qtVoidPtr(this)
+
+#ifdef ENABLE_TRACE
+        inline QDebug qtTrace() { return qDebug() << "[qmlvideofx]"; }
+#    ifdef VERBOSE_TRACE
+        inline QDebug qtVerboseTrace() { return qtTrace(); }
+#    else
+        inline Trace::NullDebug qtVerboseTrace() { return Trace::nullDebug(); }
+#    endif
+#else
+    inline Trace::NullDebug qtTrace() { return Trace::nullDebug(); }
+    inline Trace::NullDebug qtVerboseTrace() { return Trace::nullDebug(); }
+#endif
+
+#endif // TRACE_H
+
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitor.cpp b/demos/video/snippets/frequencymonitor/frequencymonitor.cpp
new file mode 100644
index 0000000000..0166ea46c5
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitor.cpp
@@ -0,0 +1,250 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "frequencymonitor.h"
+#include <QtCore/QDebug>
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QString>
+#include <QtCore/QTime>
+#include <QtCore/QTimer>
+
+//#define VERBOSE_TRACE
+
+inline QDebug qtTrace() { return qDebug() << "[frequencymonitor]"; }
+#ifdef VERBOSE_TRACE
+inline QDebug qtVerboseTrace() { return qtTrace(); }
+#else
+inline QNoDebug qtVerboseTrace() { return QNoDebug(); }
+#endif
+
+static const int DefaultSamplingInterval = 100;
+static const int DefaultTraceInterval = 0;
+
+class FrequencyMonitorPrivate : public QObject
+{
+    Q_OBJECT
+public:
+    FrequencyMonitorPrivate(FrequencyMonitor *parent);
+    void calculateInstantaneousFrequency();
+
+private slots:
+    void calculateAverageFrequency();
+    void stalled();
+
+public:
+    FrequencyMonitor *const q_ptr;
+    QString m_label;
+    bool m_active;
+    qreal m_instantaneousFrequency;
+    QElapsedTimer m_instantaneousElapsed;
+    QTimer *m_averageTimer;
+    QElapsedTimer m_averageElapsed;
+    int m_count;
+    qreal m_averageFrequency;
+    QTimer *m_traceTimer;
+    QTimer *m_stalledTimer;
+};
+
+FrequencyMonitorPrivate::FrequencyMonitorPrivate(FrequencyMonitor *parent)
+:   QObject(parent)
+,   q_ptr(parent)
+,   m_active(false)
+,   m_instantaneousFrequency(0)
+,   m_averageTimer(new QTimer(this))
+,   m_count(0)
+,   m_averageFrequency(0)
+,   m_traceTimer(new QTimer(this))
+,   m_stalledTimer(new QTimer(this))
+{
+    m_instantaneousElapsed.start();
+    connect(m_averageTimer, SIGNAL(timeout()),
+            this, SLOT(calculateAverageFrequency()));
+    if (DefaultSamplingInterval)
+        m_averageTimer->start(DefaultSamplingInterval);
+    m_averageElapsed.start();
+    connect(m_traceTimer, SIGNAL(timeout()),
+            q_ptr, SLOT(trace()));
+    if (DefaultTraceInterval)
+        m_traceTimer->start(DefaultTraceInterval);
+    m_stalledTimer->setSingleShot(true);
+    connect(m_stalledTimer, SIGNAL(timeout()),
+            this, SLOT(stalled()));
+}
+
+void FrequencyMonitorPrivate::calculateInstantaneousFrequency()
+{
+    const qint64 ms = m_instantaneousElapsed.restart();
+    m_instantaneousFrequency = ms ? qreal(1000) / ms : 0;
+    m_stalledTimer->start(3 * ms);
+    if (m_instantaneousFrequency)
+        q_ptr->setActive(true);
+    q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency);
+    q_ptr->emit frequencyChanged();
+}
+
+void FrequencyMonitorPrivate::calculateAverageFrequency()
+{
+    const qint64 ms = m_averageElapsed.restart();
+    m_averageFrequency = qreal(m_count * 1000) / ms;
+    q_ptr->emit averageFrequencyChanged(m_averageFrequency);
+    q_ptr->emit frequencyChanged();
+    m_count = 0;
+}
+
+void FrequencyMonitorPrivate::stalled()
+{
+    if (m_instantaneousFrequency) {
+        qtVerboseTrace() << "FrequencyMonitor::stalled";
+        m_instantaneousFrequency = 0;
+        q_ptr->emit instantaneousFrequencyChanged(m_instantaneousFrequency);
+        q_ptr->emit frequencyChanged();
+    }
+}
+
+FrequencyMonitor::FrequencyMonitor(QObject *parent)
+:   QObject(parent)
+,   d_ptr(0)
+{
+    d_ptr = new FrequencyMonitorPrivate(this);
+    qtTrace() << "FrequencyMonitor::FrequencyMonitor";
+}
+
+FrequencyMonitor::~FrequencyMonitor()
+{
+
+}
+
+const QString &FrequencyMonitor::label() const
+{
+    return d_func()->m_label;
+}
+
+bool FrequencyMonitor::active() const
+{
+    return d_func()->m_active;
+}
+
+int FrequencyMonitor::samplingInterval() const
+{
+    return d_ptr->m_averageTimer->isActive() ? d_ptr->m_averageTimer->interval() : 0;
+}
+
+int FrequencyMonitor::traceInterval() const
+{
+    return d_ptr->m_traceTimer->isActive() ? d_ptr->m_traceTimer->interval() : 0;
+}
+
+qreal FrequencyMonitor::instantaneousFrequency() const
+{
+    return d_func()->m_instantaneousFrequency;
+}
+
+qreal FrequencyMonitor::averageFrequency() const
+{
+    return d_func()->m_averageFrequency;
+}
+
+void FrequencyMonitor::notify()
+{
+    Q_D(FrequencyMonitor);
+    ++(d->m_count);
+    d->calculateInstantaneousFrequency();
+}
+
+void FrequencyMonitor::trace()
+{
+    Q_D(FrequencyMonitor);
+    const QString value = QString::fromAscii("instant %1 average %2")
+                            .arg(d->m_instantaneousFrequency, 0, 'f', 2)
+                            .arg(d->m_averageFrequency, 0, 'f', 2);
+    if (d->m_label.isEmpty())
+        qtTrace() << "FrequencyMonitor::trace" << value;
+    else
+        qtTrace() << "FrequencyMonitor::trace" << "label" << d->m_label << value;
+}
+
+void FrequencyMonitor::setLabel(const QString &value)
+{
+    Q_D(FrequencyMonitor);
+    if (d->m_label != value) {
+        d->m_label = value;
+        emit labelChanged(d->m_label);
+    }
+}
+
+void FrequencyMonitor::setActive(bool value)
+{
+    Q_D(FrequencyMonitor);
+    if (d->m_active != value) {
+        d->m_active = value;
+        emit activeChanged(d->m_active);
+    }
+}
+
+void FrequencyMonitor::setSamplingInterval(int value)
+{
+    Q_D(FrequencyMonitor);
+    if (samplingInterval() != value) {
+        if (value) {
+            d->m_averageTimer->setInterval(value);
+            d->m_averageTimer->start();
+        } else {
+            d->m_averageTimer->stop();
+        }
+        emit samplingIntervalChanged(value);
+    }
+}
+
+void FrequencyMonitor::setTraceInterval(int value)
+{
+    Q_D(FrequencyMonitor);
+    if (traceInterval() != value) {
+        if (value) {
+            d->m_traceTimer->setInterval(value);
+            d->m_traceTimer->start();
+        } else {
+            d->m_traceTimer->stop();
+        }
+        emit traceIntervalChanged(value);
+    }
+}
+
+#include "frequencymonitor.moc"
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitor.h b/demos/video/snippets/frequencymonitor/frequencymonitor.h
new file mode 100644
index 0000000000..a949e55d4a
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitor.h
@@ -0,0 +1,102 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef FREQUENCYMONITOR_H
+#define FREQUENCYMONITOR_H
+
+#include <QtCore/QObject>
+
+class QTimer;
+
+class FrequencyMonitorPrivate;
+
+/**
+ * Class for measuring frequency of events
+ *
+ * Occurrence of the event is notified by the client via the notify() slot.
+ * On a regular interval, both an instantaneous and a rolling average
+ * event frequency are calculated.
+ */
+class FrequencyMonitor : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(FrequencyMonitor)
+    Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged)
+    Q_PROPERTY(bool active READ active WRITE setActive NOTIFY activeChanged)
+    Q_PROPERTY(int samplingInterval READ samplingInterval WRITE setSamplingInterval NOTIFY samplingIntervalChanged)
+    Q_PROPERTY(int traceInterval READ traceInterval WRITE setTraceInterval NOTIFY traceIntervalChanged)
+    Q_PROPERTY(qreal instantaneousFrequency READ instantaneousFrequency NOTIFY instantaneousFrequencyChanged)
+    Q_PROPERTY(qreal averageFrequency READ averageFrequency NOTIFY averageFrequencyChanged)
+public:
+    FrequencyMonitor(QObject *parent = 0);
+    ~FrequencyMonitor();
+
+    static void qmlRegisterType();
+
+    const QString &label() const;
+    bool active() const;
+    int samplingInterval() const;
+    int traceInterval() const;
+    qreal instantaneousFrequency() const;
+    qreal averageFrequency() const;
+
+signals:
+    void labelChanged(const QString &value);
+    void activeChanged(bool);
+    void samplingIntervalChanged(int value);
+    void traceIntervalChanged(int value);
+    void frequencyChanged();
+    void instantaneousFrequencyChanged(qreal value);
+    void averageFrequencyChanged(qreal value);
+
+public slots:
+    Q_INVOKABLE void notify();
+    Q_INVOKABLE void trace();
+    void setActive(bool value);
+    void setLabel(const QString &value);
+    void setSamplingInterval(int value);
+    void setTraceInterval(int value);
+
+private:
+    FrequencyMonitorPrivate *d_ptr;
+};
+
+#endif // FREQUENCYMONITOR_H
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitor.pri b/demos/video/snippets/frequencymonitor/frequencymonitor.pri
new file mode 100644
index 0000000000..f9dcb3414a
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitor.pri
@@ -0,0 +1,6 @@
+HEADERS += $$PWD/frequencymonitor.h
+SOURCES += $$PWD/frequencymonitor.cpp
+INCLUDEPATH += $$PWD
+DEFINES += FREQUENCYMONITOR_SUPPORT
+message("frequencymonitor.pri loaded")
+
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp b/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
new file mode 100644
index 0000000000..595dd0837a
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "frequencymonitor.h"
+#include <QtDeclarative/qdeclarative.h>
+
+void FrequencyMonitor::qmlRegisterType()
+{
+    ::qmlRegisterType<FrequencyMonitor>("FrequencyMonitor", 1, 0, "FrequencyMonitor");
+}
diff --git a/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.pri b/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
new file mode 100644
index 0000000000..a6868385f2
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/frequencymonitordeclarative.pri
@@ -0,0 +1,17 @@
+include($$PWD/frequencymonitor.pri)
+QT += declarative
+SOURCES += $$PWD/frequencymonitordeclarative.cpp
+
+defineTest(frequencyItemAddDeployment) {
+    symbian: frequencyitem_folder.source = $$PWD/$$SNIPPETS_PATH/frequencymonitor/qml/frequencymonitor
+    else: frequencyitem_folder.source = $$SNIPPETS_PATH/frequencymonitor/qml/frequencymonitor
+    frequencyitem_folder.target = qml
+    DEPLOYMENTFOLDERS += frequencyitem_folder
+
+    export(frequencyitem_folder.source)
+    export(frequencyitem_folder.target)
+    export(DEPLOYMENTFOLDERS)
+}
+
+message("frequencymonitordeclarative.pri loaded")
+
diff --git a/demos/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml b/demos/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
new file mode 100644
index 0000000000..fd6d75de85
--- /dev/null
+++ b/demos/video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import FrequencyMonitor 1.0
+
+Rectangle {
+    id: root
+    property bool logging: true
+    property bool displayed: true
+    property bool enabled: logging || displayed
+    property alias active: monitor.active
+    property int samplingInterval: 500
+    property color textColor: "yellow"
+    property int textSize: 20
+    property alias label: monitor.label
+
+    border.width: 1
+    border.color: "yellow"
+    width: 5.5 * root.textSize
+    height: 3.0 * root.textSize
+    color: "black"
+    opacity: 0.5
+    radius: 10
+    visible: displayed && active
+
+    // This should ensure that the monitor is on top of all other content
+    z: 999
+
+    function notify() {
+        monitor.notify()
+    }
+
+    FrequencyMonitor {
+        id: monitor
+        samplingInterval: root.enabled ? root.samplingInterval : 0
+        onAverageFrequencyChanged: {
+            if (root.logging) trace()
+            averageFrequencyText.text = monitor.averageFrequency.toFixed(2)
+        }
+    }
+
+    Text {
+        id: labelText
+        anchors {
+            left: parent.left
+            top: parent.top
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: 0.6 * root.textSize
+        text: root.label
+        width: root.width - 2*anchors.margins
+        elide: Text.ElideRight
+    }
+
+    Text {
+        id: averageFrequencyText
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: root.textSize
+    }
+}
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.cpp b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.cpp
new file mode 100644
index 0000000000..bb4e331122
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.cpp
@@ -0,0 +1,391 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "graphicsmemorymonitor.h"
+#include <QtCore/QDebug>
+#include <QtCore/QTimer>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEngine>
+#include <QtGui/QWidget>
+
+#ifdef Q_OS_SYMBIAN
+#ifdef GRAPHICSMEMORYMONITOR_EGL
+#define EGL_RESOURCE_PROFILING_SUPPORT
+#endif
+#endif
+
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+#include <EGL/egl.h>
+typedef EGLBoolean (*PFNEGLQUERYPROFILINGDATANOK)(EGLDisplay, EGLint, EGLint *, EGLint, EGLint *);
+#endif
+
+//#define VERBOSE_TRACE
+
+inline QDebug qtTrace() { return qDebug() << "[graphicsmemorymonitor]"; }
+#ifdef VERBOSE_TRACE
+inline QDebug qtVerboseTrace() { return qtTrace(); }
+#else
+inline QNoDebug qtVerboseTrace() { return QNoDebug(); }
+#endif
+
+static const qint64 DefaultUpdateInterval = 1000;
+
+// Helper function
+QString humanReadableSize(qint64 size)
+{
+    static const qint64 KB = 1024;
+    static const qint64 MB = KB * KB;
+    static const qint64 GB = MB * KB;
+    static const qint64 TB = GB * KB;
+    QString suffix = "B";
+    qint64 factor = 1;
+    qreal n = size;
+    if (size > TB) {
+        suffix = "TB";
+        factor = TB;
+    } else if (size > GB) {
+        suffix = "GB";
+        factor = GB;
+    } else if (size > MB) {
+        suffix = "MB";
+        factor = MB;
+    } else if (size > KB) {
+        suffix = "KB";
+        factor = KB;
+    }
+    n = n / qreal(factor);
+    return QString("%1 %2").arg(n, 6, 'f', 2).arg(suffix);
+}
+
+class GraphicsMemoryMonitorPrivate : public QObject
+{
+    Q_OBJECT
+public:
+    GraphicsMemoryMonitorPrivate(GraphicsMemoryMonitor *parent);
+    ~GraphicsMemoryMonitorPrivate();
+
+private:
+    void ensureEglExtension();
+
+public slots:
+    void update();
+
+public:
+    GraphicsMemoryMonitor *const q_ptr;
+    QTimer *m_timer;
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+    EGLDisplay m_eglDisplay;
+    PFNEGLQUERYPROFILINGDATANOK m_eglQueryProfilingDataNOK;
+#endif
+#ifdef Q_OS_SYMBIAN
+    TFullName m_processName;
+#endif
+    QByteArray m_buffer;
+    qint64 m_currentProcessId;
+    qint64 m_totalMemory;
+    qint64 m_usedMemory;
+    qint64 m_currentProcessUsage;
+    QList<GraphicsMemoryMonitor::ProcessInfo> m_processList;
+};
+
+GraphicsMemoryMonitorPrivate::GraphicsMemoryMonitorPrivate(GraphicsMemoryMonitor *parent)
+:   QObject(parent)
+,   q_ptr(parent)
+,   m_timer(new QTimer(this))
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+,   m_eglDisplay(EGL_NO_DISPLAY)
+,   m_eglQueryProfilingDataNOK(0)
+#endif
+,   m_currentProcessId(0)
+,   m_totalMemory(0)
+,   m_usedMemory(0)
+,   m_currentProcessUsage(0)
+{
+    connect(m_timer, SIGNAL(timeout()),
+            this, SLOT(update()));
+    m_timer->setInterval(DefaultUpdateInterval);
+    m_timer->start();
+#ifdef Q_OS_SYMBIAN
+    m_currentProcessId = RProcess().Id().operator unsigned int();
+#endif
+}
+
+GraphicsMemoryMonitorPrivate::~GraphicsMemoryMonitorPrivate()
+{
+
+}
+
+void GraphicsMemoryMonitorPrivate::ensureEglExtension()
+{
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+    if (!m_eglQueryProfilingDataNOK) {
+        m_eglDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+        qtTrace() << "GraphicsMemoryMonitorPrivate::ensureEglExtension" << "eglDisplay" << m_eglDisplay;
+        if (m_eglDisplay == EGL_NO_DISPLAY)
+            qtTrace() << "No EGL display";
+        else
+            m_eglQueryProfilingDataNOK = reinterpret_cast<PFNEGLQUERYPROFILINGDATANOK>(eglGetProcAddress("eglQueryProfilingDataNOK"));
+        if (m_eglQueryProfilingDataNOK)
+            q_ptr->emit activeChanged();
+        else
+            qtTrace() << "eglQueryProfilingDataNOK extension not found";
+    }
+#endif
+}
+
+void GraphicsMemoryMonitorPrivate::update()
+{
+    qint64 totalMemory = 0;
+    qint64 usedMemory = 0;
+    qint64 currentProcessUsage = 0;
+    QList<GraphicsMemoryMonitor::ProcessInfo> processList;
+
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+    ensureEglExtension();
+    if (m_eglQueryProfilingDataNOK) {
+        // Ensure we have an EGL connection, in case we are using raster graphics
+        eglInitialize(m_eglDisplay, 0, 0);
+
+        GraphicsMemoryMonitor::ProcessInfo process;
+        process.pid = 0;
+        EGLint count = 0;
+        m_eglQueryProfilingDataNOK(m_eglDisplay, EGL_PROF_QUERY_MEMORY_USAGE_BIT_NOK | EGL_PROF_QUERY_GLOBAL_BIT_NOK, NULL, 0, &count);
+        m_buffer.resize(count * sizeof(EGLint));
+        m_buffer.fill(0);
+        EGLint *data = reinterpret_cast<EGLint *>(m_buffer.data());
+        m_eglQueryProfilingDataNOK(m_eglDisplay, EGL_PROF_QUERY_MEMORY_USAGE_BIT_NOK | EGL_PROF_QUERY_GLOBAL_BIT_NOK, data, count, &count);
+        for (int i=0; i<count; ++i) {
+            switch (data[i]) {
+            case EGL_PROF_TOTAL_MEMORY_NOK:
+                totalMemory = data[++i];
+                break;
+            case EGL_PROF_USED_MEMORY_NOK:
+                usedMemory = data[++i];
+                break;
+            case EGL_PROF_PROCESS_ID_NOK:
+            {
+                if (process.pid)
+                    processList << process;
+                process.pid = quint64(data[i+1]) + (quint64(data[i+2]) << 32);
+                process.name = QString();
+                i += 2;
+                RProcess p;
+                const TInt err = p.Open(TProcessId(process.pid));
+                if (!err) {
+                    m_processName = p.FullName();
+                    TPtr8 name = m_processName.Collapse();
+                    process.name = QString(reinterpret_cast<const char *>(name.PtrZ()));
+                    p.Close();
+                }
+                process.privateUsage = 0;
+                process.sharedUsage = 0;
+            }
+                break;
+            case EGL_PROF_PROCESS_USED_PRIVATE_MEMORY_NOK:
+                process.privateUsage = data[++i];
+                break;
+            case EGL_PROF_PROCESS_USED_SHARED_MEMORY_NOK:
+                process.sharedUsage = data[++i];
+                break;
+            default:
+                qtTrace() << "unknown data" << "index" << i << "data" << reinterpret_cast<void *>(data[i]);
+                break;
+            }
+        }
+        if (process.pid)
+            processList << process;
+    }
+#endif // EGL_RESOURCE_PROFILING_SUPPORT
+
+    bool processListChanged = (m_processList.count() != processList.count());
+    if (!processListChanged) {
+        for (int i=0; !processListChanged && i<m_processList.count(); ++i) {
+            const GraphicsMemoryMonitor::ProcessInfo &oldProcess = m_processList.at(i);
+            const GraphicsMemoryMonitor::ProcessInfo &newProcess = processList.at(i);
+            processListChanged = (oldProcess.pid != newProcess.pid) ||
+                                 (oldProcess.privateUsage != newProcess.privateUsage) ||
+                                 (oldProcess.sharedUsage != newProcess.sharedUsage);
+        }
+    }
+
+    foreach (GraphicsMemoryMonitor::ProcessInfo process, m_processList)
+        if (m_currentProcessId == process.pid)
+            currentProcessUsage = process.privateUsage + process.sharedUsage;
+
+    bool availableMemoryChanged = false;
+    if (totalMemory != m_totalMemory) {
+        m_totalMemory = totalMemory;
+        availableMemoryChanged = true;
+        q_ptr->emit totalMemoryChanged(q_ptr->totalMemory());
+        q_ptr->emit totalMemoryHumanReadableChanged(q_ptr->totalMemoryHumanReadable());
+    }
+    if (usedMemory != m_usedMemory) {
+        m_usedMemory = usedMemory;
+        availableMemoryChanged = true;
+        q_ptr->emit usedMemoryChanged(q_ptr->usedMemory());
+        q_ptr->emit usedMemoryHumanReadableChanged(q_ptr->usedMemoryHumanReadable());
+    }
+    bool hasChanged = availableMemoryChanged;
+    if (availableMemoryChanged) {
+        q_ptr->emit availableMemoryChanged(q_ptr->availableMemory());
+        q_ptr->emit availableMemoryHumanReadableChanged(q_ptr->availableMemoryHumanReadable());
+    }
+    if (currentProcessUsage != m_currentProcessUsage) {
+        m_currentProcessUsage = currentProcessUsage;
+        hasChanged = true;
+        q_ptr->emit currentProcessUsageChanged(q_ptr->currentProcessUsage());
+        q_ptr->emit currentProcessUsageHumanReadableChanged(q_ptr->currentProcessUsageHumanReadable());
+    }
+    if (processListChanged) {
+        m_processList = processList;
+        hasChanged = true;
+        q_ptr->emit processListChanged(m_processList);
+    }
+    if (hasChanged)
+        q_ptr->emit changed();
+}
+
+GraphicsMemoryMonitor::GraphicsMemoryMonitor(QObject *parent)
+:   QObject(parent)
+,   d_ptr(0)
+{
+    qtTrace() << "GraphicsMemoryMonitor::GraphicsMemoryMonitor";
+    d_ptr = new GraphicsMemoryMonitorPrivate(this);
+    d_ptr->update();
+}
+
+GraphicsMemoryMonitor::~GraphicsMemoryMonitor()
+{
+    qtTrace() << "GraphicsMemoryMonitor::~GraphicsMemoryMonitor";
+}
+
+bool GraphicsMemoryMonitor::active() const
+{
+#ifdef EGL_RESOURCE_PROFILING_SUPPORT
+    return (d_ptr->m_eglQueryProfilingDataNOK != 0);
+#else
+    return false;
+#endif
+}
+
+qint64 GraphicsMemoryMonitor::updateInterval() const
+{
+    return d_ptr->m_timer->isActive() ? d_ptr->m_timer->interval() : 0;
+}
+
+void GraphicsMemoryMonitor::setUpdateInterval(qint64 value)
+{
+    if (value != updateInterval()) {
+        if (value) {
+            d_ptr->m_timer->setInterval(value);
+            d_ptr->m_timer->start();
+        } else {
+            d_ptr->m_timer->stop();
+        }
+    }
+}
+
+qint64 GraphicsMemoryMonitor::totalMemory() const
+{
+    return d_ptr->m_totalMemory;
+}
+
+QString GraphicsMemoryMonitor::totalMemoryHumanReadable() const
+{
+    return humanReadableSize(totalMemory());
+}
+
+qint64 GraphicsMemoryMonitor::usedMemory() const
+{
+    return d_ptr->m_usedMemory;
+}
+
+QString GraphicsMemoryMonitor::usedMemoryHumanReadable() const
+{
+    return humanReadableSize(usedMemory());
+}
+
+qint64 GraphicsMemoryMonitor::availableMemory() const
+{
+    return totalMemory() - usedMemory();
+}
+
+QString GraphicsMemoryMonitor::availableMemoryHumanReadable() const
+{
+    return humanReadableSize(availableMemory());
+}
+
+qint64 GraphicsMemoryMonitor::currentProcessUsage() const
+{
+    return d_ptr->m_currentProcessUsage;
+}
+
+QString GraphicsMemoryMonitor::currentProcessUsageHumanReadable() const
+{
+    return humanReadableSize(currentProcessUsage());
+}
+
+const QList<GraphicsMemoryMonitor::ProcessInfo> &GraphicsMemoryMonitor::processList() const
+{
+    return d_ptr->m_processList;
+}
+
+void GraphicsMemoryMonitor::update()
+{
+    d_ptr->update();
+}
+
+void GraphicsMemoryMonitor::trace()
+{
+    qtTrace() << "GraphicsMemoryMonitor::trace";
+    qtTrace() << "    Total memory:         " << d_ptr->m_totalMemory;
+    qtTrace() << "    Used memory:          " << d_ptr->m_usedMemory;
+    qtTrace() << "    Available memory:     " << d_ptr->m_totalMemory - d_ptr->m_usedMemory;
+    qtTrace() << "    Current process ID:   " << d_ptr->m_currentProcessId;
+    qtTrace() << "    Current process usage:" << d_ptr->m_currentProcessUsage;
+    foreach (ProcessInfo process, d_ptr->m_processList) {
+        qtTrace() << "    Process ID" << process.pid << "name" << process.name;
+        qtTrace() << "        Private usage:" << process.privateUsage;
+        qtTrace() << "        Shared usage: " << process.sharedUsage;
+    }
+}
+
+#include "graphicsmemorymonitor.moc"
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.h b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.h
new file mode 100644
index 0000000000..a197febbb1
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.h
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef GRAPHICSMEMORYMONITOR_H
+#define GRAPHICSMEMORYMONITOR_H
+
+#include <QtCore/QObject>
+#include <QtCore/QProcess>
+
+class GraphicsMemoryMonitorPrivate;
+
+class GraphicsMemoryMonitor : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(GraphicsMemoryMonitor)
+    Q_PROPERTY(bool active READ active NOTIFY activeChanged)
+    Q_PROPERTY(qint64 totalMemory READ totalMemory NOTIFY totalMemoryChanged)
+    Q_PROPERTY(QString totalMemoryHumanReadable READ totalMemoryHumanReadable NOTIFY totalMemoryHumanReadableChanged)
+    Q_PROPERTY(qint64 usedMemory READ usedMemory NOTIFY usedMemoryChanged)
+    Q_PROPERTY(QString usedMemoryHumanReadable READ usedMemoryHumanReadable NOTIFY usedMemoryHumanReadableChanged)
+    Q_PROPERTY(qint64 availableMemory READ availableMemory NOTIFY availableMemoryChanged)
+    Q_PROPERTY(QString availableMemoryHumanReadable READ availableMemoryHumanReadable NOTIFY availableMemoryHumanReadableChanged)
+    Q_PROPERTY(qint64 currentProcessUsage READ currentProcessUsage NOTIFY currentProcessUsageChanged)
+    Q_PROPERTY(QString currentProcessUsageHumanReadable READ currentProcessUsageHumanReadable NOTIFY currentProcessUsageHumanReadableChanged)
+    Q_PROPERTY(qint64 updateInterval READ updateInterval WRITE setUpdateInterval NOTIFY updateIntervalChanged)
+public:
+    GraphicsMemoryMonitor(QObject *parent = 0);
+    ~GraphicsMemoryMonitor();
+
+    static void qmlRegisterType();
+
+    bool active() const;
+
+    qint64 updateInterval() const;
+    void setUpdateInterval(qint64 value);
+
+    qint64 totalMemory() const;
+    QString totalMemoryHumanReadable() const;
+
+    qint64 usedMemory() const;
+    QString usedMemoryHumanReadable() const;
+
+    qint64 availableMemory() const;
+    QString availableMemoryHumanReadable() const;
+
+    qint64 currentProcessUsage() const;
+    QString currentProcessUsageHumanReadable() const;
+
+    struct ProcessInfo
+    {
+        qint64 pid;
+        QString name;
+        qint64 privateUsage;
+        qint64 sharedUsage;
+    };
+
+    const QList<ProcessInfo> &processList() const;
+
+public slots:
+    Q_INVOKABLE void update();
+    void trace();
+
+signals:
+    void activeChanged();
+    void updateIntervalChanged();
+    void changed();
+    void totalMemoryChanged(qint64);
+    void totalMemoryHumanReadableChanged(QString);
+    void usedMemoryChanged(qint64);
+    void usedMemoryHumanReadableChanged(QString);
+    void availableMemoryChanged(qint64);
+    void availableMemoryHumanReadableChanged(QString);
+    void currentProcessUsageChanged(qint64);
+    void currentProcessUsageHumanReadableChanged(QString);
+    void processListChanged(const QList<GraphicsMemoryMonitor::ProcessInfo> &);
+
+private:
+    GraphicsMemoryMonitorPrivate *d_ptr;
+};
+
+#endif // GRAPHICSMEMORYMONITOR_H
+
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.pri b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.pri
new file mode 100644
index 0000000000..67bde6f20a
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.pri
@@ -0,0 +1,12 @@
+HEADERS += $$PWD/graphicsmemorymonitor.h
+SOURCES += $$PWD/graphicsmemorymonitor.cpp
+INCLUDEPATH += $$PWD
+DEFINES += GRAPHICSMEMORYMONITOR_SUPPORT
+symbian {
+    contains(QT_CONFIG, egl) {
+        DEFINES += GRAPHICSMEMORYMONITOR_EGL
+        LIBS += -llibegl
+    }
+}
+message("graphicsmemorymonitor.pri loaded")
+
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.cpp b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.cpp
new file mode 100644
index 0000000000..aea7f143dd
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.cpp
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "graphicsmemorymonitor.h"
+#include <QtDeclarative/qdeclarative.h>
+
+void GraphicsMemoryMonitor::qmlRegisterType()
+{
+    ::qmlRegisterType<GraphicsMemoryMonitor>("GraphicsMemoryMonitor", 1, 0, "GraphicsMemoryMonitor");
+}
+
diff --git a/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.pri b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.pri
new file mode 100644
index 0000000000..7d07436501
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.pri
@@ -0,0 +1,17 @@
+include($$PWD/graphicsmemorymonitor.pri)
+QT += declarative
+SOURCES += $$PWD/graphicsmemorymonitordeclarative.cpp
+
+defineTest(graphicsMemoryItemAddDeployment) {
+    symbian: graphicsmemoryitem_folder.source = $$PWD/$$SNIPPETS_PATH/graphicsmemorymonitor/qml/graphicsmemorymonitor
+    else: graphicsmemoryitem_folder.source = $$SNIPPETS_PATH/graphicsmemorymonitor/qml/graphicsmemorymonitor
+    graphicsmemoryitem_folder.target = qml
+    DEPLOYMENTFOLDERS += graphicsmemoryitem_folder
+
+    export(graphicsmemoryitem_folder.source)
+    export(graphicsmemoryitem_folder.target)
+    export(DEPLOYMENTFOLDERS)
+}
+
+message("graphicsmemorymonitordeclarative.pri loaded")
+
diff --git a/demos/video/snippets/graphicsmemorymonitor/qml/graphicsmemorymonitor/GraphicsMemoryItem.qml b/demos/video/snippets/graphicsmemorymonitor/qml/graphicsmemorymonitor/GraphicsMemoryItem.qml
new file mode 100644
index 0000000000..5bf14a8e62
--- /dev/null
+++ b/demos/video/snippets/graphicsmemorymonitor/qml/graphicsmemorymonitor/GraphicsMemoryItem.qml
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+import GraphicsMemoryMonitor 1.0
+
+Rectangle {
+    id: root
+    property bool logging: true
+    property bool displayed: true
+    property bool enabled: logging || displayed
+    property int updateInterval: 500
+    property color textColor: "yellow"
+    property int textSize: 20
+
+    border.width: 1
+    border.color: "yellow"
+    width: 5.6 * root.textSize
+    height: 4.3 * root.textSize
+    color: "black"
+    opacity: 0.5
+    radius: 10
+    visible: displayed && monitor.active
+
+    // This should ensure that the monitor is on top of all other content
+    z: 999
+
+    GraphicsMemoryMonitor {
+        id: monitor
+        updateInterval: root.enabled ? root.updateInterval : 0
+        onChanged: if (root.logging) trace()
+    }
+
+    Text {
+        anchors {
+            right: parent.right
+            top: parent.top
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: root.textSize
+        text: monitor.usedMemoryHumanReadable
+    }
+
+    Text {
+        anchors {
+            right: parent.right
+            verticalCenter: parent.verticalCenter
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: root.textSize
+        text: monitor.currentProcessUsageHumanReadable
+    }
+
+    Text {
+        anchors {
+            right: parent.right
+            bottom: parent.bottom
+            margins: 10
+        }
+        color: root.textColor
+        font.pixelSize: root.textSize
+        text: monitor.totalMemoryHumanReadable
+    }
+}
+
diff --git a/demos/video/snippets/painteventmonitor/painteventmonitor.cpp b/demos/video/snippets/painteventmonitor/painteventmonitor.cpp
new file mode 100644
index 0000000000..9218654681
--- /dev/null
+++ b/demos/video/snippets/painteventmonitor/painteventmonitor.cpp
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "painteventmonitor.h"
+#include <QtCore/QEvent>
+#include <QtGui/QWidget>
+
+PaintEventMonitor::PaintEventMonitor(QObject *parent)
+:   QObject(parent)
+,    m_target(0)
+{
+
+}
+
+PaintEventMonitor::~PaintEventMonitor()
+{
+
+}
+
+QWidget *PaintEventMonitor::target() const
+{
+    return m_target;
+}
+
+void PaintEventMonitor::setTarget(QWidget *value)
+{
+    if (m_target != value) {
+        if (m_target)
+            m_target->removeEventFilter(this);
+        m_target = value;
+        if (m_target)
+            m_target->installEventFilter(this);
+    }
+}
+
+bool PaintEventMonitor::eventFilter(QObject *object, QEvent *event)
+{
+    if (m_target == object && event->type() == QEvent::Paint)
+        emit targetPainted();
+    return QObject::eventFilter(object, event);
+}
+
diff --git a/demos/video/snippets/painteventmonitor/painteventmonitor.h b/demos/video/snippets/painteventmonitor/painteventmonitor.h
new file mode 100644
index 0000000000..bd14eb88ea
--- /dev/null
+++ b/demos/video/snippets/painteventmonitor/painteventmonitor.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef PAINTEVENTMONITOR_H
+#define PAINTEVENTMONITOR_H
+
+#include <QtCore/QObject>
+
+class QWidget;
+
+class PaintEventMonitor : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QWidget *target READ target WRITE setTarget NOTIFY targetChanged)
+public:
+    PaintEventMonitor(QObject *parent = 0);
+    ~PaintEventMonitor();
+
+    QWidget *target() const;
+    void setTarget(QWidget *value);
+
+protected:
+    bool eventFilter(QObject *object, QEvent *event);
+
+signals:
+    void targetChanged();
+    void targetPainted();
+
+private:
+    QWidget *m_target;
+};
+
+#endif // PAINTEVENTMONITOR_H
diff --git a/demos/video/snippets/painteventmonitor/painteventmonitor.pri b/demos/video/snippets/painteventmonitor/painteventmonitor.pri
new file mode 100644
index 0000000000..ec363c29f7
--- /dev/null
+++ b/demos/video/snippets/painteventmonitor/painteventmonitor.pri
@@ -0,0 +1,7 @@
+INCLUDEPATH += $$PWD
+HEADERS += $$PWD/painteventmonitor.h
+SOURCES += $$PWD/painteventmonitor.cpp
+DEFINES += PAINTEVENTMONITOR_SUPPORT
+
+message("painteventmonitordeclarative.pri loaded")
+
diff --git a/demos/video/snippets/performancemonitor/performancemonitor.cpp b/demos/video/snippets/performancemonitor/performancemonitor.cpp
new file mode 100644
index 0000000000..73ebe291f9
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitor.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "performancemonitor.h"
+#include <QtCore/QString>
+
+namespace PerformanceMonitor {
+
+    bool parseArgument(const QString &arg, State &state)
+    {
+        bool result = false;
+        if ("-log-perf" == arg) {
+            state.logging = true;
+            state.valid = true;
+            result = true;
+        } else if ("-no-log-perf" == arg) {
+            state.logging = false;
+            state.valid = true;
+            result = true;
+        } else if ("-show-perf" == arg) {
+            state.visible = true;
+            state.valid = true;
+            result = true;
+        } else if ("-hide-perf" == arg) {
+            state.visible = false;
+            state.valid = true;
+            result = true;
+        }
+        return result;
+    }
+
+}
diff --git a/demos/video/snippets/performancemonitor/performancemonitor.h b/demos/video/snippets/performancemonitor/performancemonitor.h
new file mode 100644
index 0000000000..59e90550f0
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitor.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef PERFORMANCEMONITOR_H
+#define PERFORMANCEMONITOR_H
+
+class QString;
+
+namespace PerformanceMonitor {
+    struct State {
+        bool valid;
+        bool logging;
+        bool visible;
+
+        State() : valid(true), logging(false), visible(true) { }
+        State(bool l, bool v) : valid(true), logging(l), visible(v) { }
+        bool operator==(const State &other) const
+        { return logging == other.logging && visible == other.visible; }
+        bool operator!=(const State &other) const
+        { return logging != other.logging || visible != other.visible; }
+    };
+
+    bool parseArgument(const QString &arg, State &state);
+}
+
+#endif // PERFORMANCEMONITOR_H
+
diff --git a/demos/video/snippets/performancemonitor/performancemonitor.pri b/demos/video/snippets/performancemonitor/performancemonitor.pri
new file mode 100644
index 0000000000..6622488b5c
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitor.pri
@@ -0,0 +1,7 @@
+INCLUDEPATH += $$PWD
+HEADERS += $$PWD/performancemonitor.h
+SOURCES += $$PWD/performancemonitor.cpp
+DEFINES += PERFORMANCEMONITOR_SUPPORT
+
+message("performancemonitor.pri loaded")
+
diff --git a/demos/video/snippets/performancemonitor/performancemonitordeclarative.cpp b/demos/video/snippets/performancemonitor/performancemonitordeclarative.cpp
new file mode 100644
index 0000000000..955f8993ab
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitordeclarative.cpp
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "frequencymonitor.h"
+#include "graphicsmemorymonitor.h"
+#include "performancemonitor.h"
+
+namespace PerformanceMonitor {
+
+    void qmlRegisterTypes()
+    {
+        FrequencyMonitor::qmlRegisterType();
+        GraphicsMemoryMonitor::qmlRegisterType();
+    }
+}
diff --git a/demos/video/snippets/performancemonitor/performancemonitordeclarative.h b/demos/video/snippets/performancemonitor/performancemonitordeclarative.h
new file mode 100644
index 0000000000..dccdd5ebbf
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitordeclarative.h
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef PERFORMANCEMONITORDECLARATIVE_H
+#define PERFORMANCEMONITORDECLARATIVE_H
+
+#include "performancemonitor.h"
+
+namespace PerformanceMonitor {
+    void qmlRegisterTypes();
+}
+
+#endif // PERFORMANCEMONITORDECLARATIVE_H
diff --git a/demos/video/snippets/performancemonitor/performancemonitordeclarative.pri b/demos/video/snippets/performancemonitor/performancemonitordeclarative.pri
new file mode 100644
index 0000000000..b7c0a5bd30
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/performancemonitordeclarative.pri
@@ -0,0 +1,25 @@
+include($$PWD/../frequencymonitor/frequencymonitordeclarative.pri)
+include($$PWD/../graphicsmemorymonitor/graphicsmemorymonitordeclarative.pri)
+include($$PWD/../painteventmonitor/painteventmonitor.pri)
+include($$PWD/performancemonitor.pri)
+
+HEADERS += $$PWD/performancemonitordeclarative.h
+SOURCES += $$PWD/performancemonitordeclarative.cpp
+
+PERFORMANCE_ROOT = $$PWD
+
+defineTest(performanceItemAddDeployment) {
+    frequencyItemAddDeployment()
+    graphicsMemoryItemAddDeployment()
+
+    symbian: performanceitem_folder.source = $$PWD/$$SNIPPETS_PATH/performancemonitor/qml/performancemonitor
+    else: performanceitem_folder.source = $$SNIPPETS_PATH/performancemonitor/qml/performancemonitor
+    performanceitem_folder.target = qml
+    DEPLOYMENTFOLDERS += performanceitem_folder
+
+    export(performanceitem_folder.source)
+    export(performanceitem_folder.target)
+    export(DEPLOYMENTFOLDERS)
+}
+
+message("performancemonitordeclarative.pri loaded")
diff --git a/demos/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml b/demos/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml
new file mode 100644
index 0000000000..07038929cf
--- /dev/null
+++ b/demos/video/snippets/performancemonitor/qml/performancemonitor/PerformanceItem.qml
@@ -0,0 +1,141 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    id: root
+    property bool logging: true
+    property bool displayed: true
+    property bool videoActive
+    property int margins: 5
+    property bool enabled: true
+
+    color: "transparent"
+
+    // This should ensure that the monitor is on top of all other content
+    z: 999
+
+    Column {
+        id: column
+        anchors {
+            fill: root
+            margins: 10
+        }
+        spacing: 10
+    }
+
+    QtObject {
+        id: d
+        property Item qmlFrameRateItem: null
+        property Item videoFrameRateItem: null
+    }
+
+    Connections {
+        id: videoFrameRateActiveConnections
+        ignoreUnknownSignals: true
+        onActiveChanged: root.videoActive = videoFrameRateActiveConnections.target.active
+    }
+
+    states: [
+        State {
+            name: "hidden"
+            PropertyChanges {
+                target: root
+                opacity: 0
+            }
+        }
+    ]
+
+    transitions: [
+        Transition {
+            from: "*"
+            to: "*"
+            NumberAnimation {
+                properties: "opacity"
+                easing.type: Easing.OutQuart
+                duration: 500
+            }
+        }
+    ]
+
+    state: enabled ? "baseState" : "hidden"
+
+    function createQmlFrameRateItem() {
+        var component = Qt.createComponent("../frequencymonitor/FrequencyItem.qml")
+        if (component.status == Component.Ready)
+            d.qmlFrameRateItem = component.createObject(column, { label: "QML frame rate",
+                                                                   displayed: root.displayed,
+                                                                  logging: root.logging
+                                                                })
+    }
+
+    function createVideoFrameRateItem() {
+        var component = Qt.createComponent("../frequencymonitor/FrequencyItem.qml")
+        if (component.status == Component.Ready)
+            d.videoFrameRateItem = component.createObject(column, { label: "Video frame rate",
+                                                                     displayed: root.displayed,
+                                                                    logging: root.logging
+                                                                  })
+        videoFrameRateActiveConnections.target = d.videoFrameRateItem
+    }
+
+
+    function init() {
+        createQmlFrameRateItem()
+        createVideoFrameRateItem()
+    }
+
+    function videoFramePainted() {
+        if (d.videoFrameRateItem)
+            d.videoFrameRateItem.notify()
+    }
+
+    function qmlFramePainted() {
+        if (d.qmlFrameRateItem)
+            d.qmlFrameRateItem.notify()
+    }
+
+    onVideoActiveChanged: {
+        if (d.videoFrameRateItem)
+            d.videoFrameRateItem.active = root.videoActive
+    }
+}
diff --git a/demos/video/video.pro b/demos/video/video.pro
new file mode 100644
index 0000000000..4f911b2b29
--- /dev/null
+++ b/demos/video/video.pro
@@ -0,0 +1,15 @@
+TEMPLATE = subdirs
+
+SUBDIRS += qmlvideo
+
+# qmlvideofx requires QtOpenGL and ShaderEffectItem (added in Qt 4.7.4)
+contains(QT_CONFIG, opengl) {
+    lessThan(QT_MAJOR_VERSION, 5) {
+        !lessThan(QT_MAJOR_VERSION, 4) {
+            SUBDIRS += qmlvideofx
+        }
+    } else {
+        SUBDIRS += qmlvideofx
+    }
+}
+
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index b2c4ec2703..34454c2ade 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -104,6 +104,8 @@
     \o \l{radio}{Radio}
     \o \l{slideshow}{Slideshow}
     \o \l{declarative-camera}{Declarative Camera}
+    \o \l{video/qmlvideo}{QML Video}
+    \o \l{video/qmlvideofx}{QML Video Shader Effects}
     \endlist
 
     \section2 Organizer
diff --git a/doc/src/examples/declarative-music-browser.qdoc b/doc/src/examples/declarative-music-browser.qdoc
index 5c785f84a7..d31c57bb28 100644
--- a/doc/src/examples/declarative-music-browser.qdoc
+++ b/doc/src/examples/declarative-music-browser.qdoc
@@ -48,4 +48,12 @@
     information about a song provided by the \l DocumentGalleryItem element. Property
     values changed in this dialog are written back to the \l DocumentGalleryItem
     element and saved to the gallery.
+
+    \section1 Known Issues
+    \list
+        \o Album covers are not shown in Symbian.
+        \o Run this application as "user" in MeeGo 1.2 Harmattan in order to get
+           thumbnails of album covers shown properly.
+    \endlist
 */
+
diff --git a/doc/src/examples/declarative-sfw-dialer.qdoc b/doc/src/examples/declarative-sfw-dialer.qdoc
index 2dc27696d1..9a68cc7545 100644..100755
--- a/doc/src/examples/declarative-sfw-dialer.qdoc
+++ b/doc/src/examples/declarative-sfw-dialer.qdoc
@@ -30,39 +30,24 @@
 
 \title Service Framework using QML Example
 
-\bold {Execution}
+\section1 Execution
 
-This example requires the example dialer services to be pre-registered in order
-for the application to discover and load the services. This can be done by using the
-service framework command line tool to add the corresponding service XML file:
+Qt Creator is recommended and easiest way to compile, deploy and execute this application.
 
-\list
-    \o ./servicefw add voipdialerservice.xml
-    \o ./servicefw add landlinedialerservice.xml
-    \o ./servicefw add remotedialerservice.xml
-    \o ./servicefw dbusservice removedialerservice.xml dialer_service
-\endlist
-
-These deployment commands will register the two plugin-based services as well as the remote
-IPC-based service. The last line features the ability to create an autostarting file for
-D-Bus if the platform supports the QtDBus module, typically available on Linux systems.
+The following steps have to be done manually if this application is to be executed in Qt
+Simulator:
 
-There are 2 ways to run the example:
 \list
-    \o ./qmldialer (only method for Symbian)
-    \o qmldialer declarative-sfw-dialer.qml
-\endlist
-
-The XML files for all example services can be found in the QtMobility build directory
-under install/bin/xmldata.
+    \o Plugin based services (\c landlinedialer and \c voipdialer) must be manually copied 
+       to the same directory as the \c qmldialer executable.
+       IPC-based services (\c remotedialer in this example) are not supported by Qt Simulator.
 
-For Maemo and Linux platforms using D-Bus as the underlying IPC mechanism, the
-autostart feature can be initialised by running the service framework tool:
-\code
-    servicefw dbusservice xmldata/remotedialerservice.xml dialer_service
-\endcode
+    \o A new \c xmldata folder must be created in the same directory as \c qmldialer
+       executable, and the xml files for service plugins (landlinedialerservice.xml and 
+       voipdialerservice.xml) must be copied to that folder.
+\endlist
 
-\bold {Explanation}
+\section1 Explanation
 
 This example should demonstrate how to use the Service Framework to
 access a list of services in a QML context. A library plugin provides QML with elements
@@ -82,14 +67,14 @@ The following steps outline how to make a QML based application using the Servic
 It is assumed that QtMobility has been successfully built and environment variables have been set
 as per \l {Installation Guide}.
 
-\bold {Service Framework in QML:}
+\section2 Service Framework in QML
 
 To included the Service Framework QML plugin to our QML file we need to import it as follows:
 
 \snippet declarative-sfw-dialer/declarative-sfw-dialer/content-sfw-dialer/DialerList.qml 4
 
 
-\bold {The Services:}
+\section2 The Services
 
 The services are implemented in a shared library and can be register in the service framework.
 After the service is registered it can be used in different applications.
@@ -106,8 +91,6 @@ Those projects will create a shared library in each case.
 
 If the library needs to be available over the Service Framework,
 we need to register the library.
-In our example this will be done manually by using the servicefw tool. Refer to the project
-README for further details.
 
 As you can see we register the services using a xml file.
 This xml file basically contains all information to register the shared library in the
@@ -139,7 +122,7 @@ want to access in out QML script later.
 \snippet declarative-sfw-dialer/voipdialer/voipdialer.h 0
 
 
-\bold {Service access on the QML site}
+\section2 Service access on the QML site
 
 The QML elements are implemented in 4 different qml scripting files
 \l {guidesign}{ see GUI design}.
@@ -170,9 +153,9 @@ Another component can be created for highliting a list item:
 
 \snippet declarative-sfw-dialer/declarative-sfw-dialer/content-sfw-dialer/DialerList.qml 3
 
-\bold {Service signals and function calls on the QML site}
+\section2 Service signals and function calls on the QML site
 
-In sfw-kinetic-example.qml we define a control named DialScreen and implement
+In declarative-sfw-dialer.qml we define a control named DialScreen and implement
 the function onDial and onHangup.
 As you can see in the onDial event we call the service function dialNumber and
 the onHangup calls hangup.
@@ -197,4 +180,109 @@ This is done in our main declarative file:
 The DialScreen.currentDialer is assigned during a ListView item click in the
 \l {DialerList_qml_2}{ ServiceList.qml file}.
 
+\section1 Deployment of services
+
+In this example application services are registered by QServiceManager::addService() method and
+this is a reason why XML service description files are copied to /xmldata folder under 
+/bin folder of declarative-sfw-dialer application.
+
+landlinedialer.pro:
+
+\code
+xml.path = /opt/declarative-sfw-dialer/bin/xmldata
+xml.files = landlinedialerservice.xml
+INSTALLS += xml
+\endcode
+
+qmldialer.cpp:
+
+\snippet declarative-sfw-dialer/declarative-sfw-dialer/qmldialer.cpp 0
+ 
+
+Note: Application does not need register services by itself in Symbian because automatic registration
+system is doing this on behalf of the application. More details in next chapter.
+
+\section2 Deployment in Symbian
+
+Automatic registration is used as registration method in this example application for application services. 
+See more details
+about \l {service-frameworks.html#automatic-registration}{Automatic Registration}.
+
+landlinedialer.pro:
+
+\code
+xmlautoimport.sources = landlinedialerservice.xml
+xmlautoimport.path = /private/2002AC7F/import/
+DEPLOYMENT += xmlautoimport
+\endcode
+
+Shared libraries (service plug-ins) are deployed same way as other Qt plug-ins in Symbian.
+\l {http://www.developer.nokia.com/Community/Wiki/CS001391_-_Implementing_the_Qt_plug-in_interface}{See more details.}
+
+landlinedialer.pro:
+
+\code
+load(data_caging_paths)
+pluginDep.sources = serviceframework_landlinedialerservice.dll
+pluginDep.path = $$QT_PLUGINS_BASE_DIR
+DEPLOYMENT += pluginDep
+\endcode
+
+\section2 Deployment in MeeGo 1.2 Harmattan
+ 
+In addition of general registration, explained in \l {Deployment of services}{"Deployment of services" chapter,}  service applications must be also registered to D-Bus for an autostarting if remote IPC-based service is used (remotedialer in this example). This can be done by defining .conf and .service files and adding
+following lines to the .pro file.
+
+remotedialer.pro:
+
+\code
+contains(MEEGO_EDITION,harmattan) {
+    remotedialer_conf.files = remotedialer.conf
+    remotedialer_conf.path = /etc/dbus-1/session.d/
+
+    remotedialer_service.files = com.nokia.qt.examples.dialer.service
+    remotedialer_service.path = /usr/share/dbus-1/services/
+
+    target.path = /opt/remotedialer/bin
+
+    INSTALLS += target remotedialer_conf remotedialer_service
+}
+\endcode
+
+remotedialer.conf:
+
+\code
+<busconfig>
+	<policy context="default">
+		<allow own="com.nokia.qt.examples.Dialer"/>
+	</policy>
+</busconfig>
+\endcode
+
+com.nokia.qt.examples.dialer.service:
+
+\code
+[D-BUS Service]
+Name=com.nokia.qtmobility.sfw.VoipDialer
+Exec= /opt/remotedialer/bin/dialer_service
+User=user
+\endcode
+
+Note: Service name defined in .service file must always start with \c com.nokia.qtmobility.sfw when
+registering is done for a service framework.
+
+In MeeGo 1.2 Harmattan target dialer services can be pre-registered also by service framework command line tool
+but this option is not needed if services has been deployed as descriped above.
+
+\list
+    \o ./servicefw add voipdialerservice.xml
+    \o ./servicefw add landlinedialerservice.xml
+    \o ./servicefw add remotedialerservice.xml
+    \o ./servicefw dbusservice removedialerservice.xml dialer_service
+\endlist
+
+These deployment commands will register the two plugin-based services as well as the remote
+IPC-based service. The last line features the ability to create an autostarting file for
+D-Bus if the platform supports the QtDBus module, typically available on Linux systems.
+
 */
diff --git a/doc/src/examples/mediabrowser.qdoc b/doc/src/examples/mediabrowser.qdoc
index 4faa251c3c..4167fdbaec 100644
--- a/doc/src/examples/mediabrowser.qdoc
+++ b/doc/src/examples/mediabrowser.qdoc
@@ -58,4 +58,12 @@
     duration, artist, and album artist properties of the listed songs, all
     of which with the exception of duration can be edited.  The Photos view is
     a grid of image thumbnails.
+
+    \section1 Known Issues
+    \list
+        \o Album covers are not shown in Symbian.
+        \o Run this application as "user" in MeeGo 1.2 Harmattan in order to get
+           thumbnails of album covers shown properly.
+    \endlist
 */
+
diff --git a/doc/src/examples/qmlvideo.qdoc b/doc/src/examples/qmlvideo.qdoc
new file mode 100644
index 0000000000..6356bb9023
--- /dev/null
+++ b/doc/src/examples/qmlvideo.qdoc
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** 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 video/qmlvideo
+\title QML Video Example
+
+\brief The QML Video Example demonstrates the various manipulations (move;
+resize; rotate; change aspect ratio) which can be applied to QML \l{Video}
+and \l{Camera} items.
+
+\section1 Overview
+
+This example demonstrates the various manipulations (move; resize; rotate;
+change aspect ratio) which can be applied to QML \l{Video} and \l{Camera}
+items.
+
+It also shows how native code can be combined with QML to implement more
+advanced functionality - in this case, C++ code is used to calculate the QML
+frame rate and (on Symbian) the graphics memory consumption; these metrics
+are rendered in QML as semi-transparent items overlaid on the video content.
+
+The following image shows the application executing the video-overlay scene,
+which creates a dummy overlay item (just a semi-transparent \l{Rectangle}),
+which moves across the \l{Video} item.
+
+\image qmlvideo-overlay.png
+
+\section1 Application structure
+
+The \l{video/qmlvideo/qml/qmlvideo/main.qml} file creates a UI which includes
+the following elements:
+
+\list
+    \o Two \l{video/qmlvideo/qml/qmlvideo/Button.qml}{Button} elements, each
+       of which displays a filename, and can be used to launch a
+       \l{video/qmlvideo/qml/qmlvideo/FileBrowser.qml}{FileBrowser}
+    \o An exit \l{video/qmlvideo/qml/qmlvideo/Button.qml}{Button}
+    \o A \l{video/qmlvideo/qml/qmlvideo/SceneSelectionPanel.qml}{SceneSelectionPanel},
+       which is a flickable list displaying the available scenes
+    \o At the lower left, an item which displays the QML repainting rate - the
+       upper number is the instantaneous frame rate and the lower number is the
+       average over the past second.
+    \o At the lower right (on Symbian only), an item which displays graphics
+       memory consumption information:total memory used; memory used by
+       current process; total memory.
+\endlist
+
+\image qmlvideo-menu.png
+
+Each scene in the flickable list is implemented in its own QML file - for
+example the video-basic scene (which just displays a static \l{Video} element
+in the center of the screen) is implemented in the
+\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic.qml} file.  As you
+can see from the code, this makes use of a type of inheritance: a
+\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic} element ...
+
+\quotefromfile video/qmlvideo/qml/qmlvideo/VideoBasic.qml
+\skipto import
+\printuntil /^\}/
+
+... is-a
+\l{video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} ...
+
+\quotefromfile video/qmlvideo/qml/qmlvideo/SceneBasic.qml
+\skipto import
+\printuntil contentType
+\dots
+\skipto Content
+\printuntil content
+\dots
+\skipto }
+\printuntil /^\}/
+
+... which is-a
+\l{video/qmlvideo/qml/qmlvideo/Scene.qml}{Scene}:
+
+\quotefromfile video/qmlvideo/qml/qmlvideo/Scene.qml
+\skipto import
+\printuntil root
+\dots
+\skipto property QtObject content
+\printuntil content
+\dots
+\skipto Button
+\printuntil /^\}/
+
+\l{video/qmlvideo/qml/qmlvideo/SceneBasic.qml}{SceneBasic} describes the
+structure and behaviour of the scene, but is agnostic of the type of content
+which will be displayed - this is abstracted by the
+\l{video/qmlvideo/qml/qmlvideo/Content.qml}{Content} element.
+
+This pattern allows us to define a particular use case (in this case, simply
+display a static piece of content), and then instantiate that use case for
+both video content
+(\l{video/qmlvideo/qml/qmlvideo/VideoBasic.qml}{VideoBasic}) and cameracontent
+(\l{video/qmlvideo/qml/qmlvideo/CameraBasic.qml}{CameraBasic}).  This approach
+is used to implement many of the other scenes - for example, "repeatedly slide
+the content from left to right and back again" is implemented by
+\l{video/qmlvideo/qml/qmlvideo/SceneMove.qml}{SceneMove}, on which
+\l{video/qmlvideo/qml/qmlvideo/VideoMove.qml}{VideoMove} and
+\l{video/qmlvideo/qml/qmlvideo/CameraMove.qml}{CameraMove} are based.
+
+Depending on the value of the contentType property in the top-level scene
+element, the embedded
+\l{video/qmlvideo/qml/qmlvideo/Content.qml}{Content} item creates either a
+\l{Video} or \l{Camera} item.
+
+\section1 Calculating and displaying QML painting rate
+
+\input examples/video-qml-paint-rate.qdocinc
+
+All that remains is to create a PaintEventMonitor in the C++ main() function, tell
+it to monitor the QML viewport widget, and to connect its framePainted() signal to
+a JavaScript function, which will eventually call frequencyItem.notify():
+
+\quotefromfile video/qmlvideo/main.cpp
+\skipto QmlApplicationViewer
+\printuntil ;
+\dots
+\skipto QGraphicsObject
+\printuntil ;
+\dots
+\skipto PaintEventMonitor
+\printuntil SLOT(qmlFramePainted()));
+
+\section1 Querying and displaying graphics memory consumption
+
+\input examples/video-graphics-memory.qdocinc
+
+*/
+
diff --git a/doc/src/examples/qmlvideofx.qdoc b/doc/src/examples/qmlvideofx.qdoc
new file mode 100644
index 0000000000..68a4e9df48
--- /dev/null
+++ b/doc/src/examples/qmlvideofx.qdoc
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** 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 video/qmlvideofx
+\title QML Video Shader Effects Example
+
+\brief The QML Video Shader Effects Example shows how the \l {ShaderEffectItem}
+element can be used to apply postprocessing effects, expressed in GLSL, to QML
+\l {Video} and \l {Camera} items.
+
+\section1 Overview
+
+This example shows how the \l {ShaderEffectItem} element can be used to apply
+postprocessing effects, expressed in GLSL, to QML \l {Video} and \l {Camera} items.
+
+It also shows how native code can be combined with QML to implement more
+advanced functionality - in this case, C++ code is used to calculate the QML
+frame rate and (on Symbian) the graphics memory consumption; these metrics
+are rendered in QML as semi-transparent items overlaid on the video content.
+
+Finally, this application demonstrates the use of different top-level QML
+files to handle different physical screen sizes.  On small-screen devices,
+menus are by default hidden, and only appear when summoned by a gesture.
+Large-screen devices show a more traditional layout in which menus are
+displayed around the video content pane.
+
+The following screenshots show shader effects being applied.  In each case,
+the effect is implemented using a fragment shader.
+
+Here we see an edge detection algorithm being applied to a video clip
+(\l{http://orange.blender.org/}{Elephant's Dream from blender.org}).
+\image qmlvideofx-video-edgedetection.png
+
+This image shows a page curl effect, applied to the same video clip.
+\image qmlvideofx-video-pagecurl.png
+
+Here we see a 'glow' effect (edge detection plus colour quantization) being
+applied to the camera viewfinder.
+\image qmlvideofx-camera-glow.png
+
+This image shows a 'lens magnification' effect applied to the viewfinder.
+\image qmlvideofx-camera-magnify.png
+
+The application includes many more effects than the ones shown here - look
+for Effect*.qml files in the list above to see the full range.
+
+\section1 Application structure
+
+Shader effects can be applied to video or viewfinder content using the
+\l{ShaderEffectItem} element, as shown in the following example, which applies
+a wiggly effect to the content:
+
+\code
+import QtQuick 1.0
+import Qt.labs.shaders 1.0
+
+Rectangle {
+    width: 300
+    height: 300
+    color: "black"
+
+    Video {
+        id: video
+        anchors.fill: parent
+        source: "test.mp4"
+    }
+
+    ShaderEffectItem {
+        property variant source: ShaderEffectSource { sourceItem: video; hideSource: true }
+        property real wiggleAmount: 0.005
+        anchors.fill: video
+
+        fragmentShader: "
+            varying highp vec2 qt_TexCoord0;
+            uniform sampler2D source;
+            uniform highp float wiggleAmount;
+            void main(void)
+            {
+                highp vec2 wiggledTexCoord = qt_TexCoord0;
+                wiggledTexCoord.s += sin(4.0 * 3.141592653589 * wiggledTexCoord.t) * wiggleAmount;
+                gl_FragColor = texture2D(source, wiggledTexCoord.st);
+            }
+        "
+    }
+}
+\endcode
+
+In this application, the usage of the \l{ShaderEffectItem}, \l{Video} and
+\l{Camera} elements is a bit more complicated, for the following reasons:
+
+\list
+    \o Each effect can be applied to either a \l{Video}, a \l{Camera} or a
+       \l{Image} item, so the type of the source item must be abstracted away
+       from the effect implementation
+    \o For some effects (such as the edge detection and glow examples shown in
+       the screenshots above), the transformation is applied only to pixels to
+       the left of a dividing line - this allows the effect to be easily
+       compared with the untransformed image on the right
+    \o Most effects have one or more parameters which can be modified by the
+       user - these are controlled by sliders in the UI which are connected
+       to uniform values passed into the GLSL code
+\endlist
+
+The abstraction of source item type is achieved by the
+\l{video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content} element, which uses a
+\l{Loader} to create either a \l{Video}, \l{Camera} or \l{Image} element:
+
+\quotefromfile video/qmlvideofx/qml/qmlvideofx/Content.qml
+\skipto import
+\printuntil {
+\dots
+\skipto Loader {
+\printuntil }
+\dots
+\skipto function openImage
+\printuntil "ContentImage.qml"
+\skipto contentLoader.item.source
+\printuntil path
+\skipto }
+\printuntil }
+\skipto function openVideo
+\printuntil "ContentVideo.qml"
+\skipto contentLoader.item.source
+\printuntil path
+\skipto }
+\printuntil }
+\skipto function openCamera
+\printuntil "ContentCamera.qml"
+\skipto }
+\printuntil }
+\skipto /^\}/
+\printuntil }
+
+Each effect is implemented as a QML item which is based on the
+\l{video/qmlvideofx/qml/qmlvideofx/Effect.qml}{Effect} element, which in turn
+is based on the \l{ShaderEffectItem} element:
+
+\quotefromfile video/qmlvideofx/qml/qmlvideofx/Effect.qml
+\skipto import
+\printuntil /^\}/
+
+The interface of the Effect element allows for derived effects to specify the
+number of parameters which they support (and therefore the number of sliders
+which should be displayed), and whether a vertical dividing line should be drawn
+between transformed and untransformed image regions.  As an example, here is the
+implementation of the pixelation effect.  As you can see, the pixelation effect
+supports one parameter (which controls the pixelation granularity), and states
+that the divider should be displayed.
+
+\quotefromfile video/qmlvideofx/qml/qmlvideofx/EffectPixelate.qml
+\skipto import
+\printuntil /^\}/
+
+The main.qml file shows a
+\l{video/qmlvideofx/qml/qmlvideofx/FileOpen.qml}{FileOpen} element which allows
+the user to select the input source and an
+\l{video/qmlvideofx/qml/qmlvideofx/EffectSelectionPanel.qml}{EffectSelectionPanel}
+item, which lists each of the available shader effects.  As described above, a
+\l{video/qmlvideofx/qml/qmlvideofx/Content.qml}{Content} item is used to load the
+appropriate input and effect element.  A
+\l{video/qmlvideofx/qml/qmlvideofx/Divider.qml}{Divider} item draws the
+vertical dividing line, which can be dragged left / right by the user.  Finally,
+a \l{video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml}{ParameterPanel} item
+renders the sliders corresponding to each effect parameter.
+
+Here is the source selection menu:
+\image qmlvideofx-source-menu.png
+
+And here is the effect selection menu:
+\image qmlvideofx-effects-menu.png
+
+\section1 Calculating and displaying QML painting rate
+
+\input examples/video-qml-paint-rate.qdocinc
+
+All that remains is to create a PaintEventMonitor in the C++ main() function, tell
+it to monitor the QML viewport widget, and to connect its framePainted() signal to
+a JavaScript function, which will eventually call frequencyItem.notify():
+
+\quotefromfile video/qmlvideofx/main.cpp
+\skipto QmlApplicationViewer
+\printuntil ;
+\dots
+\skipto QGraphicsObject
+\printuntil ;
+\dots
+\skipto PaintEventMonitor
+\printuntil SLOT(qmlFramePainted()));
+
+\section1 Querying and displaying graphics memory consumption
+
+\input examples/video-graphics-memory.qdocinc
+
+*/
+
+
diff --git a/doc/src/examples/quickstart.qdoc b/doc/src/examples/quickstart.qdoc
index 1753b3d45b..d091d5192b 100644
--- a/doc/src/examples/quickstart.qdoc
+++ b/doc/src/examples/quickstart.qdoc
@@ -177,7 +177,7 @@ on which parts of an API is utilized by an application.
 \row
     \o \l {Messaging}
     \o LocalServices ReadUserData WriteUserData NetworkServices UserEnvironment ReadDeviceData WriteDeviceData
-    \o Cellular TrackerReadAccess
+    \o Cellular TrackerReadAccess TrackerWriteAccess
 \row
     \o \l {Publish And Subscribe}
     \o Capability depends on P&S value being read/written. API itself doesn't require any capability.
diff --git a/doc/src/examples/samplephonebook.qdoc b/doc/src/examples/samplephonebook.qdoc
index 471a07e071..8a1e320a85 100644
--- a/doc/src/examples/samplephonebook.qdoc
+++ b/doc/src/examples/samplephonebook.qdoc
@@ -96,7 +96,7 @@
 
     \section2 Known Issues
     The example is not intended to be feature complete.  Only a very limited subset of detail types are
-    supported by the application.  It exercises only a very small portion of the Qt Contacts API.
+    supported by the application.  It exercises only a very small portion of the Qt Contacts API. 
 
     In particular:
     \list
@@ -113,4 +113,11 @@
            the QContactTag detail by giving related contacts the same tag.  A real application may support
            grouping via one or both of these methods.
     \endlist
+
+    This application has the following known issues on Harmattan:
+    \list
+        \o You cannot edit contacts because tapping QLineEdit widget does not open the virtual keyboard.
+           See \l{https://bugreports.qt.nokia.com/browse/QTBUG-23144}{QTBUG-23144}
+        \o You cannot set a thumbnail image for contacts. See \l{https://bugreports.qt.nokia.com/browse/QTMOBILITY-1992}{QTMOBILITY-1992}
+
 */
diff --git a/doc/src/examples/servicebrowser.qdoc b/doc/src/examples/servicebrowser.qdoc
index bf70d6e4a6..f5e34f46df 100644
--- a/doc/src/examples/servicebrowser.qdoc
+++ b/doc/src/examples/servicebrowser.qdoc
@@ -55,6 +55,16 @@
 
     The right-hand pane shows the attributes of an interface implementation that are invokable through the Qt meta-object system. Such attributes include signals, slots, properties and methods marked with the \c Q_INVOKABLE macro. If the "Selected implementation" radio button is checked, this view shows the attributes of the selected implementation in the bottom-left pane; otherwise, it shows the attributes of the \i default implementation for the interface of the selected implementation.
 
+The following steps have to be done manually if this application is to be executed in Qt Simulator:
+
+\list
+    \o Plugin based services (\c filemanagerplugin and \c bluetoothtransferplugin) must be manually copied 
+       to the same directory as the \c servicebrowser executable.
+
+    \o A new \c xmldata folder must be created in the same directory as \c servicebrowser
+       executable, and xml files of service plugins (bluetoothtransferservice.xml and 
+       filemanagerservice.xml) must be copied to that folder.
+\endlist
 
     \section1 ServiceBrowser Class Definition 
 
diff --git a/doc/src/examples/video-graphics-memory.qdocinc b/doc/src/examples/video-graphics-memory.qdocinc
new file mode 100644
index 0000000000..4d1ba8e519
--- /dev/null
+++ b/doc/src/examples/video-graphics-memory.qdocinc
@@ -0,0 +1,45 @@
+On Symbian, graphics memory consumption is an important consideration,
+because many of the current devices have a limited amount of graphics
+memory, which is shared by both the graphics stack (for OpenGLES /
+OpenVG rendering) and the camera/video stack.  For this reason, being
+able to track the amount of graphics memory being consumed by a given
+use case can be useful during application development.  This application
+demonstrates how this can be done, by using some native code to query
+graphics memory consumption information from a platform API, and a QML
+element to display this on screen in an overlay item.
+
+Starting with Symbian Anna, the platform implements an EGL extension
+called EGL_NOK_resource_profiling.  This allows the client to query
+
+\list
+    \o Total graphics memory
+    \o Total currently used graphics memory
+    \o Graphics memory used by calling process
+\endlist
+
+Being an EGL extension, this API isn't particularly friendly to use, so
+this example provides a simple Qt wrapper:
+
+\quotefromfile video/snippets/graphicsmemorymonitor/graphicsmemorymonitor.h
+\skipto class GraphicsMemoryMonitor : public QObject
+\printuntil updateIntervalChanged)
+\dots
+\skipto };
+\printline };
+
+This class is exposed to QML like this:
+
+\quotefromfile video/snippets/graphicsmemorymonitor/graphicsmemorymonitordeclarative.cpp
+\skipto GraphicsMemoryMonitor::qmlRegisterType
+\printuntil }
+
+And then the information is displayed by the GraphicsMemoryItem element:
+
+\quotefromfile video/snippets/graphicsmemorymonitor/qml/graphicsmemorymonitor/GraphicsMemoryItem.qml
+\skipto import
+\printuntil /^\}/
+
+The result looks like this:
+
+\image video-graphics-memory.png
+
diff --git a/doc/src/examples/video-qml-paint-rate.qdocinc b/doc/src/examples/video-qml-paint-rate.qdocinc
new file mode 100644
index 0000000000..2a645d7f23
--- /dev/null
+++ b/doc/src/examples/video-qml-paint-rate.qdocinc
@@ -0,0 +1,64 @@
+The QML painting rate is calculated by first creating a \l{QObject}-derived
+class called PaintEventMonitor, which allows its client to provide a
+\l{QWidget} to be monitored, and which emits a signal when that widget
+is repainted:
+
+\quotefromfile video/snippets/painteventmonitor/painteventmonitor.h
+\skipto class PaintEventMonitor
+\printuntil targetChanged)
+\dots
+\skipto protected
+\printuntil signals:
+\skipto void targetPainted
+\printuntil ;
+\skipto private
+\printuntil };
+
+The signal is generated by installing an event filter on the target \l{QWidget}:
+
+\quotefromfile video/snippets/painteventmonitor/painteventmonitor.cpp
+\skipto PaintEventMonitor::eventFilter
+\printuntil }
+
+A second class, FrequencyMonitor, is used to turn the stream of targetPainted()
+signals into an instantaneous and an averaged frequency:
+
+\quotefromfile video/snippets/frequencymonitor/frequencymonitor.h
+\skipto class FrequencyMonitor : public QObject
+\printuntil Q_OBJECT
+\skipto Q_PROPERTY(qreal instantaneousFrequency
+\printuntil averageFrequencyChanged)
+\skipto public
+\printuntil :
+\dots
+\skipto static void qmlRegisterType
+\printuntil ;
+\skipto public slots
+\printuntil notify();
+\skipto };
+\printline };
+
+The FrequencyMonitor class is exposed to QML like this
+
+\quotefromfile video/snippets/frequencymonitor/frequencymonitordeclarative.cpp
+\skipto FrequencyMonitor::qmlRegisterType
+\printuntil }
+
+and its data is displayed by defining a QML item called FrequencyItem, like this:
+
+\quotefromfile video/snippets/frequencymonitor/qml/frequencymonitor/FrequencyItem.qml
+\skipto import FrequencyMonitor
+\printuntil id: root
+\dots
+\skipto function notify
+\printuntil id: monitor
+\skipto onAverageFrequencyChanged
+\printuntil {
+\skipto instantaneousFrequencyText
+\printuntil /^\}/
+
+The result looks like this:
+
+\image video-qml-paint-rate.png
+
+
diff --git a/doc/src/feedback.qdoc b/doc/src/feedback.qdoc
index dfca5a4dd1..ad8fd01e8d 100644
--- a/doc/src/feedback.qdoc
+++ b/doc/src/feedback.qdoc
@@ -97,6 +97,7 @@ various \l {QFeedbackEffect}s.
 
 \section2 Platform Issues
 
+\note The actual haptic effect, and how end user perceives it, is always dependent on the hardware itself (i.e. the device where it is run).
 \note On Symbian, vibration feature needs to be enabled in the user profile for the API to work.
 \note On Maemo5, periodic vibration does not support attack or fade.
 
diff --git a/doc/src/images/qmlcamera-menu.png b/doc/src/images/qmlcamera-menu.png
new file mode 100644
index 0000000000..b2d7733195
--- /dev/null
+++ b/doc/src/images/qmlcamera-menu.png
diff --git a/doc/src/images/qmlvideo-menu.png b/doc/src/images/qmlvideo-menu.png
new file mode 100644
index 0000000000..b2d7733195
--- /dev/null
+++ b/doc/src/images/qmlvideo-menu.png
diff --git a/doc/src/images/qmlvideo-overlay.png b/doc/src/images/qmlvideo-overlay.png
new file mode 100644
index 0000000000..f5dc8390df
--- /dev/null
+++ b/doc/src/images/qmlvideo-overlay.png
diff --git a/doc/src/images/qmlvideofx-camera-glow.png b/doc/src/images/qmlvideofx-camera-glow.png
new file mode 100644
index 0000000000..aca874b6c9
--- /dev/null
+++ b/doc/src/images/qmlvideofx-camera-glow.png
diff --git a/doc/src/images/qmlvideofx-camera-magnify.png b/doc/src/images/qmlvideofx-camera-magnify.png
new file mode 100644
index 0000000000..c3156ce967
--- /dev/null
+++ b/doc/src/images/qmlvideofx-camera-magnify.png
diff --git a/doc/src/images/qmlvideofx-effects-menu.png b/doc/src/images/qmlvideofx-effects-menu.png
new file mode 100644
index 0000000000..507fd73843
--- /dev/null
+++ b/doc/src/images/qmlvideofx-effects-menu.png
diff --git a/doc/src/images/qmlvideofx-source-menu.png b/doc/src/images/qmlvideofx-source-menu.png
new file mode 100644
index 0000000000..661aaa73fa
--- /dev/null
+++ b/doc/src/images/qmlvideofx-source-menu.png
diff --git a/doc/src/images/qmlvideofx-video-edgedetection.png b/doc/src/images/qmlvideofx-video-edgedetection.png
new file mode 100644
index 0000000000..cedb314c52
--- /dev/null
+++ b/doc/src/images/qmlvideofx-video-edgedetection.png
diff --git a/doc/src/images/qmlvideofx-video-pagecurl.png b/doc/src/images/qmlvideofx-video-pagecurl.png
new file mode 100644
index 0000000000..5f5bdfb537
--- /dev/null
+++ b/doc/src/images/qmlvideofx-video-pagecurl.png
diff --git a/doc/src/images/video-graphics-memory.png b/doc/src/images/video-graphics-memory.png
new file mode 100644
index 0000000000..9479cce4c2
--- /dev/null
+++ b/doc/src/images/video-graphics-memory.png
diff --git a/doc/src/images/video-qml-paint-rate.png b/doc/src/images/video-qml-paint-rate.png
new file mode 100644
index 0000000000..1519ff64e4
--- /dev/null
+++ b/doc/src/images/video-qml-paint-rate.png
diff --git a/doc/src/multimedia.qdoc b/doc/src/multimedia.qdoc
index 3ade6f2268..ec3746ebc4 100644
--- a/doc/src/multimedia.qdoc
+++ b/doc/src/multimedia.qdoc
@@ -332,6 +332,30 @@ write a camera application in C++.
 The \l {QML Camera Example} demonstrates still image capture and controls
 using the QML plugin. Video recording is not currently available.
 
+\section2 QML Video Example
+
+The \l {video/qmlvideo}{QML Video Example} demonstrates the various manipulations
+(move; resize; rotate; change aspect ratio) which can be applied to QML
+\l {Video} and \l {Camera} items.
+
+It also shows how native code can be combined with QML to implement more
+advanced functionality - in this case, C++ code is used to calculate the QML
+frame rate and (on Symbian) the graphics memory consumption; these metrics
+are rendered in QML as semi-transparent items overlaid on the video content.
+
+\section2 QML Video Shader Effects Example
+The \l {video/qmlvideofx}{QML Video Shader Effects Example} shows how the
+\l {ShaderEffectItem} element can be used to apply postprocessing effects,
+expressed in GLSL, to QML \l {Video} and \l {Camera} items.
+
+It re-uses the frame rate and memory consumption display code used by
+the \l {QML Video Example}.
+
+Finally, this application demonstrates the use of different top-level QML
+files to handle different physical screen sizes.  On small-screen devices,
+menus are by default hidden, and only appear when summoned by a gesture.
+Large-screen devices show a more traditional layout in which menus are
+displayed around the video content pane.
 
 \section1 Reference documentation
 
diff --git a/doc/src/sf.qdoc b/doc/src/sf.qdoc
index b210034a91..2571bb6534 100644
--- a/doc/src/sf.qdoc
+++ b/doc/src/sf.qdoc
@@ -571,8 +571,9 @@ Symbian provides 3 different methods to register services.
 \section4 Automatic Registration
 Automatic registration is the prefered method for services that are not
 Symbian Signed and don't require high levels of security.  The XML
-file is copied into the import directory of the IPC backend.  In Qt
-project files this can be done by:
+file is copied into the import directory of the IPC backend. The service framework 
+scans system drive, in most of the cases system drive is by default c: drive.
+In Qt project files this can be done by:
 
 \code
 xmlautoimport.path = /private/2002AC7F/import/
diff --git a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
index df14438f79..b28727f7ad 100644
--- a/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
+++ b/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
@@ -31,3 +31,15 @@ symbian {
 xml.path = $$QT_MOBILITY_EXAMPLES/xmldata
 xml.files = bluetoothtransferservice.xml
 INSTALLS += xml
+
+contains(MEEGO_EDITION,harmattan) {
+    xml.path = /opt/servicebrowser/bin/xmldata
+    xml.files = bluetoothtransferservice.xml
+    INSTALLS += xml
+
+    target.path = /usr/lib/qt4/plugins/serviceframework/
+    INSTALLS += target
+}
+
+
+
diff --git a/examples/calendardemo/calendardemo.pro b/examples/calendardemo/calendardemo.pro
index 0c0d312957..5582b9e1cd 100644
--- a/examples/calendardemo/calendardemo.pro
+++ b/examples/calendardemo/calendardemo.pro
@@ -50,6 +50,17 @@ INCLUDEPATH += . \
 
 symbian: {
     TARGET.CAPABILITY = ReadUserData \
-                        WriteUserData \
-                        ReadDeviceData
+                        WriteUserData
+
+}
+
+OTHER_FILES += 
+
+contains(MEEGO_EDITION,harmattan) {
+    target.path = /opt/calendardemo/bin
+    INSTALLS += target
 }
+
+
+
+
diff --git a/examples/calendardemo/src/addcalendarpage.cpp b/examples/calendardemo/src/addcalendarpage.cpp
index 0d3eb257ed..e425c42e02 100644
--- a/examples/calendardemo/src/addcalendarpage.cpp
+++ b/examples/calendardemo/src/addcalendarpage.cpp
@@ -72,7 +72,7 @@ AddCalendarPage::AddCalendarPage(QWidget *parent)
             this, SLOT(readonlyChanged(int)));
 #endif
 
-#ifndef Q_OS_SYMBIAN
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     // Add push buttons for non-Symbian platforms as they do not support soft keys
     QHBoxLayout* hbLayout = new QHBoxLayout();
     QPushButton *okButton = new QPushButton("Save", this);
@@ -101,7 +101,7 @@ AddCalendarPage::AddCalendarPage(QWidget *parent)
 
     scrollAreaLayout->addStretch();
 
-#ifndef Q_OS_SYMBIAN
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     scrollAreaLayout->addLayout(hbLayout);
 #endif
 
diff --git a/examples/calendardemo/src/calendardemo.cpp b/examples/calendardemo/src/calendardemo.cpp
index 8795d60c75..19f157544a 100644
--- a/examples/calendardemo/src/calendardemo.cpp
+++ b/examples/calendardemo/src/calendardemo.cpp
@@ -144,7 +144,7 @@ void CalendarDemo::buildMenu()
     QMenuBar *optionsMenu = menuBar();
 #else
     QMenu *optionsMenu = new QMenu("&Options", this);
-    #ifndef Q_OS_SYMBIAN
+    #if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     // We add the options menu to the softkey manually later
     menuBar()->addMenu(optionsMenu);
     #endif
@@ -186,7 +186,7 @@ void CalendarDemo::buildMenu()
     QAction* editCalendar = optionsMenu->addAction("Edit calendars");
     connect(editCalendar, SIGNAL(triggered(bool)), this, SLOT(editCalendar()));
 
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
     // add the menu to the softkey for these pages
     m_monthPage->setMenu(optionsMenu);
     m_dayPage->setMenu(optionsMenu);
@@ -195,7 +195,7 @@ void CalendarDemo::buildMenu()
 
 void CalendarDemo::activateMonthPage()
 {
-#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
     menuBar()->setVisible(true);
 #endif
     m_monthPage->refresh();
@@ -205,7 +205,7 @@ void CalendarDemo::activateMonthPage()
 
 void CalendarDemo::activateDayPage()
 {
-#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
     menuBar()->setVisible(true);
 #endif
     m_dayPage->refresh();
@@ -216,7 +216,7 @@ void CalendarDemo::activateDayPage()
 void CalendarDemo::activateEditPage(const QOrganizerItem &item)
 {
     m_previousItem = item;
-#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6))
     menuBar()->setVisible(false);
 #endif
     if (item.type() == QOrganizerItemType::TypeEvent) {
@@ -546,15 +546,17 @@ void CalendarDemo::saveReqStateChanged(QOrganizerAbstractRequest::State reqState
     if(QOrganizerAbstractRequest::ActiveState == reqState) {
         // Request started. Show a progress or wait dialog
         m_progressDlg = new QProgressDialog("Saving events..", "Cancel", 100, 100, this);
+        m_progressDlg->setAttribute(Qt::WA_DeleteOnClose);
         connect(m_progressDlg, SIGNAL(canceled()), &m_saveReq, SLOT(cancel()));
         m_progressDlg->show();
     } else if (QOrganizerAbstractRequest::FinishedState == reqState ||
                QOrganizerAbstractRequest::CanceledState == reqState) {
         // Request finished or cancelled. Stop showing the progress dialog and refresh
-        m_progressDlg->hide();
+        m_progressDlg->done(0);
         m_monthPage->refresh();
         m_dayPage->refresh();
     }
+
 }
 
 void CalendarDemo::removeReqStateChanged(QOrganizerAbstractRequest::State reqState)
@@ -562,12 +564,13 @@ void CalendarDemo::removeReqStateChanged(QOrganizerAbstractRequest::State reqSta
     if(QOrganizerAbstractRequest::ActiveState == reqState) {
         // Request started. Show a progress or wait dialog
         m_progressDlg = new QProgressDialog("Removing events..", "Cancel", 100, 100, this);
+        m_progressDlg->setAttribute(Qt::WA_DeleteOnClose);
         connect(m_progressDlg, SIGNAL(canceled()), &m_remReq, SLOT(cancel()));
         m_progressDlg->show();
     } else if (QOrganizerAbstractRequest::FinishedState == reqState ||
                QOrganizerAbstractRequest::CanceledState == reqState) {
         // Request finished or cancelled. Stop showing the progress dialog and refresh
-        m_progressDlg->hide();
+        m_progressDlg->done(0);
         m_monthPage->refresh();
         m_dayPage->refresh();
     }
diff --git a/examples/calendardemo/src/daypage.cpp b/examples/calendardemo/src/daypage.cpp
index 0f7023c300..f4b8fe08c3 100644
--- a/examples/calendardemo/src/daypage.cpp
+++ b/examples/calendardemo/src/daypage.cpp
@@ -98,7 +98,7 @@ DayPage::~DayPage()
 
 }
 
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
 void DayPage::setMenu(QMenu *menu)
 {
     // Add softkey for symbian
diff --git a/examples/calendardemo/src/daypage.h b/examples/calendardemo/src/daypage.h
index 9fce62a7d9..8f0c333537 100644
--- a/examples/calendardemo/src/daypage.h
+++ b/examples/calendardemo/src/daypage.h
@@ -67,7 +67,7 @@ public:
     DayPage(QWidget *parent = 0);
     ~DayPage();
 
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
     void setMenu(QMenu *menu);
 #endif
 
diff --git a/examples/calendardemo/src/eventeditpage.cpp b/examples/calendardemo/src/eventeditpage.cpp
index 86f3704904..130ecbaac8 100644
--- a/examples/calendardemo/src/eventeditpage.cpp
+++ b/examples/calendardemo/src/eventeditpage.cpp
@@ -108,7 +108,7 @@ EventEditPage::EventEditPage(QWidget *parent)
     m_calendarComboBox = new QComboBox(this);
     // the calendar names are not know here, fill the combo box later...
 
-#ifndef Q_OS_SYMBIAN
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     // Add push buttons for non-Symbian platforms as they do not support soft keys
     QHBoxLayout* hbLayout = new QHBoxLayout();
     QPushButton *okButton = new QPushButton("Save", this);
@@ -143,7 +143,7 @@ EventEditPage::EventEditPage(QWidget *parent)
     scrollAreaLayout->addWidget(m_calendarComboBox);
     scrollAreaLayout->addStretch();
 
-#ifndef Q_OS_SYMBIAN
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     scrollAreaLayout->addLayout(hbLayout);
 #endif
 
diff --git a/examples/calendardemo/src/eventoccurrenceeditpage.cpp b/examples/calendardemo/src/eventoccurrenceeditpage.cpp
index 24e0a48198..aea684048e 100644
--- a/examples/calendardemo/src/eventoccurrenceeditpage.cpp
+++ b/examples/calendardemo/src/eventoccurrenceeditpage.cpp
@@ -65,7 +65,7 @@ EventOccurrenceEditPage::EventOccurrenceEditPage(QWidget *parent)
     m_endTimeEdit = new QDateTimeEdit(this);
     m_endTimeEdit->setDisplayFormat(QString("yyyy-MM-dd hh:mm:ss AP"));
 
-#ifndef Q_OS_SYMBIAN
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     // Add push buttons for Maemo as it does not support soft keys
     QHBoxLayout* hbLayout = new QHBoxLayout();
     QPushButton *okButton = new QPushButton("Ok", this);
@@ -85,7 +85,7 @@ EventOccurrenceEditPage::EventOccurrenceEditPage(QWidget *parent)
     scrollAreaLayout->addWidget(m_endTimeEdit);
     scrollAreaLayout->addStretch();
 
-#ifndef Q_OS_SYMBIAN
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     scrollAreaLayout->addLayout(hbLayout);
 #endif
 
diff --git a/examples/calendardemo/src/journaleditpage.cpp b/examples/calendardemo/src/journaleditpage.cpp
index 927463967a..cf29800a09 100644
--- a/examples/calendardemo/src/journaleditpage.cpp
+++ b/examples/calendardemo/src/journaleditpage.cpp
@@ -76,7 +76,7 @@ JournalEditPage::JournalEditPage(QWidget *parent)
     m_calendarComboBox = new QComboBox(this);
     // the calendar names are not know here, fill the combo box later...
 
-#ifndef Q_OS_SYMBIAN
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     // Add push buttons for Maemo as it does not support soft keys
     QHBoxLayout* hbLayout = new QHBoxLayout();
     QPushButton *okButton = new QPushButton("Ok", this);
@@ -104,7 +104,7 @@ JournalEditPage::JournalEditPage(QWidget *parent)
     scrollAreaLayout->addWidget(m_calendarComboBox);
     scrollAreaLayout->addStretch();
 
-#ifndef Q_OS_SYMBIAN
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     scrollAreaLayout->addLayout(hbLayout);
 #endif
 
diff --git a/examples/calendardemo/src/monthpage.cpp b/examples/calendardemo/src/monthpage.cpp
index 8957cf1448..64b26c006f 100644
--- a/examples/calendardemo/src/monthpage.cpp
+++ b/examples/calendardemo/src/monthpage.cpp
@@ -108,7 +108,7 @@ MonthPage::~MonthPage()
 
 }
 
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
 void MonthPage::setMenu(QMenu *menu)
 {
     // Add softkey for symbian
diff --git a/examples/calendardemo/src/monthpage.h b/examples/calendardemo/src/monthpage.h
index f46714882c..95f59e2bb6 100644
--- a/examples/calendardemo/src/monthpage.h
+++ b/examples/calendardemo/src/monthpage.h
@@ -67,7 +67,7 @@ public:
     ~MonthPage();
     void init();
 
-#ifdef Q_OS_SYMBIAN
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
     void setMenu(QMenu *menu);
 #endif
 
diff --git a/examples/calendardemo/src/todoeditpage.cpp b/examples/calendardemo/src/todoeditpage.cpp
index b4cb0d05b5..ea60d6acaa 100644
--- a/examples/calendardemo/src/todoeditpage.cpp
+++ b/examples/calendardemo/src/todoeditpage.cpp
@@ -86,7 +86,7 @@ TodoEditPage::TodoEditPage(QWidget *parent)
     m_calendarComboBox = new QComboBox(this);
     // the calendar names are not know here, fill the combo box later...
 
-#ifndef Q_OS_SYMBIAN
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     // Add push buttons for non-Symbian platforms as they do not support soft keys
     QHBoxLayout* hbLayout = new QHBoxLayout();
     QPushButton *okButton = new QPushButton("Save", this);
@@ -119,7 +119,8 @@ TodoEditPage::TodoEditPage(QWidget *parent)
     scrollAreaLayout->addWidget(calendarLabel);
     scrollAreaLayout->addWidget(m_calendarComboBox);
     scrollAreaLayout->addStretch();
-#ifndef Q_OS_SYMBIAN
+
+#if !(defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR))
     scrollAreaLayout->addLayout(hbLayout);
 #endif
 
diff --git a/examples/camera/camera.cpp b/examples/camera/camera.cpp
index ab8ebf33d3..8658e5a205 100644
--- a/examples/camera/camera.cpp
+++ b/examples/camera/camera.cpp
@@ -84,6 +84,16 @@ Camera::Camera(QWidget *parent) :
         }
         ui->menuDevices->addAction(videoDeviceAction);
     }
+#if defined(Q_WS_SIMULATOR)
+    QMenu *optionsMenu = new QMenu(this);
+    QAction *optionsSoftKey = new QAction("Options", this);
+    optionsSoftKey->setSoftKeyRole(QAction::PositiveSoftKey);
+    optionsMenu->addAction(ui->actionStartCamera);
+    optionsMenu->addAction(ui->actionStopCamera);
+    optionsMenu->addAction(ui->actionSettings);
+    optionsSoftKey->setMenu(optionsMenu);
+    addAction(optionsSoftKey);
+#endif
 
     connect(videoDevicesGroup, SIGNAL(triggered(QAction*)), this, SLOT(updateCameraDevice(QAction*)));
     connect(ui->captureWidget, SIGNAL(currentChanged(int)), SLOT(updateCaptureMode()));
diff --git a/examples/declarative-camera/qmlcamera.cpp b/examples/declarative-camera/qmlcamera.cpp
index f6d3e9c361..b723aec943 100644
--- a/examples/declarative-camera/qmlcamera.cpp
+++ b/examples/declarative-camera/qmlcamera.cpp
@@ -74,13 +74,16 @@ int main(int argc, char *argv[])
     QDeclarativeView view;
 #if !defined(QT_NO_OPENGL) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_S60)
     view.setViewport(new QGLWidget);
-#endif
+    #endif
     view.setSource(QUrl(mainQmlApp));
     view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
     // Qt.quit() called in embedded .qml by default only emits
     // quit() signal, so do this (optionally use Qt.exit()).
     QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_WS_SIMULATOR)
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
+    view.setAttribute(Qt::WA_LockLandscapeOrientation, true);
+#endif //defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
     view.setGeometry(application.desktop()->screenGeometry());
     view.showFullScreen();
 #ifdef Q_OS_SYMBIAN
diff --git a/examples/declarative-location/mapviewer/qmlmapviewer.cpp b/examples/declarative-location/mapviewer/qmlmapviewer.cpp
index f68cf1a070..8c68f4e8bb 100644
--- a/examples/declarative-location/mapviewer/qmlmapviewer.cpp
+++ b/examples/declarative-location/mapviewer/qmlmapviewer.cpp
@@ -41,12 +41,32 @@
 #include <QtGui/QApplication>
 #include <QtDeclarative/QDeclarativeView>
 #include <QtDeclarative/QDeclarativeEngine>
+#include <QDeclarativeNetworkAccessManagerFactory>
+#include <QNetworkAccessManager>
+#include <QNetworkProxy>
+
+// Optional factory class for creating network access managers
+class MyNetworkAccessManagerFactory : public QDeclarativeNetworkAccessManagerFactory
+{
+public:
+    QNetworkAccessManager *create(QObject *parent)
+    {
+        QNetworkAccessManager *manager = new QNetworkAccessManager(parent);
+        // Setup manager proxy etc. here
+        // QUrl url("http://host:port");
+        // QNetworkProxy proxy(QNetworkProxy::HttpProxy, url.host(), url.port());
+        // manager->setProxy(proxy);
+        return manager;
+    }
+};
 
 int main(int argc, char *argv[])
 {
     QApplication application(argc, argv);
     const QString mainQmlApp = QLatin1String("qrc:///mapviewer.qml");
     QDeclarativeView view;
+    // Use our own factory for network access managers
+    view.engine()->setNetworkAccessManagerFactory(new MyNetworkAccessManagerFactory());
     view.setSource(QUrl(mainQmlApp));
     view.setResizeMode(QDeclarativeView::SizeRootObjectToView);
     // Qt.quit() called in embedded .qml by default only emits
diff --git a/examples/declarative-music-browser/MusicBrowserCore/AlbumDelegate.qml b/examples/declarative-music-browser/MusicBrowserCore/AlbumDelegate.qml
index 7d9fb3e1d1..18dfcc4d0e 100644
--- a/examples/declarative-music-browser/MusicBrowserCore/AlbumDelegate.qml
+++ b/examples/declarative-music-browser/MusicBrowserCore/AlbumDelegate.qml
@@ -45,6 +45,7 @@ Package {
     property string state
     property int viewWidth: 0
     property int viewHeight: 0
+    property string artist
 
     signal clicked
 
@@ -192,7 +193,7 @@ Package {
                 model: DocumentGalleryModel {
                     rootType: DocumentGallery.Audio
                     rootItem: itemId
-                    properties: [ "trackNumber", "title", "duration" ]
+                    properties: [ "trackNumber", "title", "duration", "AlbumArtist" ]
                     sortProperties: [ "trackNumber" ]
                 }
                 delegate: SongDelegate { width: songColumn.width }
@@ -207,7 +208,7 @@ Package {
             model: DocumentGalleryModel {
                 rootType: DocumentGallery.Audio
                 rootItem: itemId
-                properties: [ "trackNumber", "title", "duration" ]
+                properties: [ "trackNumber", "title", "duration", "AlbumArtist" ]
                 sortProperties: [ "trackNumber" ]
             }
             delegate: SongDelegate { width: parent.width }
diff --git a/examples/declarative-music-browser/MusicBrowserCore/CategoryDelegate.qml b/examples/declarative-music-browser/MusicBrowserCore/CategoryDelegate.qml
index 5a32e82077..492c09e6ef 100644
--- a/examples/declarative-music-browser/MusicBrowserCore/CategoryDelegate.qml
+++ b/examples/declarative-music-browser/MusicBrowserCore/CategoryDelegate.qml
@@ -102,6 +102,7 @@ Package {
             wrapMode: Text.WordWrap
             color: "white"
             font.pointSize: 15
+            elide: Text.ElideRight
         }
 
         MouseArea {
diff --git a/examples/declarative-music-browser/MusicBrowserCore/TypeDelegate.qml b/examples/declarative-music-browser/MusicBrowserCore/TypeDelegate.qml
index 7ba3303f45..be064dd1fb 100644
--- a/examples/declarative-music-browser/MusicBrowserCore/TypeDelegate.qml
+++ b/examples/declarative-music-browser/MusicBrowserCore/TypeDelegate.qml
@@ -67,7 +67,7 @@ Item {
         id: countLabel
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.top: typeIcon.bottom
-        text: typeInfo.metaData.count
+        text: parseInt(typeInfo.metaData.count) || 0
         font.pointSize: 30
         color: "gray"
     }
diff --git a/examples/declarative-music-browser/declarative-music-browser.desktop b/examples/declarative-music-browser/declarative-music-browser.desktop
new file mode 100755
index 0000000000..8ed5151667
--- /dev/null
+++ b/examples/declarative-music-browser/declarative-music-browser.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=declarative-music-browser
+Exec=/usr/bin/single-instance /opt/declarative-music-browser/bin/declarative-music-browser
+Icon=/usr/share/icons/hicolor/80x80/apps/declarative-music-browser.png
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/examples/declarative-music-browser/declarative-music-browser.png b/examples/declarative-music-browser/declarative-music-browser.png
new file mode 100755
index 0000000000..6ad8096c45
--- /dev/null
+++ b/examples/declarative-music-browser/declarative-music-browser.png
diff --git a/examples/declarative-music-browser/declarative-music-browser.pro b/examples/declarative-music-browser/declarative-music-browser.pro
index 960bb6f9a4..b8c597e54b 100644
--- a/examples/declarative-music-browser/declarative-music-browser.pro
+++ b/examples/declarative-music-browser/declarative-music-browser.pro
@@ -35,8 +35,21 @@ OTHER_FILES += \
 
 symbian: {
     load(data_caging_paths)
-    TARGET.CAPABILITY = ReadDeviceData WriteDeviceData
 }
 
 RESOURCES += \
     musicbrowser.qrc
+
+contains(MEEGO_EDITION,harmattan) {
+    DEFINES += Q_WS_MAEMO_6
+    target.path = /opt/declarative-music-browser/bin
+
+    icon.path = /usr/share/icons/hicolor/80x80/apps
+    icon.files += declarative-music-browser.png
+
+    desktop.path = /usr/share/applications
+    desktop.files += declarative-music-browser.desktop
+
+    INSTALLS += target icon desktop
+}
+
diff --git a/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.pro b/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.pro
index e098cad0c5..efad01fb91 100644
--- a/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.pro
+++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.pro
@@ -15,3 +15,10 @@ MOBILITY += serviceframework
 symbian {
     TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
 }
+
+contains(MEEGO_EDITION,harmattan) {
+    target.path = /opt/declarative-sfw-dialer/bin
+    INSTALLS += target
+}
+
+
diff --git a/examples/declarative-sfw-dialer/declarative-sfw-dialer/qmldialer.cpp b/examples/declarative-sfw-dialer/declarative-sfw-dialer/qmldialer.cpp
index 78d382cbb6..d0e95c07e8 100644
--- a/examples/declarative-sfw-dialer/declarative-sfw-dialer/qmldialer.cpp
+++ b/examples/declarative-sfw-dialer/declarative-sfw-dialer/qmldialer.cpp
@@ -56,7 +56,7 @@ void unregisterExampleService()
 void registerExampleService()
 {
     unregisterExampleService();
-
+//! [0]
     QServiceManager m;
     QStringList exampleXmlFiles;
     exampleXmlFiles << "landlinedialerservice.xml" << "voipdialerservice.xml" << "remotedialerservice.xml";
@@ -64,6 +64,7 @@ void registerExampleService()
         const QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
         m.addService(path);
     }
+//! [0]
 }
 #endif
 
diff --git a/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro b/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro
index 93576b9e88..27f4419dfb 100644
--- a/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro
+++ b/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro
@@ -35,3 +35,38 @@ symbian {
 xml.path = $$QT_MOBILITY_EXAMPLES/xmldata
 xml.files = landlinedialerservice.xml
 INSTALLS += xml
+
+contains(MEEGO_EDITION,harmattan) {
+    xml.path = /opt/declarative-sfw-dialer/bin/xmldata
+    xml.files = landlinedialerservice.xml
+    INSTALLS += xml
+
+    target.path = /usr/lib/qt4/plugins/serviceframework/
+    INSTALLS += target
+}
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
+
+
+
diff --git a/examples/declarative-sfw-dialer/remotedialer/com.nokia.qt.examples.dialer.service b/examples/declarative-sfw-dialer/remotedialer/com.nokia.qt.examples.dialer.service
new file mode 100644
index 0000000000..04f0ffcfe7
--- /dev/null
+++ b/examples/declarative-sfw-dialer/remotedialer/com.nokia.qt.examples.dialer.service
@@ -0,0 +1,6 @@
+[D-BUS Service]
+Name=com.nokia.qtmobility.sfw.VoipDialer
+Exec= /opt/remotedialer/bin/dialer_service
+User=user
+
+
diff --git a/examples/declarative-sfw-dialer/remotedialer/remotedialer.conf b/examples/declarative-sfw-dialer/remotedialer/remotedialer.conf
new file mode 100644
index 0000000000..9f6a76dd8d
--- /dev/null
+++ b/examples/declarative-sfw-dialer/remotedialer/remotedialer.conf
@@ -0,0 +1,6 @@
+<busconfig>
+	<policy context="default">
+		<allow own="com.nokia.qt.examples.Dialer"/>
+	</policy>
+</busconfig>
+
diff --git a/examples/declarative-sfw-dialer/remotedialer/remotedialer.pro b/examples/declarative-sfw-dialer/remotedialer/remotedialer.pro
index d36d15ab6d..3685204978 100644
--- a/examples/declarative-sfw-dialer/remotedialer/remotedialer.pro
+++ b/examples/declarative-sfw-dialer/remotedialer/remotedialer.pro
@@ -32,3 +32,30 @@ wince* {
 xml.path = $$QT_MOBILITY_EXAMPLES/xmldata
 xml.files = remotedialerservice.xml
 INSTALLS += xml
+
+contains(MEEGO_EDITION,harmattan) {
+    xml.path = /opt/declarative-sfw-dialer/bin/xmldata
+    xml.files = remotedialerservice.xml
+    INSTALLS += xml
+
+    remotedialer_conf.files = remotedialer.conf
+    remotedialer_conf.path = /etc/dbus-1/session.d/
+
+    remotedialer_service.files = com.nokia.qt.examples.dialer.service
+    remotedialer_service.path = /usr/share/dbus-1/services/
+
+    target.path = /opt/remotedialer/bin
+
+    INSTALLS += target remotedialer_conf remotedialer_service
+}
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
+
+
diff --git a/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro b/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro
index a3e774196e..311d5f92ae 100644
--- a/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro
+++ b/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro
@@ -35,3 +35,22 @@ symbian {
 xml.path = $$QT_MOBILITY_EXAMPLES/xmldata
 xml.files = voipdialerservice.xml
 INSTALLS += xml
+
+contains(MEEGO_EDITION,harmattan) {
+    target.path = /usr/lib/qt4/plugins/serviceframework/
+    INSTALLS += target
+
+    xml.path = /opt/declarative-sfw-dialer/bin/xmldata
+    xml.files = voipdialerservice.xml
+    INSTALLS += xml
+}
+
+OTHER_FILES += \
+    qtc_packaging/debian_harmattan/rules \
+    qtc_packaging/debian_harmattan/README \
+    qtc_packaging/debian_harmattan/manifest.aegis \
+    qtc_packaging/debian_harmattan/copyright \
+    qtc_packaging/debian_harmattan/control \
+    qtc_packaging/debian_harmattan/compat \
+    qtc_packaging/debian_harmattan/changelog
+
diff --git a/examples/filemanagerplugin/filemanagerplugin.pro b/examples/filemanagerplugin/filemanagerplugin.pro
index c11f4600b0..a1c494a515 100644
--- a/examples/filemanagerplugin/filemanagerplugin.pro
+++ b/examples/filemanagerplugin/filemanagerplugin.pro
@@ -33,3 +33,15 @@ symbian {
 xml.path = $$QT_MOBILITY_EXAMPLES/xmldata
 xml.files = filemanagerservice.xml
 INSTALLS += xml
+
+contains(MEEGO_EDITION,harmattan) {
+    xml.path = /opt/servicebrowser/bin/xmldata
+    xml.files = filemanagerservice.xml
+    INSTALLS += xml
+
+    target.path = /usr/lib/qt4/plugins/serviceframework/
+    INSTALLS += target
+}
+
+
+
diff --git a/examples/hapticsplayer/hapticsplayer.ui b/examples/hapticsplayer/hapticsplayer.ui
index 2daab28a29..fdcaad114e 100644
--- a/examples/hapticsplayer/hapticsplayer.ui
+++ b/examples/hapticsplayer/hapticsplayer.ui
@@ -25,7 +25,7 @@
       <enum>QTabWidget::North</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <property name="usesScrollButtons">
       <bool>true</bool>
@@ -49,7 +49,7 @@
             <x>0</x>
             <y>0</y>
             <width>379</width>
-            <height>695</height>
+            <height>712</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_6">
@@ -485,31 +485,87 @@
             <x>0</x>
             <y>0</y>
             <width>379</width>
-            <height>695</height>
+            <height>712</height>
            </rect>
           </property>
-          <layout class="QHBoxLayout" name="horizontalLayout">
-           <item>
-            <layout class="QVBoxLayout" name="verticalLayout_8">
-             <item>
-              <widget class="QComboBox" name="instantEffect"/>
-             </item>
-             <item>
-              <widget class="QPushButton" name="instantPlay">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-               <string>Play</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </item>
-          </layout>
+          <widget class="QWidget" name="">
+           <property name="geometry">
+            <rect>
+             <x>11</x>
+             <y>11</y>
+             <width>247</width>
+             <height>92</height>
+            </rect>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_8">
+            <item>
+             <widget class="QComboBox" name="instantEffect">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer_8">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>28</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="horizontalLayout">
+              <item>
+               <spacer name="horizontalSpacer">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>78</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+              <item>
+               <widget class="QPushButton" name="instantPlay">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Play</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <spacer name="horizontalSpacer_2">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>78</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </item>
+             </layout>
+            </item>
+           </layout>
+          </widget>
          </widget>
         </widget>
        </item>
@@ -531,7 +587,7 @@
             <x>0</x>
             <y>0</y>
             <width>379</width>
-            <height>695</height>
+            <height>712</height>
            </rect>
           </property>
           <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -579,7 +635,7 @@
                   <bool>false</bool>
                  </property>
                  <property name="text">
-                 <string>Play/pause</string>
+                  <string>Play/pause</string>
                  </property>
                 </widget>
                </item>
@@ -589,7 +645,7 @@
                   <bool>false</bool>
                  </property>
                  <property name="text">
-                 <string>Stop</string>
+                  <string>Stop</string>
                  </property>
                 </widget>
                </item>
diff --git a/examples/hapticsplayer/main.cpp b/examples/hapticsplayer/main.cpp
index a6b2c6ecd1..72d973df9c 100644
--- a/examples/hapticsplayer/main.cpp
+++ b/examples/hapticsplayer/main.cpp
@@ -49,7 +49,7 @@ int main(int argc, char *argv[])
     HapticsPlayer w;
     
 #if defined Q_OS_SYMBIAN || defined (Q_OS_WINCE)
-    w.setWindowState(Qt::WindowMaximized);
+    w.showMaximized();
 #endif
     w.show();
 
diff --git a/examples/mapsdemo/marker.cpp b/examples/mapsdemo/marker.cpp
index 1c99958b93..28053fa9a9 100644
--- a/examples/mapsdemo/marker.cpp
+++ b/examples/mapsdemo/marker.cpp
@@ -247,6 +247,7 @@ void MarkerManager::removeSearchMarkers()
 {
     foreach (Marker *m, d->searchMarkers) {
         d->map->removeMapObject(m);
+        d->searchMarkers.removeOne(m);
         delete m;
     }
 }
diff --git a/examples/mediabrowser/mediabrowser.desktop b/examples/mediabrowser/mediabrowser.desktop
new file mode 100755
index 0000000000..566f21e536
--- /dev/null
+++ b/examples/mediabrowser/mediabrowser.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Version=1.0
+Type=Application
+Terminal=false
+Name=mediabrowser
+Exec=/usr/bin/single-instance /opt/mediabrowser/bin/mediabrowser
+Icon=/usr/share/icons/hicolor/80x80/apps/mediabrowser.png
+X-Window-Icon=
+X-HildonDesk-ShowInToolbar=true
+X-Osso-Type=application/x-executable
diff --git a/examples/mediabrowser/mediabrowser.png b/examples/mediabrowser/mediabrowser.png
new file mode 100755
index 0000000000..6ad8096c45
--- /dev/null
+++ b/examples/mediabrowser/mediabrowser.png
diff --git a/examples/mediabrowser/mediabrowser.pro b/examples/mediabrowser/mediabrowser.pro
index 9ea851e74e..562d7cd33f 100644
--- a/examples/mediabrowser/mediabrowser.pro
+++ b/examples/mediabrowser/mediabrowser.pro
@@ -39,5 +39,18 @@ SOURCES = \
 
 symbian: {
     load(data_caging_paths)
-    TARGET.CAPABILITY = ReadDeviceData WriteDeviceData
+}
+
+contains(MEEGO_EDITION,harmattan) {
+
+    DEFINES += Q_WS_MAEMO_6
+
+    icon.path = /usr/share/icons/hicolor/80x80/apps
+    icon.files += mediabrowser.png
+
+    desktop.path = /usr/share/applications
+    desktop.files += mediabrowser.desktop
+
+    target.path = /opt/mediabrowser/bin
+    INSTALLS += target icon desktop
 }
diff --git a/examples/qmlorganizer/contents/DayView.qml b/examples/qmlorganizer/contents/DayView.qml
index 806770f5e8..8adcbcd204 100644
--- a/examples/qmlorganizer/contents/DayView.qml
+++ b/examples/qmlorganizer/contents/DayView.qml
@@ -39,78 +39,144 @@
 ****************************************************************************/
 
 import Qt 4.7
-
 import QtMobility.organizer 1.1
 
-Rectangle
+Flickable
 {
-    id:dayView
-    property variant itemIds:calendar.organizer.itemIds(calendar.currentDate, new Date(calendar.year, calendar.month, calendar.day+1))
-
-    anchors.fill: parent
-
-
-    Repeater {
-        model : ListModel {
-                ListElement {hour : "0:00"}
-                ListElement {hour : "1:00"}
-                ListElement {hour : "2:00"}
-                ListElement {hour : "3:00"}
-                ListElement {hour : "4:00"}
-                ListElement {hour : "5:00"}
-                ListElement {hour : "6:00"}
-                ListElement {hour : "7:00"}
-                ListElement {hour : "8:00"}
-                ListElement {hour : "9:00"}
-                ListElement {hour : "10:00"}
-                ListElement {hour : "11:00"}
-                ListElement {hour : "12:00"}
-                ListElement {hour : "13:00"}
-                ListElement {hour : "14:00"}
-                ListElement {hour : "15:00"}
-                ListElement {hour : "16:00"}
-                ListElement {hour : "17:00"}
-                ListElement {hour : "18:00"}
-                ListElement {hour : "19:00"}
-                ListElement {hour : "20:00"}
-                ListElement {hour : "21:00"}
-                ListElement {hour : "22:00"}
-                ListElement {hour : "23:00"}
-            }
-
-        Rectangle {
-            width : dayView.width
-            height : dayView.height / 24
-            y:index * height
-            Column {
-                Rectangle {
-                    height : 1
-                    width : dayView.width
-                    color : "lightsteelblue"
-                }
-                Text {
-                    text: hour
-                    color : "steelblue"
-                    font.pointSize: 12
-                }
-            }
-        }
-    }
-
-    Repeater {
-        model:itemIds
-        ItemView {
-            property int timePos: (startTime/(24*60))*dayView.height
-            focus: true
-            width:dayView.width - 50
-            height: endTime< startTime ? 30: dayView.height * (endTime - startTime)/(24*60)
-            x: dayView.x + 50
-            y: dayView.y + timePos
-
-
-            opacity : dayView.opacity * 0.8
-            itemId: modelData
-
-        }
-    }
+     Rectangle {
+         id : dayView
+
+         anchors.fill : parent
+         opacity : parent.opacity
+         color: "#9eaf30"
+         gradient: Gradient {
+             GradientStop {
+                 position: 0.00;
+                 color: "#9eaf30";
+             }
+             GradientStop {
+                 position: 0.89;
+                 color: "#ffffff";
+             }
+         }
+
+         ListView {
+             id : hourList
+             model : hourModel
+             anchors.fill: parent
+             clip: true
+             focus: true
+             opacity : parent.opacity
+
+             delegate : hourDelegate
+             highlight: hourHighlight
+             preferredHighlightBegin: hourList.height * 0.5
+             preferredHighlightEnd: preferredHighlightBegin
+             highlightFollowsCurrentItem : true
+             highlightMoveSpeed : 2000
+             keyNavigationWraps : true
+
+             onCurrentIndexChanged : {
+                 if (timelineView.opacity > 0) {
+                     calendar.currentDate = new Date(timelineView.year, timelineView.month, currentIndex + 1);
+                     monthList.currentIndex = timelineView.month;
+                     currentIndex = timelineView.day - 1;
+                 }
+             }
+
+         }
+         Component {
+             id: hourHighlight
+             Rectangle {
+                 width: hourList.width;
+                 height: hourList.height /7 ;
+                 color: "lightsteelblue" ;radius: 5
+             }
+         }
+
+         Component {
+             id: hourDelegate
+
+
+             Item {
+                 width : hourList.width
+                 height : childrenRect.height
+                 property int rowIndex : index
+                 id:hourDelegateInstanceItem
+
+                 Column {
+                     // Draw a line under the previous Hour list tiem
+                     Rectangle {
+                         height : 1
+                         width : hourList.width
+                         color : "black"
+                     }
+
+                     Text {
+                        // text: hour
+                         text: index + ":00"
+                     }
+
+
+                     // List all, if any, of the events within this hour.
+                     Repeater {
+
+                         focus: true
+
+                         // Simple fetch ALL events on this day...and we will filter them by hour.
+                         model: calendar.organizer.items? calendar.organizer.itemIds(new Date(calendar.year, calendar.month, calendar.day)
+                                                                                     , new Date(calendar.year, calendar.month, calendar.day+1))
+                                                        : 0
+
+                         Row {
+                             spacing:  4
+                             Text {
+                                 id: itemText
+                                 clip: true
+                                 focus: true
+                                 property OrganizerItem oi: calendar.organizer.item(modelData)
+
+                                 // Only display a link when the event starts within this hour......
+                                 text: (hourDelegateInstanceItem.rowIndex == Qt.formatTime(oi.itemStartTime, "hh")) ? "<a href=\"#\">" + oi.displayLabel + "</a>":""
+                                 onLinkActivated: {
+                                     //detailsView.isNewItem = false;
+                                     detailsView.item = oi;
+                                     calendar.state = "DetailsView";
+                                 }
+                             }
+                         }
+                     }
+                 }
+             }
+
+         }
+
+         ListModel {
+             id : hourModel
+             ListElement {hour : "0:00"}
+             ListElement {hour : "1:00"}
+             ListElement {hour : "2:00"}
+             ListElement {hour : "3:00"}
+             ListElement {hour : "4:00"}
+             ListElement {hour : "5:00"}
+             ListElement {hour : "6:00"}
+             ListElement {hour : "7:00"}
+             ListElement {hour : "8:00"}
+             ListElement {hour : "9:00"}
+             ListElement {hour : "10:00"}
+             ListElement {hour : "11:00"}
+             ListElement {hour : "12:00"}
+             ListElement {hour : "13:00"}
+             ListElement {hour : "14:00"}
+             ListElement {hour : "15:00"}
+             ListElement {hour : "16:00"}
+             ListElement {hour : "17:00"}
+             ListElement {hour : "18:00"}
+             ListElement {hour : "19:00"}
+             ListElement {hour : "20:00"}
+             ListElement {hour : "21:00"}
+             ListElement {hour : "22:00"}
+             ListElement {hour : "23:00"}
+         }
+     }
 }
diff --git a/examples/qmlorganizer/contents/DetailsView.qml b/examples/qmlorganizer/contents/DetailsView.qml
index 2eb4aa75e5..92d84a11c4 100644
--- a/examples/qmlorganizer/contents/DetailsView.qml
+++ b/examples/qmlorganizer/contents/DetailsView.qml
@@ -39,15 +39,15 @@
 ****************************************************************************/
 
 import Qt 4.7
-
 import QtMobility.organizer 1.1
 
 Rectangle
 {
     id:detailsView
+
     anchors.fill: parent
-    property string  itemId
-    property string itemType : item.type
+    property string itemId
+    property string itemType : item == undefined? "" : item.type
     property variant item
 
     onItemIdChanged : {
@@ -55,29 +55,29 @@ Rectangle
             item = calendar.organizer.item(itemId);
     }
 
-   // TODOs:
-    //  1) add reminder details
-    //  2) add recurrences
-    //  3) write back
-
     ListView {
         anchors.fill: parent
+        clip: true
+        spacing: 9.0
+
         model: {
+            if (item == undefined)
+                return null;
             switch (itemType) {
-                    case "Event" :
-                         return eventItemModel;
-                    case "EventOccurrence":
-                         return eventOccurrenceItemModel;
-                    case "Journal":
-                         return journalItemModel;
-                    case "Note":
-                         return noteItemModel;
-                    case "Todo":
-                         return todoItemModel;
-                    case "TodoOccurrence":
-                         return todoOccurrenceItemModel;
-                    default:
-                         break;
+            case "Event" :
+                return eventItemModel;
+            case "EventOccurrence":
+                return eventOccurrenceItemModel;
+            case "Journal":
+                return journalItemModel;
+            case "Note":
+                return noteItemModel;
+            case "Todo":
+                return todoItemModel;
+            case "TodoOccurrence":
+                return todoOccurrenceItemModel;
+            default:
+                break;
             }
             return null;
         }
@@ -89,129 +89,129 @@ Rectangle
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "displayLabel:" }
-                TextInput { text:detailsView.item.displayLabel}
-            }
+            Text {
+                text:"displayLabel: " + detailsView.item.displayLabel
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
+           }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "description:" }
-                TextInput { text:detailsView.item.description}
+            Text {
+                text:"description: " + detailsView.item.description
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "start:" }
-                TextInput { text:detailsView.item.startDateTime}
+            Text {
+                text:"start: " + detailsView.item.startDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "end:" }
-                TextInput { text:detailsView.item.endDateTime}
+            Text {
+                text:"end: " + detailsView.item.endDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "All day event:" }
-                TextInput { text:detailsView.item.allDay}
+            Text {
+                text:"All day event: " + detailsView.item.allDay
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "location:" }
-                TextInput { text:detailsView.item.location}
-            }
+            Text {
+                text:"location: " + detailsView.item.location
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
+           }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "priority:" }
-                TextInput { text:detailsView.item.priority}
+            Text {
+                text:"priority: " + detailsView.item.priority
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "recurrence:" }
-                Text { text: "*not implemented*"}
+            Text {
+                text:"recurrence: " + "*not implemented*"
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "manager:" }
-                Text { text:detailsView.item.manager}
+            Text {
+                text:"manager: " + detailsView.item.manager
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "id:" }
-                Text { text: itemId}
+            Text {
+                text:"id: " + itemId
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "type:" }
-                TextInput { text: itemType}
+            Text {
+                text:"type: " + itemType
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "guid:" }
-                TextInput { text:detailsView.item.guid}
+            Text {
+                text:"guid: " + detailsView.item.guid
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "timestamp:" }
-                Text { text: "created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified}
+            Text {
+                text:"created: " + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
     }
@@ -219,102 +219,94 @@ Rectangle
     //event occurrence
     VisualItemModel {
         id:eventOccurrenceItemModel
+
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "displayLabel:" }
-                TextInput { text:detailsView.item.displayLabel}
-            }
-        }
-        Rectangle {
-            width: detailsView.width
-            height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "displayLabel:" }
-                TextInput { text:detailsView.item.displayLabel}
+            Text {
+                text:"displayLabel: " + detailsView.item.displayLabel
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "description:" }
-                TextInput { text:detailsView.item.description}
+            Text {
+                text:"description: " + detailsView.item.description
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "start:" }
-                TextInput { text:detailsView.item.startDateTime}
+            Text {
+                text:"start: " + detailsView.item.startDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "end:" }
-                TextInput { text:detailsView.item.endDateTime}
+            Text {
+                text:"end: " + detailsView.item.endDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "parent id:" }
-                TextInput { text:detailsView.item.parentId}
+            Text {
+                text:"parent id: " + detailsView.item.parentId
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "location:" }
-                TextInput { text:detailsView.item.location}
+            Text {
+                text:"location: " + detailsView.item.location
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "priority:" }
-                TextInput { text:detailsView.item.priority}
+            Text {
+                text:"priority: " + detailsView.item.priority
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "original date:" }
-                TextInput { text:detailsView.item.originalDate}
+            Text {
+                text:"original date: " + detailsView.item.originalDate
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "timestamp:" }
-                Text { text: "created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified}
+            Text {
+                text: "created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
@@ -322,122 +314,123 @@ Rectangle
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "manager:" }
-                Text { text:detailsView.item.manager}
+            Text {
+                text:"manager: " + detailsView.item.manager
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "id:" }
-                Text { text: itemId}
+            Text {
+                text:"id: " + itemId
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "type:" }
-                TextInput { text: itemType}
+            Text {
+                text:"type: " + itemType
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "guid:" }
-                TextInput { text:detailsView.item.guid}
+            Text {
+                text:"guid: " + detailsView.item.guid
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
     }
 
+
     //journal
     VisualItemModel {
         id:journalItemModel
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "displayLabel:" }
-                TextInput { text:detailsView.item.displayLabel}
+            Text {
+                text:"displayLabel: " + detailsView.item.displayLabel
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "description:" }
-                TextInput { text:detailsView.item.description}
+            Text {
+                text:"description: " + detailsView.item.description
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "date time:" }
-                TextInput { text:detailsView.item.startDateTime}
+            Text {
+                text:"date time: " + detailsView.item.startDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "timestamp:" }
-                Text { text: "created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified}
+            Text {
+                text:"created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "manager:" }
-                Text { text:detailsView.item.manager}
+            Text {
+                text:"manager: " + detailsView.item.manager
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "id:" }
-                Text { text: itemId}
+            Text {
+                text:"id: " + itemId
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "type:" }
-                TextInput { text: itemType}
+            Text {
+                text:"type: " + itemType
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "guid:" }
-                TextInput { text:detailsView.item.guid}
+            Text {
+                text:"guid: " + detailsView.item.guid
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
     }
@@ -448,66 +441,66 @@ Rectangle
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "displayLabel:" }
-                TextInput { text:detailsView.item.displayLabel}
+            Text {
+                text:"displayLabel: " + detailsView.item.displayLabel
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "description:" }
-                TextInput { text:detailsView.item.description}
+            Text {
+                text:"description: " + detailsView.item.description
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "timestamp:" }
-                Text { text: "created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified}
+            Text {
+                text:"created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "manager:" }
-                Text { text:detailsView.item.manager}
+            Text {
+                text:"manager: " + detailsView.item.manager
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "id:" }
-                Text { text: itemId}
+            Text {
+                text:"id: " + itemId
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "type:" }
-                TextInput { text: itemType}
+            Text {
+                text:"type: " + itemType
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "guid:" }
-                TextInput { text:detailsView.item.guid}
+            Text {
+                text:"guid: " + detailsView.item.guid
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
     }
@@ -518,110 +511,110 @@ Rectangle
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "displayLabel:" }
-                TextInput { text:detailsView.item.displayLabel}
+            Text {
+                text:"displayLabel: " + detailsView.item.displayLabel
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "description:" }
-                TextInput { text:detailsView.item.description}
+            Text {
+                text:"description: " + detailsView.item.description
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "start:" }
-                TextInput { text:detailsView.item.startDateTime}
+            Text {
+                text:"start: " + detailsView.item.startDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "due:" }
-                TextInput { text:detailsView.item.dueDateTime}
+            Text {
+                text:"due: " + detailsView.item.dueDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "finished:" }
-                TextInput { text:detailsView.item.finishedDateTime}
+            Text {
+                text:"finished: " + detailsView.item.finishedDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "All day event:" }
-                TextInput { text:detailsView.item.allDay}
+            Text {
+                text:"All day event: " + detailsView.item.allDay
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "progress(%):" }
-                TextInput { text:detailsView.item.progressPercentage}
+            Text {
+                text:"progress(%): " + detailsView.item.progressPercentage
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "priority:" }
-                TextInput { text:detailsView.item.priority}
+            Text {
+                text:"priority: " + detailsView.item.priority
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "status:" }
-                TextInput { text:detailsView.item.status}
+            Text {
+                text:"status: " + detailsView.item.status
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "recurrence:" }
-                Text { text: "*not implemented*"}
+            Text {
+                text:"recurrence: " + "*not implemented*"
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "timestamp:" }
-                Text { text: "created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified}
+            Text {
+                text: "created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
@@ -629,40 +622,40 @@ Rectangle
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "manager:" }
-                Text { text:detailsView.item.manager}
+            Text {
+                text:"manager: " + detailsView.item.manager
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "id:" }
-                Text { text: itemId}
+            Text {
+                text:"id: " + itemId
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "type:" }
-                TextInput { text: itemType}
+            Text {
+                text:"type: " + itemType
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "guid:" }
-                TextInput { text:detailsView.item.guid}
+            Text {
+                text:"guid: " + detailsView.item.guid
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
     }
@@ -673,159 +666,158 @@ Rectangle
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "displayLabel:" }
-                TextInput { text:detailsView.item.displayLabel}
+            Text {
+                text:"displayLabel: " + detailsView.item.displayLabel
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "description:" }
-                TextInput { text:detailsView.item.description}
+            Text {
+                text:"description: " + detailsView.item.description
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "start:" }
-                TextInput { text:detailsView.item.startDateTime}
+            Text {
+                text:"start: " + detailsView.item.startDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "due:" }
-                TextInput { text:detailsView.item.dueDateTime}
+            Text {
+                text:"due: " + detailsView.item.dueDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "finished:" }
-                TextInput { text:detailsView.item.finishedDateTime}
+            Text {
+                text:"finished: " + detailsView.item.finishedDateTime
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "All day event:" }
-                TextInput { text:detailsView.item.allDay}
+            Text {
+                text:"All day event: " + detailsView.item.allDay
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "progress(%):" }
-                TextInput { text:detailsView.item.progressPercentage}
+            Text {
+                text:"progress(%): " + detailsView.item.progressPercentage
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "priority:" }
-                TextInput { text:detailsView.item.priority}
+            Text {
+                text:"priority: " + detailsView.item.priority
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "status:" }
-                TextInput { text:detailsView.item.status}
+            Text {
+                text:"status: " + detailsView.item.status
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "parent id:" }
-                TextInput { text:detailsView.item.parentId}
+            Text {
+                text:"parent id: " + detailsView.item.parentId
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "original date:" }
-                TextInput { text:detailsView.item.originalDate}
+            Text {
+                text:"original date: " + detailsView.item.originalDate
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "timestamp:" }
-                Text { text: "created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified}
+            Text {
+                text:"created:" + detailsView.item.timestamp.created + "lastModified:" + detailsView.item.timestamp.lastModified
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "manager:" }
-                Text { text:detailsView.item.manager}
+            Text {
+                text:"manager: " + detailsView.item.manager
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "id:" }
-                Text { text: itemId}
+            Text {
+                text:"id: " + itemId
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "type:" }
-                TextInput { text: itemType}
+            Text {
+                text:"type: " + itemType
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
 
         Rectangle {
             width: detailsView.width
             height: childrenRect.height
-            Row {
-                spacing: 2
-                Text { text: "guid:" }
-                TextInput { text:detailsView.item.guid}
+            Text {
+                text:"guid: " + detailsView.item.guid
+                width: parent.width
+                wrapMode : Text.WrapAnywhere
             }
         }
     }
-
-
 }
+
diff --git a/examples/qmlorganizer/contents/MonthView.qml b/examples/qmlorganizer/contents/MonthView.qml
index f72add57dc..e31be584a2 100644
--- a/examples/qmlorganizer/contents/MonthView.qml
+++ b/examples/qmlorganizer/contents/MonthView.qml
@@ -65,7 +65,7 @@ Rectangle  {
                             verticalAlignment: Text.AlignVCenter
                             style: Text.Sunken
                             styleColor: "#1365f3"
-                            font.pointSize: 14
+                            font.pointSize: 8
                             anchors.centerIn: parent
                         }
                         MouseArea {
diff --git a/examples/qmlorganizer/contents/StatusBar.qml b/examples/qmlorganizer/contents/StatusBar.qml
index fc44a15a3e..ee75f40b25 100644
--- a/examples/qmlorganizer/contents/StatusBar.qml
+++ b/examples/qmlorganizer/contents/StatusBar.qml
@@ -62,7 +62,7 @@ Item {
         font.bold: true
         verticalAlignment: Text.AlignVCenter
         horizontalAlignment: Text.AlignHCenter
-        font.pointSize: 19
+        font.pointSize: 10
         anchors.left: leftButton.right
         anchors.leftMargin: 5
         anchors.right: rightButton.left
diff --git a/examples/qmlorganizer/contents/WeekView.qml b/examples/qmlorganizer/contents/WeekView.qml
index a105a9175e..020caf4d86 100644
--- a/examples/qmlorganizer/contents/WeekView.qml
+++ b/examples/qmlorganizer/contents/WeekView.qml
@@ -44,6 +44,19 @@ import QtMobility.organizer 1.1
 Rectangle
 {
     id:weekView
+
+    color: "#9eaf30"
+        gradient: Gradient {
+            GradientStop {
+                position: 0.00;
+                color: "#9eaf30";
+            }
+            GradientStop {
+                position: 0.89;
+                color: "#ffffff";
+            }
+        }
+
     anchors.fill: parent
     ListView {
         id : dayList
@@ -71,48 +84,44 @@ Rectangle
                 ListElement {day : "Saturday"}
          }
 
-        delegate : Rectangle {
-                id:weekDayDelegate
-                width : dayList.width
-                height :  childrenRect.height > dayList.height / 7  ? childrenRect.height  : dayList.height / 7
-                focus: true
+        delegate:  dayDelegate
 
-               FocusScope {
-                   focus: true
-                    Column {
+        Component {
+            id: dayDelegate
+            Item {
+                width : dayList.width
+                //height : childrenRect.height
+                height : weekDayColumn.height > dayList.height / 7  ? weekDayColumn.height  : dayList.height / 7
+                FocusScope {
+                Column {
+                    id: weekDayColumn
+                    Rectangle {
+                        height : 1
+                        width : dayList.width
+                        color : "black"
+                    }
+                    Text {
+                        text: day
+                    }
+                    Repeater {
                         focus: true
-                        Rectangle {
-                            height : 2
-                            width : dayList.width
-                            color : "lightsteelblue"
-                        }
+                        model: calendar.organizer.items? calendar.organizer.itemIds(new Date(calendar.year,calendar.month, index - calendar.weekDay + calendar.day),
+                                                         new Date(calendar.year,calendar.month, index - calendar.weekDay + calendar.day + 1))
+                                                       : 0
                         Text {
-                            text: day
-                        }
-
-                        Repeater {
+                            clip: true
                             focus: true
-                            model:calendar.organizer.itemIds(new Date(calendar.year,
-                                                                      calendar.month,
-                                                                      index - calendar.weekDay + calendar.day),
-                                                             new Date(calendar.year,
-                                                                      calendar.month,
-                                                                      index - calendar.weekDay + calendar.day + 1))
-
-                            Text {
-                                clip: true
-                                focus: true
-                                property OrganizerItem oi: calendar.organizer.item(modelData)
-                                text: "<a href=\"#\">" + oi.displayLabel + "</a>"
-                                onLinkActivated: {
-                                        console.log(oi.type + "," + oi.displayLabel + oi.description);
-                                        //TODO: goto details view
-                                }
+                            property OrganizerItem oi: calendar.organizer.item(modelData)
+                            text: "<a href=\"#\">" + oi.displayLabel + "</a>"
+                            onLinkActivated: {
+                                detailsView.item = oi;
+                                calendar.state = "DetailsView";
                             }
                         }
-                    }
-               }
-               MouseArea {
+                    }//Repeater
+                }//Column
+                }//FocusScope
+                MouseArea {
                     anchors.fill: parent
                     onClicked: {
                         dayList.currentIndex = index
@@ -120,10 +129,11 @@ Rectangle
                         calendar.state = "DayView"
                     }
                 }
-        }
+            }//Item
+        }//Component
 
-        highlight:  Component {
 
+        highlight:  Component {
             Rectangle {
                 width: dayList.width
                 height: dayList.height /7
@@ -132,6 +142,6 @@ Rectangle
             }
         }
 
-    }
+    }//ListView
 }
 
diff --git a/examples/qmlorganizer/organizer.qml b/examples/qmlorganizer/organizer.qml
index 1e7a725bb7..3325de9d45 100644
--- a/examples/qmlorganizer/organizer.qml
+++ b/examples/qmlorganizer/organizer.qml
@@ -73,7 +73,7 @@ Rectangle {
 
 
 
-        MenuBar { id: menuBar; width: parent.width; height: 35; opacity: 0.9; info: organizer.error + "\nTotal:" + organizer.itemCount }
+        MenuBar { id: menuBar; width: parent.width; height: 35; opacity: 0.9;}
         StatusBar {
             id: statusBar; status:calendar.status; width: parent.width; height: 35; opacity: 0.9; anchors.bottom: calendar.bottom
             onLeftClicked: {
diff --git a/examples/qmlorganizer/qmlorganizer.pro b/examples/qmlorganizer/qmlorganizer.pro
index d41d5e2084..558bbd371f 100644
--- a/examples/qmlorganizer/qmlorganizer.pro
+++ b/examples/qmlorganizer/qmlorganizer.pro
@@ -44,6 +44,7 @@ OTHER_FILES += \
     contents/test.ics \
     contents/2010-FIFA-WorldCup.ics
 
+
 symbian: {
     load(data_caging_paths)
     TARGET.CAPABILITY = ReadUserData WriteUserData
@@ -55,3 +56,10 @@ symbian: {
 
 RESOURCES += \
     qmlorganizer.qrc
+
+contains(MEEGO_EDITION,harmattan) {
+    target.path = /opt/qmlorganizer/bin
+    INSTALLS += target
+}
+
+
diff --git a/examples/servicebrowser/servicebrowser.cpp b/examples/servicebrowser/servicebrowser.cpp
index d40d0e1ef7..43bcb75afa 100644
--- a/examples/servicebrowser/servicebrowser.cpp
+++ b/examples/servicebrowser/servicebrowser.cpp
@@ -44,6 +44,7 @@
 #include <qserviceinterfacedescriptor.h>
 
 #include "servicebrowser.h"
+#include "qplatformdefs.h"
 
 Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
 
@@ -53,8 +54,9 @@ ServiceBrowser::ServiceBrowser(QWidget *parent, Qt::WindowFlags flags)
     serviceManager = new QServiceManager(this);
     systemManager = new QServiceManager(QService::SystemScope);
 
+#ifndef Q_OS_SYMBIAN
     registerExampleServices();
-
+#endif
     initWidgets();
     reloadServicesList();
 
@@ -63,7 +65,9 @@ ServiceBrowser::ServiceBrowser(QWidget *parent, Qt::WindowFlags flags)
 
 ServiceBrowser::~ServiceBrowser()
 {
+#ifndef Q_OS_SYMBIAN
     unregisterExampleServices();
+#endif
 }
 
 void ServiceBrowser::currentInterfaceImplChanged(QListWidgetItem *current, QListWidgetItem *previous)
@@ -82,7 +86,6 @@ void ServiceBrowser::currentInterfaceImplChanged(QListWidgetItem *current, QList
 #else
         defaultInterfaceButton->setText(tr("Set as default implementation for %1").arg(descriptor.interfaceName()));
 #endif
-                //TODO: .arg(descriptor.interfaceName()));
         defaultInterfaceButton->setEnabled(true);
     }
 }
@@ -227,19 +230,18 @@ void ServiceBrowser::setDefaultInterfaceImplementation()
 
 void ServiceBrowser::registerExampleServices()
 {
-//    QStringList exampleXmlFiles;
-//    exampleXmlFiles << "filemanagerservice.xml" << "bluetoothtransferservice.xml" << "notesmanagerservice.xml";
-//    foreach (const QString &fileName, exampleXmlFiles) {
-//        const QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
-//        serviceManager->addService(path);
-//    }
+    QStringList exampleXmlFiles;
+    exampleXmlFiles << "filemanagerservice.xml" << "bluetoothtransferservice.xml";
+    foreach (const QString &fileName, exampleXmlFiles) {
+        const QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
+        serviceManager->addService(path);
+    }
 }
 
 void ServiceBrowser::unregisterExampleServices()
 {
-//    serviceManager->removeService("FileManagerService");
-//    serviceManager->removeService("BluetoothTransferService");
-//    serviceManager->removeService("NotesManagerService");
+    serviceManager->removeService("FileManagerService");
+    serviceManager->removeService("BluetoothTransferService");
 }
 
 void ServiceBrowser::reloadAttributesRadioButtonText()
@@ -268,12 +270,6 @@ void ServiceBrowser::initWidgets()
     attributesListWidget = new QListWidget;
     attributesListWidget->addItem(tr("(Select an interface implementation)"));
 
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5)
-    interfacesListWidget->setMinimumWidth(450);
-#else
-    interfacesListWidget->setMaximumWidth(360);
-#endif
-
     connect(servicesListWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
             this, SLOT(reloadInterfaceImplementationsList()));
 
@@ -324,7 +320,7 @@ void ServiceBrowser::initWidgets()
     attributesLayout->setContentsMargins(0, spacingHack, 0, 0);
     servicesLayout->setContentsMargins(0, spacingHack, 0, 0);
 #endif
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5)
+#if defined(MEEGO_EDITION_HARMATTAN)
     QGridLayout *layout = new QGridLayout;
     layout->addWidget(servicesGroup, 0, 0);
     layout->addWidget(attributesGroup, 0, 1, 2, 1);
diff --git a/examples/servicebrowser/servicebrowser.pro b/examples/servicebrowser/servicebrowser.pro
index 85b868c0d0..d5f76fe005 100644
--- a/examples/servicebrowser/servicebrowser.pro
+++ b/examples/servicebrowser/servicebrowser.pro
@@ -25,3 +25,12 @@ symbian {
 
     TARGET.CAPABILITY = ReadUserData WriteUserData
 }
+
+contains(MEEGO_EDITION,harmattan) {
+    target.path = /opt/servicebrowser/bin
+    INSTALLS += target
+}
+
+
+OTHER_FILES += 
+
diff --git a/examples/sfwecho/sfwecho_service/main.cpp b/examples/sfwecho/sfwecho_service/main.cpp
index bbb43d4f37..5a2f12d631 100644
--- a/examples/sfwecho/sfwecho_service/main.cpp
+++ b/examples/sfwecho/sfwecho_service/main.cpp
@@ -74,12 +74,15 @@ void unregisterExampleService()
 
 void registerExampleService()
 {
+    // Automatic registration feature is used on Symbian, for details see .pro file
+#ifndef Q_OS_SYMBIAN
     unregisterExampleService();
     QServiceManager m;
     const QString path = QCoreApplication::applicationDirPath() + "/xmldata/sfwechoservice.xml";
     if (!m.addService(path)) {
         qWarning() << "Cannot register EchoService" << path;
     }
+#endif
 }
 
 Q_DECLARE_METATYPE(QMetaType::Type);
diff --git a/features/mkservicedb/bld.inf b/features/mkservicedb/bld.inf
new file mode 100644
index 0000000000..64cb2330bd
--- /dev/null
+++ b/features/mkservicedb/bld.inf
@@ -0,0 +1,11 @@
+PRJ_EXPORTS
+
+qtmobilitydb.flm        /epoc32/tools/makefile_templates/qt/
+qtmobilitydb.meta       /epoc32/tools/makefile_templates/qt/
+qtmobilitydb.xml        /epoc32/tools/makefile_templates/qt/
+
+
+PRJ_EXTENSIONS
+
+START EXTENSION qt/qtmobilitydb
+END
\ No newline at end of file
diff --git a/features/mkservicedb/qtmobilitydb.flm b/features/mkservicedb/qtmobilitydb.flm
new file mode 100644
index 0000000000..14fa1f0f2f
--- /dev/null
+++ b/features/mkservicedb/qtmobilitydb.flm
@@ -0,0 +1,47 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+# **
+# ****************************************************************************/
+
+# FLM to be used for registering/unregistering QtServiceFW services build time
+SFWTOOL := $(EPOCROOT)/epoc32/tools/servicedbgen$(DOTEXE)
+
+#choose target database to deal with
+ifeq ($(PLATFORM), WINSCW)
+QTSERVICE_TARGET := -twinscw
+DES_DIR := $(EPOCROOT)/epoc32/winscw/c/private/2002AC7F/des
+DBFILENAME := $(EPOCROOT)/epoc32/winscw/c/private/2002AC7F/QtServiceFramework_4.8_system.db
+else
+ifeq ($(PLATFORM), ARMV5)
+QTSERVICE_TARGET := -tarmv5
+DES_DIR := $(EPOCROOT)/epoc32/data/z/private/2002AC7F/des
+DBFILENAME := $(EPOCROOT)/epoc32/data/z/private/2002AC7F/QtServiceFramework_4.8_system.db
+else
+QTSERVICE_TARGET := -tall
+DES_DIR := $(EPOCROOT)/epoc32/data/z/private/2002AC7F/des
+DBFILENAME := $(EPOCROOT)/epoc32/data/z/private/2002AC7F/QtServiceFramework_4.8_system.db
+endif
+endif
+
+define handle_service
+
+# Files named as init_*.xml need the -i flag, others do not
+FINAL::
+	$(call startrule,add_services,FORCESUCCESS) \
+	$(foreach file,$(filter init_%,$(notdir $(wildcard $(DES_DIR)/*.xml))), \
+	$(SFWTOOL) $(QTSERVICE_TARGET) -i add $(DES_DIR)/$(file); ) \
+	$(foreach file,$(filter-out init_%,$(notdir $(wildcard $(DES_DIR)/*.xml))), \
+	$(SFWTOOL) $(QTSERVICE_TARGET) add $(DES_DIR)/$(file); ) \
+	$(call endrule,add_services)
+endef
+
+SINGLETON:=done_$(call sanitise,$(DES_DIR))
+
+ifeq ($($(SINGLETON)),)
+$(SINGLETON):=1
+$(eval $(handle_service))
+$(eval $(call raptor_release,$(DBFILENAME),WHATMAKEFILE))
+$(eval $(call raptor_clean,$(DBFILENAME),WHATMAKEFILE))
+endif
+
diff --git a/features/mkservicedb/qtmobilitydb.meta b/features/mkservicedb/qtmobilitydb.meta
new file mode 100644
index 0000000000..889a078abe
--- /dev/null
+++ b/features/mkservicedb/qtmobilitydb.meta
@@ -0,0 +1,3 @@
+platform    win32
+makefile    gnumake
+techstream  qt
diff --git a/features/qtservice.xml b/features/mkservicedb/qtmobilitydb.xml
index 2e467cda28..6af45a9012 100644
--- a/features/qtservice.xml
+++ b/features/mkservicedb/qtmobilitydb.xml
@@ -5,9 +5,6 @@
 
 	<!-- Tools interfaces -->
 
-	<interface name="qt.qtservice" extends="Symbian.UserFLM" flm="qtservice.flm">
-		<param name='QTSERVICE_DESCRIPTOR' default='' />
-		<param name='QTSERVICE_INITIALIZE' default='' />
-	</interface>
+	<interface name="qt.qtmobilitydb" extends="Symbian.UserFLM" flm="qtmobilitydb.flm"/>
 
 </build>
diff --git a/features/qtservice.flm b/features/qtservice.flm
deleted file mode 100644
index 9d3ae40905..0000000000
--- a/features/qtservice.flm
+++ /dev/null
@@ -1,50 +0,0 @@
-# /****************************************************************************
-# **
-# ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# ** Contact: 
-# **
-# ****************************************************************************/
-
-# FLM to be used for registering/unregistering QtServiceFW services build time
-SFWTOOL := $(EPOCROOT)/epoc32/tools/servicedbgen$(DOTEXE)
-
-#choose target database to deal with
-ifeq ($(PLATFORM), WINSCW)
-QTSERVICE_TARGET := -twinscw
-DES_PATH := ${EPOCROOT}/epoc32/winscw/c/private/2002AC7F/des/$(QTSERVICE_DESCRIPTOR)
-RELEASEABLES := ${EPOCROOT}/epoc32/winscw/c/private/2002AC7F/QtServiceFramework_4.8_system.db
-else
-ifeq ($(PLATFORM), ARMV5)
-QTSERVICE_TARGET := -tarmv5
-DES_PATH := $(EPOCROOT)/epoc32/data/z/private/2002AC7F/des/$(QTSERVICE_DESCRIPTOR)
-RELEASEABLES := $(EPOCROOT)/epoc32/data/z/private/2002AC7F/QtServiceFramework_4.8_system.db
-else
-QTSERVICE_TARGET := -tall
-DES_PATH := $(EPOCROOT)/epoc32/data/z/private/2002AC7F/des/$(QTSERVICE_DESCRIPTOR)
-RELEASEABLES := $(EPOCROOT)/epoc32/data/z/private/2002AC7F/QtServiceFramework_4.8_system.db
-endif
-endif
-
-define handle_service
-
-MAKEFILE::
-	$(call startrule,add_service,FORCESUCCESS) \
-	$(SFWTOOL) $(QTSERVICE_TARGET) $(QTSERVICE_INITIALIZE) add $(DES_PATH) \
-	$(call endrule,add_service)
-
-CLEAN::
-	$(call startrule,remove_service,FORCESUCCESS) \
-	$(SFWTOOL) $(QTSERVICE_TARGET) $(QTSERVICE_INITIALIZE) remove $(DES_PATH)  \
-	$(call endrule,remove_service)
-
-endef
-
-SINGLETON:=done_$(call sanitise,$(DES_PATH))
-
-ifeq ($($(SINGLETON)),)
-$(SINGLETON):=1
-$(eval $(handle_service))
-# this is going to cause some problems when several component are trying to register to the db...
-$(eval $(call whatmacro,$(RELEASEABLES),WHATMAKEFILE))
-endif
-
diff --git a/features/qtservice.prf b/features/qtservice.prf
index ed7f522440..00999f1144 100644
--- a/features/qtservice.prf
+++ b/features/qtservice.prf
@@ -11,26 +11,20 @@ symbian {
        QTC_COMMAND = add
        contains(QTSERVICE.INITIALIZE, yes) {
           QTSERVICE_INITIALIZE = -i
+
+          #raptor uses filename for determining the usage of -i
+          symbian-sbsv2:QTSERVICE_INITIALIZE_PREFIX=init_
        }
 
        #deploy descriptor file to service framework server's private folder
        #so batch mode tool execution can include the service
        qtservice_descriptors = $$QTSERVICE.DESCRIPTOR
        for(descriptor, qtservice_descriptors) {
-           BASENAME = $$basename(descriptor)
+           BASENAME = $${QTSERVICE_INITIALIZE_PREFIX}$$basename(descriptor)
            BLD_INF_RULES.prj_exports += "$$descriptor			/epoc32/winscw/c/private/2002AC7F/des/$$BASENAME"
            BLD_INF_RULES.prj_exports += "$$descriptor			/epoc32/data/z/private/2002AC7F/des/$$BASENAME"
        }
        
-       symbian-sbsv2{
-           sfwextension = \
-              "START EXTENSION qt/qtservice" \
-              "OPTION QTSERVICE_DESCRIPTOR $$basename(QTSERVICE.DESCRIPTOR)" \
-              "OPTION QTSERVICE_INITIALIZE $$QTSERVICE_INITIALIZE" \
-              "END"
-           BLD_INF_RULES.prj_extensions += sfwextension
-       }
-
        symbian-abld{
           DUMMY = qtservice.out
           qtc.output = $$DUMMY
diff --git a/features/utils.pri b/features/utils.pri
new file mode 100644
index 0000000000..decc8993e1
--- /dev/null
+++ b/features/utils.pri
@@ -0,0 +1,28 @@
+# Helper functions
+
+defineReplace(mobilityDeployFilename) {
+   unset(MOBILITY_DEPLOY_NAME)
+   MOBILITY_DEPLOY_NAME = $$1
+   CONFIG(debug, debug|release): {
+      mac:RET = $$member(MOBILITY_DEPLOY_NAME, 0)_debug
+      else:win32:RET = $$member(MOBILITY_DEPLOY_NAME, 0)d
+   }
+   isEmpty(RET):RET = $$MOBILITY_DEPLOY_NAME
+   return($$RET)
+}
+
+symbian {
+    defineReplace(mobilityUID) {
+        ret = $$1
+        !isEmpty(QT_LIBINFIX): ret = $$replace(ret, 0x2, 0xE)
+        return($$ret)
+    }
+}
+
+defineReplace(mobilityPluginTarget) {
+    target = $$1
+    symbian: target = $$target$${QT_LIBINFIX}
+    return($$qtLibraryTarget($$target))
+}
+
+!isEmpty(QT_LIBINFIX):QT_LIBINFIX_USED=$${QT_LIBINFIX}
diff --git a/package_definition.xml b/package_definition.xml
index 253e748657..60a225d469 100644
--- a/package_definition.xml
+++ b/package_definition.xml
@@ -8,20 +8,23 @@
      <component id="qtmobility_build" name="Qt Mobility Build" introduced="^4" filter="s60">
       <unit bldFile="." qt:proFile="qtmobility.pro"/>
      </component>
+     <component id="qtmobility_mkservicedb" name="Qt Mobility create registry" introduced="^4" filter="s60">
+      <unit bldFile="features/mkservicedb" />
+     </component>
     </collection>
     <collection id="qtmobility_demos" name="Qt Mobility Demos" level="app">
-     <component id="qtmobility_demos_build" name="Qt Mobility Demos Build" filter="s60,test,qtmobilitydemos,build_as_app" introduced="^4">
+     <component id="qtmobility_demos_build" name="Qt Mobility Demos Build" filter="s60,test,qtdemos,build_as_app" introduced="^4">
       <unit bldFile="demos" qt:proFile="demos.pro"/>
      </component>
     </collection>
     <collection id="qtmobility_examples" name="Qt Mobility Examples" level="app">
-     <component id="qtmobility_examples_build" name="Qt Mobility Examples Build" filter="s60,test,qtmobilityexamples,build_as_app" introduced="^4">
+     <component id="qtmobility_examples_build" name="Qt Mobility Examples Build" filter="s60,test,qtdemos,build_as_app" introduced="^4">
       <unit bldFile="examples" qt:proFile="examples.pro"/>
      </component>
     </collection>
     <collection id="tests" name="Qt Mobility Tests">
      <component id="qtmobility_tests_build" name="Qt Mobility Tests Build" filter="test,qtmobilitytests,build_as_app,s60" introduced="^4">
-      <unit bldFile="tests" qt:proFile="tests.pro"/>
+      <unit bldFile="tests" qt:proFile="tests.pro" qt:qmakeArgs="CONFIG+=symbian_test"/>
      </component>
     </collection>
   </package>
diff --git a/plugins/contacts/contacts.pro b/plugins/contacts/contacts.pro
index d5bf42aa0b..b96a743518 100644
--- a/plugins/contacts/contacts.pro
+++ b/plugins/contacts/contacts.pro
@@ -6,7 +6,7 @@ include(../../common.pri)
 
 symbian {
    #symbian contactsmodel,plugin,symbian is part of new contactsrv pkg
-   !exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.4.sis){
+   !contains(S60_VERSION, 5.4) {
         SUBDIRS += symbian
 
         ## build symbian-specific unit tests.
diff --git a/plugins/contacts/serviceactionmanager/serviceactionmanager.pro b/plugins/contacts/serviceactionmanager/serviceactionmanager.pro
index 4310513498..9d210da8ed 100644
--- a/plugins/contacts/serviceactionmanager/serviceactionmanager.pro
+++ b/plugins/contacts/serviceactionmanager/serviceactionmanager.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtcontacts_serviceactionmanager)
+TARGET = $$mobilityPluginTarget(qtcontacts_serviceactionmanager)
 PLUGIN_TYPE=contacts
 
 include(../../../common.pri)
@@ -19,7 +21,7 @@ MOBILITY = contacts serviceframework
 symbian: {
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3=0x200315FD
+    TARGET.UID3 = $$mobilityUID(0x200315FD)
 
     target.path = /sys/bin
     INSTALLS += target
diff --git a/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntbackuprestoreagent.cpp b/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntbackuprestoreagent.cpp
index e16e9be9a3..0f1d51b282 100644
--- a/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntbackuprestoreagent.cpp
+++ b/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntbackuprestoreagent.cpp
@@ -158,7 +158,10 @@ void CCntBackupRestoreAgent::CreateBackupRegistrationFileL(const TDesC& aFileNam
 		
 	HBufC* nameAndExt = NULL;
 	nameAndExt = HBufC::NewLC(KSqLiteFilePrefix().Length() + parseFileName.NameAndExt().Length());
-	nameAndExt->Des().Append(KSqLiteFilePrefix);
+    if (parseFileName.NameAndExt().Compare(KContactsIniFileName) != 0) 
+        {
+        nameAndExt->Des().Append(KSqLiteFilePrefix);
+        }                                             
 	nameAndExt->Des().Append(parseFileName.NameAndExt());
 
 	// Convert filename and extension to UTF8 before writing to file.
diff --git a/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntstatemachine.cpp b/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntstatemachine.cpp
index e520aa8a5b..85003c6408 100644
--- a/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntstatemachine.cpp
+++ b/plugins/contacts/symbian/contactsmodel/cntsrv/src/ccntstatemachine.cpp
@@ -766,8 +766,13 @@ TAccept CStateClosed::AcceptRequestL(CReqSetOwnCard* aRequest)
 */    
 TAccept CStateClosed::AcceptRequestL(CReqBackupRestoreBegin* aRequest)
     {
-    // Backup/restore can take place from this state without doing anything so
-    // simply complete request.
+    // Backup/restore can take place from this state so close the files.
+    // First reset collection, since it construct views based on table 
+    // Reset will fail if called after closing tables 
+    iPersistenceLayer.FactoryL().GetCollectorL().Reset(); 
+    // Close the file to allow the backup/restore to take place.    
+    iPersistenceLayer.ContactsFileL().Close();
+    iStateMachine.SetCurrentStateL(iStateMachine.StateBackupRestore());
     aRequest->Complete();
     return EProcessed;
     }
diff --git a/plugins/contacts/symbian/plugin/deploy.pri b/plugins/contacts/symbian/plugin/deploy.pri
deleted file mode 100644
index 365979cd3a..0000000000
--- a/plugins/contacts/symbian/plugin/deploy.pri
+++ /dev/null
@@ -1,3 +0,0 @@
-PUBLIC_HEADERS += inc/cntbackendsdefs.h
-CONFIG += middleware
-include(../../../../features/deploy.pri)
\ No newline at end of file
diff --git a/plugins/contacts/symbian/plugin/plugin.pro b/plugins/contacts/symbian/plugin/plugin.pro
index f7d8877e07..d7996927e9 100644
--- a/plugins/contacts/symbian/plugin/plugin.pro
+++ b/plugins/contacts/symbian/plugin/plugin.pro
@@ -1,16 +1,20 @@
+include(../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtcontacts_symbian)
+TARGET = qtcontacts_symbian
 PLUGIN_TYPE=contacts
 
 include(symbian_defines.pri)
-include(deploy.pri)
+PUBLIC_HEADERS += inc/cntbackendsdefs.h
+CONFIG += middleware
+include(../../../../features/deploy.pri)
 symbian: { 
     load(data_caging_paths)
 
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002AC7B
+    TARGET.UID3 = $$mobilityUID(0x2002AC7B)
   
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 	
diff --git a/plugins/contacts/symbian/plugin/symbian_defines.pri b/plugins/contacts/symbian/plugin/symbian_defines.pri
index aa3a24cb11..e1493e9495 100644
--- a/plugins/contacts/symbian/plugin/symbian_defines.pri
+++ b/plugins/contacts/symbian/plugin/symbian_defines.pri
@@ -1,5 +1,5 @@
 symbian: {
-    exists($${EPOCROOT}epoc32/data/z/system/install/productid_helen.sis) | exists($${EPOCROOT}epoc32/rom/config/ncp110) {
+    exists($${EPOCROOT}epoc32/data/z/system/install/productid_helen.sis) | exists($${EPOCROOT}epoc32/rom/config/ncp110) | exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.3.sis) {
         DEFINES += SYMBIAN_BACKEND_USE_CNTMODEL_V2
             
         # This will enable signals to be emitted sychronously with every
diff --git a/plugins/contacts/symbian/symbian.pro b/plugins/contacts/symbian/symbian.pro
index 35e1f2d992..f82613269d 100644
--- a/plugins/contacts/symbian/symbian.pro
+++ b/plugins/contacts/symbian/symbian.pro
@@ -5,6 +5,7 @@ include(../../../common.pri)
 
 ## quick platform check.
 IS_SYMBIAN_3_PS3 = no
+
 exists($${EPOCROOT}epoc32/data/z/system/install/productid_helen.sis) {
     IS_SYMBIAN_3_PS3 = yes
     message(S^3 1.11 hw79 platform)
@@ -18,6 +19,13 @@ contains(IS_SYMBIAN_3_PS3, no) {
 }
 
 contains(IS_SYMBIAN_3_PS3, no) {
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.3.sis) {
+        IS_SYMBIAN_3_PS3 = yes
+        message(S^3 5.3)
+    }
+}
+
+contains(IS_SYMBIAN_3_PS3, no) {
     message(S^3 PS2 or older platform)
 }
 
diff --git a/plugins/contacts/symbiansim/inc/cntsymbiansimengine.h b/plugins/contacts/symbiansim/inc/cntsymbiansimengine.h
index f854ec61fb..875659a750 100644
--- a/plugins/contacts/symbiansim/inc/cntsymbiansimengine.h
+++ b/plugins/contacts/symbiansim/inc/cntsymbiansimengine.h
@@ -94,12 +94,10 @@ class CntAbstractSimRequest;
 class CntSymbianSimPhoneNumberMatching
 {
 public:
-    enum TNumberType { ENotInitialized, EUnknown, EDigit, EPlus, EOneZero, ETwoZeros };
-    static TBool isBestMatchL(const QString& numberToMatch, const QString& matchingNumber);
-    static TBool validateBestMatchingRulesL(const TDesC& phoneNumber, const TDesC& matchNumber);
-    static TBool checkBestMatchingRules(const TDesC& numberA, TNumberType numberAType,
-                                             const TDesC& numberB, TNumberType numberBType);
-    static TInt formatAndCheckNumberType(TDes& number);
+    static TBool formatAndCompareL(const QString& numberToMatch, const QString& matchingNumber);
+    static TBool compareNumbersL(const TDesC& numberA, const TDesC& numberB);
+    static void formatNumber(TDes& number);
+    static TInt getLenExeludeLeadingPlusAndZeros(const TDesC& numberA);
 };
 
 class CntSymbianSimEngineData : public QSharedData
@@ -110,7 +108,6 @@ public:
     
     CntSimStore *m_simStore;
     QMap<QContactAbstractRequest *, CntAbstractSimRequest *> m_asyncRequests;
-    int m_phoneNumberMatchLen;
 };
 
 class CntSymbianSimEngine : public QContactManagerEngine
@@ -165,7 +162,6 @@ public:
 
 private:
     bool executeRequest(QContactAbstractRequest *req, QContactManager::Error* qtError) const;
-    void getMatchLengthL(int &matchLength);
 
 private:
     QExplicitlySharedDataPointer<CntSymbianSimEngineData> d;
diff --git a/plugins/contacts/symbiansim/src/cntsymbiansimengine.cpp b/plugins/contacts/symbiansim/src/cntsymbiansimengine.cpp
index 8c065d9332..aa6eefd6b4 100644
--- a/plugins/contacts/symbiansim/src/cntsymbiansimengine.cpp
+++ b/plugins/contacts/symbiansim/src/cntsymbiansimengine.cpp
@@ -61,8 +61,20 @@ const TUid KCRUidTelConfiguration = {0x102828B8};
 // Amount of digits to be used in contact matching.
 // This allows a customer to variate the amount of digits to be matched.
 const TUint32 KTelMatchDigits                               = 0x00000001;
+// Allows a customer to variate if dynamic match used in contact matching.
+// Legal values: true/false. Default value: true.
+const TUint32 KTelDynamicMatching                           = 0x00000002;
+
 // Default match length
 const TInt KDefaultMatchLength(7);
+// Max number of extra digits that can be added in numbers matching when
+// Dynamic Matching is used.
+// Example:
+//   If 8 digits are configured to be used, then another 2 extra digits are
+//   used if available in both numbers.
+const TInt KExtraDigitForNumberCompare(2);
+//Default Dynamic Matching 
+const TInt KDefaultDynamicMatching(1);
 
 
 CntSymbianSimEngineData::CntSymbianSimEngineData()
@@ -96,10 +108,6 @@ CntSymbianSimEngine::CntSymbianSimEngine(const QMap<QString, QString>& parameter
         return;
     }
     
-    // Get phone number match length from cenrep
-    d->m_phoneNumberMatchLen = KDefaultMatchLength;
-    TRAP_IGNORE(getMatchLengthL(d->m_phoneNumberMatchLen)); // ignore error and use default value
-
     if(d->m_simStore->storeInfo().m_storeName == KParameterValueSimStoreNameSdn) {
         // In case of SDN store we need to check if any SDN contacts exist to
         // determine if the store is supported or not
@@ -518,10 +526,8 @@ void CntSymbianSimEngine::setReadOnlyAccessConstraint(QContactDetail* detail) co
  */
 bool CntSymbianSimEngine::filter(const QContactFilter &filter, const QContact &contact)
 {
-    // Special handling for phonenumber matching:
-    // Matching is done from the right by using a configurable number of digits.
-    // Default number of digits is 7. So for example if we filter with number
-    // +358505555555 the filter should match to +358505555555 and 0505555555.
+    // Special handling for phone number matching:
+    // Matching is done from the right by using a configurable number of digits and algorithm. 
     if (filter.type() == QContactFilter::ContactDetailFilter) 
     {
         QContactDetailFilter f(filter);
@@ -529,28 +535,19 @@ bool CntSymbianSimEngine::filter(const QContactFilter &filter, const QContact &c
             f.detailFieldName() == QContactPhoneNumber::FieldNumber &&
             f.matchFlags() == QContactFilter::MatchPhoneNumber) 
         {
+            bool matchFound(false);
             QList<QContactPhoneNumber> pns = contact.details<QContactPhoneNumber>();
             foreach (QContactPhoneNumber pn, pns) {
-                // Best matching enabled
-                if(d->m_phoneNumberMatchLen == 0) {
-                    bool bestMatchFound(false);
-                    QString matchingNumber = f.value().toString();
-                    QString numberToMatch = pn.number();
-                    TRAP_IGNORE(
-                            bestMatchFound = CntSymbianSimPhoneNumberMatching::isBestMatchL(numberToMatch,matchingNumber);
-                    )
-                    if (bestMatchFound)
-                        return true;
-                }
-                else {
-                    // Default matching
-                    QString matchNumber = f.value().toString().right(d->m_phoneNumberMatchLen);
-                    QString number = pn.number().right(d->m_phoneNumberMatchLen);
-                    if (number == matchNumber)
-                        return true;
-                }
+                // Matching according to active configuration
+                QString matchingNumber = f.value().toString();
+                QString numberToMatch = pn.number();
+                TRAP_IGNORE(
+                    matchFound = CntSymbianSimPhoneNumberMatching::formatAndCompareL(numberToMatch,matchingNumber);
+                )
+                if (matchFound)
+                    break;
             }
-            return false;
+            return matchFound;
         }
     }
     return QContactManagerEngine::testFilter(filter, contact);
@@ -559,16 +556,27 @@ bool CntSymbianSimEngine::filter(const QContactFilter &filter, const QContact &c
 /*!
   Returns whether the supplied \a phonenumber is the best matching number.
  */
-TBool CntSymbianSimPhoneNumberMatching::isBestMatchL(const QString& numberToMatch, const QString& matchingNumber)
+TBool CntSymbianSimPhoneNumberMatching::formatAndCompareL(const QString& numberToMatch, const QString& matchingNumber)
 {
-    bool bestMatchFound(false);
+    // Format in Symbian style 
     TPtrC numberPtr(reinterpret_cast<const TUint16*>(numberToMatch.utf16()));
     TPtrC matchNumberPtr(reinterpret_cast<const TUint16*>(matchingNumber.utf16()));
     
-    if (CntSymbianSimPhoneNumberMatching::validateBestMatchingRulesL(numberPtr,matchNumberPtr)) {
-        bestMatchFound = true;
-    }
-    return bestMatchFound;
+    // Strip the special characters except leading '+'
+    RBuf numberA;
+    numberA.CleanupClosePushL();
+    numberA.CreateL(numberPtr);
+    CntSymbianSimPhoneNumberMatching::formatNumber(numberA);
+    RBuf numberB;
+    numberB.CleanupClosePushL();
+    numberB.CreateL(matchNumberPtr);
+    CntSymbianSimPhoneNumberMatching::formatNumber(numberB);
+  
+    bool matchFound = CntSymbianSimPhoneNumberMatching::compareNumbersL(numberA, numberB);
+    
+    // cleanup
+    CleanupStack::PopAndDestroy(2);
+    return matchFound;
 }
 
 /*!
@@ -608,210 +616,107 @@ bool CntSymbianSimEngine::executeRequest(QContactAbstractRequest *req, QContactM
     return (*qtError == QContactManager::NoError);
 }
 
-/*
- * Get the match length setting used in MatchPhoneNumber type filtering.
- * \a matchLength Phone number digits to be used in matching (counted from
- * right).
- */
-void CntSymbianSimEngine::getMatchLengthL(int &matchLength)
-{
-    //Get number of digits used to match
-    CRepository* repository = CRepository::NewL(KCRUidTelConfiguration);
-    CleanupStack::PushL(repository);
-    User::LeaveIfError(repository->Get(KTelMatchDigits, matchLength));
-    CleanupStack::PopAndDestroy(repository);
-}
-
-/*!
-  Validates the supplied \a phonenumber against best matching rules.
- */
-TBool CntSymbianSimPhoneNumberMatching::validateBestMatchingRulesL(const TDesC& phoneNumber, const TDesC& matchNumber)
-    {
-    RBuf numberA;
-    numberA.CleanupClosePushL();
-    numberA.CreateL(matchNumber);
-    TNumberType numberAType = (TNumberType) CntSymbianSimPhoneNumberMatching::formatAndCheckNumberType(numberA);
-    RBuf numberB;
-    numberB.CleanupClosePushL();
-    numberB.CreateL(phoneNumber);
-    TNumberType numberBType = (TNumberType) CntSymbianSimPhoneNumberMatching::formatAndCheckNumberType(numberB);
-
-    TBool match = (!numberB.Compare(numberA) ||
-                    CntSymbianSimPhoneNumberMatching::checkBestMatchingRules(numberA, numberAType, numberB, numberBType) ||
-                    CntSymbianSimPhoneNumberMatching::checkBestMatchingRules(numberB, numberBType, numberA, numberAType));
-    
-    // cleanup
-    CleanupStack::PopAndDestroy(2);
-    return match;
-    }
-
 /*!
   Removes non-digit chars except plus form the beginning.
   Checks if number matches to one of defined types.
  */
-TInt CntSymbianSimPhoneNumberMatching::formatAndCheckNumberType(TDes& number)
-    {
-    _LIT( KOneZeroPattern, "0*" );
-    _LIT( KTwoZerosPattern, "00*" );
-    _LIT( KPlusPattern, "+*" );
+void CntSymbianSimPhoneNumberMatching::formatNumber(TDes& number)
+{
     const TChar KPlus = TChar('+');
-    const TChar KZero = TChar('0');
     const TChar KAsterisk = TChar('*');
     const TChar KHash = TChar('#');
     
-    for( TInt pos = 0; pos < number.Length(); ++pos ) {
+    for( TInt pos = 0; pos < number.Length(); ++pos ){
         TChar chr = number[pos];
         if ( !chr.IsDigit() && !( pos == 0 && chr == KPlus  )
-                && !( chr == KAsterisk ) && !( chr == KHash ) ) {
+                && !( chr == KAsterisk ) && !( chr == KHash ) ){
             number.Delete( pos, 1 );
             --pos;
         }
     }
-    
-    TInt format;
-    
-    if (!number.Match(KTwoZerosPattern) && number.Length() > 2 && number[2] != KZero) {
-        format = ETwoZeros;
-    }
-    else if (!number.Match(KOneZeroPattern)&& number.Length() > 1 && number[1] != KZero) {
-        format = EOneZero;
-    }
-    else if (!number.Match(KPlusPattern) && number.Length() > 1 && number[1] != KZero) {
-        format = EPlus;
-    }
-    else if (number.Length() > 0 && number[0] != KZero && ( ( TChar ) number[0] ).IsDigit()) {
-        format = EDigit;
-    }
-    else {
-        format = EUnknown;
-    }
-
-    return format;
-    }
+}
 
-TBool CntSymbianSimPhoneNumberMatching::checkBestMatchingRules(
-        const TDesC& numberA, TNumberType numberAType,
-        const TDesC& numberB, TNumberType numberBType  )
-    {
+TBool CntSymbianSimPhoneNumberMatching::compareNumbersL(
+        const TDesC& numberA, const TDesC& numberB)
+{
     TBool result = EFalse;
     
-    // Rules for matching not identical numbers
-    // Rules details are presented in Best_Number_Matching_Algorithm_Description.doc
+    //Get number of digits used to match
+    TInt matchLength = KDefaultMatchLength;
+    TInt dynamicMatching = KDefaultDynamicMatching;
+   
+    CRepository* repository = CRepository::NewL(KCRUidTelConfiguration);
+    CleanupStack::PushL(repository);
+    // Error handling is ignored as default values will be used if not found
+    repository->Get(KTelMatchDigits, matchLength);
+    repository->Get(KTelDynamicMatching, dynamicMatching);
     
-    // rule International-International 1
-    if (!result && numberAType == EPlus && numberBType == ETwoZeros) {
-        TPtrC numberAPtr = numberA.Right(numberA.Length() - 1);
-        TPtrC numberBPtr = numberB.Right(numberB.Length() - 2);
-        result = !(numberAPtr.Compare(numberBPtr));
-        if (result) {
-            return result;
-        }
-    }
-
-    // rule International-International 2
-    if (numberAType == EPlus && numberBType == EDigit) {
-        TPtrC numberAPtr = numberA.Right( numberA.Length() - 1 );
-        if (numberAPtr.Length() < numberB.Length()) {
-            TPtrC numberBPtr = numberB.Right( numberAPtr.Length() );
-            result = !(numberAPtr.Compare(numberBPtr));
-            if (result) {
-                return result;
-            }
-        }
-    }
-
-    // rule International-International 3
-    if (numberAType == ETwoZeros && numberBType == EDigit) {
-        TPtrC numberAPtr = numberA.Right(numberA.Length() - 2);
-        if (numberAPtr.Length() < numberB.Length()) {
-            TPtrC numberBPtr = numberB.Right(numberAPtr.Length());
-            result = !(numberAPtr.Compare(numberBPtr));
-            if (result) {
-                return result;
-            }
-        }
-    }
-
-    // rule International-Operator 1
-    if (numberAType == EOneZero && numberBType == EPlus
-            || numberAType == EDigit && numberBType == EPlus) {
-        TPtrC numberAPtr;
-        if (numberAType == EOneZero) {
-            numberAPtr.Set(numberA.Right(numberA.Length() - 1));
-        }
-        else {
-            numberAPtr.Set(numberA);
-        }
-        if (numberAPtr.Length() < numberB.Length() - 1) {
-            TPtrC numberBPtr = numberB.Right(numberAPtr.Length());
-            result = !(numberAPtr.Compare(numberBPtr));
-            if (result) {
-                return result;
-            }
-        }
-    }
-
-    // rule International-Operator 2
-    if (numberAType == EOneZero && numberBType == ETwoZeros
-            || numberAType == EDigit && numberBType == ETwoZeros) {
-        TPtrC numberAPtr;
-        if (numberAType == EOneZero) {
-            numberAPtr.Set(numberA.Right(numberA.Length() - 1));
-        }
-        else {
-            numberAPtr.Set(numberA);
-        }
-        if (numberAPtr.Length() < numberB.Length() - 2) {
-            TPtrC numberBPtr = numberB.Right(numberAPtr.Length());
-            result = !(numberAPtr.Compare(numberBPtr));
-            if (result) {
-                return result;
-            }
-        }
-    }
-
-    // rule International-Operator 3
-    if (numberAType == EOneZero && numberBType == EDigit
-            || numberAType == EDigit && numberBType == EDigit) {
-        TPtrC numberAPtr;
-        if (numberAType == EOneZero) {
-            numberAPtr.Set(numberA.Right( numberA.Length() - 1));
-        }
-        else {
-            numberAPtr.Set(numberA);
-        }
-        if (numberAPtr.Length() < numberB.Length()) {
-            TPtrC numberBPtr = numberB.Right(numberAPtr.Length());
-            result = !(numberAPtr.Compare(numberBPtr));
-            if (result) {
-                return result;
-            }
-        }
-    }
-
-    // rule Operator-Operator 1
-    if (numberAType == EOneZero && numberBType == EDigit) {
-        TPtrC numberAPtr = numberA.Right(numberA.Length() - 1);
-        result = !(numberAPtr.Compare(numberB));
-        if (result) {
-            return result;
-        }
-    }
+    bool dynamicMatch = dynamicMatching;
+    CleanupStack::PopAndDestroy(repository);
     
-    // rule North America Numbering Plan 1
-    if (numberAType == EDigit && numberBType == EPlus) {
-        TPtrC numberBPtr = numberB.Right(numberB.Length() - 1);
-        result = !(numberA.Compare(numberBPtr));
-        if (result) {
-            return result;
-        }
-    }
+    // digitsFromRightLimit is the limit of digits to be used for comparison
+    // when Dynamic Matching is used 
+    TInt digitsFromRightLimit = matchLength + KExtraDigitForNumberCompare;
+    
+    TInt lenDigitsA = CntSymbianSimPhoneNumberMatching::getLenExeludeLeadingPlusAndZeros(numberA);
+    TInt lenDigitsB = CntSymbianSimPhoneNumberMatching::getLenExeludeLeadingPlusAndZeros(numberB);
+    
+    // Compare the numbers:
+    // - If length of both numbers >= aDigitsFromRight, then:
+    //   > If Dynamic Matching is used then compare numbers with aDigitsFromRight
+    //     digits from right, but use more digits until a maximum of digitsFromRightLimit
+    //     if available in both numbers.
+    //   > If Dynamic Matching is not used then compare numbers with aDigitsFromRight
+    //     digits from right.
+    // - If the length of at least one number < aDigitsFromRight, the numbers must be
+    //   equal to match.
+    TInt minLength = Min( lenDigitsA, lenDigitsB );
+    if ( minLength >= matchLength ){
+        // Examples (i.e. aDigitsFromRight=8):
+        // dynamicMatch = False, (    "07 12345678" ==   "+32 7 12345678")? --> Yes ( 8 digits used)
+        // dynamicMatch = True,  (    "07 12345678" ==   "+32 7 12345678")? --> Yes ( 9 digits used)
+        // dynamicMatch = False, (  "0987 12345678" == "+32 987 12345678")? --> Yes ( 8 digits used)
+        // dynamicMatch = True,  (  "0987 12345678" == "+32 987 12345678")? --> Yes (10 digits used)
+        // dynamicMatch = False, ("041 11 12345678" ==  "+55 11 12345678")? --> Yes ( 8 digits used)
+        // dynamicMatch = True,  ("041 11 12345678" ==  "+55 11 12345678")? --> Yes (10 digits used)
+        TInt compareLength = (dynamicMatch) ? Min( minLength, digitsFromRightLimit )
+                                            : matchLength;
+        TPtrC numberAright = numberA.Right( compareLength );
+        TPtrC numberBright = numberB.Right( compareLength );
+        result = !( numberAright.Compare( numberBright ) );
+     }
+     else
+     {
+     // If numbers have different length excluding leading 0s they
+     // are different, otherwise we compare them excluding the 0s.
+         if ( lenDigitsA == lenDigitsB ){
+             TPtrC numberAright = numberA.Right( minLength );
+             TPtrC numberBright = numberB.Right( minLength );
+             result = !( numberAright.Compare( numberBright ) );
+         }
+     }
+    
+    return result;
+}
 
-    // More exceptional acceptance rules can be added here
-    // Keep rules updated in the document Best_Number_Matching_Algorithm_Description.doc
+TInt CntSymbianSimPhoneNumberMatching::getLenExeludeLeadingPlusAndZeros(
+         const TDesC& aNumber)
+{
+    const TChar KPlus = TChar('+');
+    const TChar KZero = TChar('0');
+ 
+    // Get length of digits of aNumber excluding the leading '+' and '0's
+    TInt lenNumber = aNumber.Length();
+    TInt len = lenNumber;
+    if ( len > 0 && aNumber[0] == KPlus ){
+        len--;
+    }
 
-    return result;
+    while ( len > 0 && aNumber[lenNumber - len] == KZero ){
+        len--;
     }
+    return len;
+}
 
 QContactManagerEngine* CntSymbianSimFactory::engine(const QMap<QString, QString>& parameters, QContactManager::Error* error)
 {
diff --git a/plugins/contacts/symbiansim/symbiansim.pro b/plugins/contacts/symbiansim/symbiansim.pro
index 456600f206..062e3584f1 100644
--- a/plugins/contacts/symbiansim/symbiansim.pro
+++ b/plugins/contacts/symbiansim/symbiansim.pro
@@ -4,9 +4,11 @@
 #
 ######################################################################
 
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtcontacts_symbiansim)
+TARGET = $$mobilityPluginTarget(qtcontacts_symbiansim)
 PLUGIN_TYPE=contacts
 
 include(../../../common.pri)
@@ -17,7 +19,7 @@ symbian: {
     
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002AC85
+    TARGET.UID3 = $$mobilityUID(0x2002AC85)
 
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 
diff --git a/plugins/contacts/symbiansim/tsrc/ut_symbiansim/ut_cntsymbiansimengine.cpp b/plugins/contacts/symbiansim/tsrc/ut_symbiansim/ut_cntsymbiansimengine.cpp
index 2d8bc6b402..4273633a0b 100644
--- a/plugins/contacts/symbiansim/tsrc/ut_symbiansim/ut_cntsymbiansimengine.cpp
+++ b/plugins/contacts/symbiansim/tsrc/ut_symbiansim/ut_cntsymbiansimengine.cpp
@@ -136,7 +136,6 @@ void TestSymbianSimEngine::testSyncOperations()
     
     //delete the contact
     m_engine->removeContact(savedContact.localId(), &err);
-    QCOMPARE(err, QContactManager::NoError);
     ids = m_engine->contactIds(QContactFilter(), QList<QContactSortOrder>(), &err);
     QCOMPARE(err, QContactManager::DoesNotExistError);
     QCOMPARE(ids.count(), 0);
@@ -158,8 +157,12 @@ void TestSymbianSimEngine::testIsFilterSupported()
 
 void TestSymbianSimEngine::testIsBestMatch()
 {
-    QVERIFY(CntSymbianSimPhoneNumberMatching::isBestMatchL(("1234567"), ("1234567")));
-    QVERIFY(CntSymbianSimPhoneNumberMatching::isBestMatchL(("+358501234567"), ("0501234567")));
+    // Numbers matching (KTelMatchDigit value + 2(Dynamic matching))
+    QVERIFY(CntSymbianSimPhoneNumberMatching::formatAndCompareL(("1234567"), ("1234567")));
+    QVERIFY(CntSymbianSimPhoneNumberMatching::formatAndCompareL(("+358501234567"), ("0501234567")));
+    QVERIFY(CntSymbianSimPhoneNumberMatching::formatAndCompareL(("+358501234567"), ("+39501234567")));
+    bool numberCompare = CntSymbianSimPhoneNumberMatching::formatAndCompareL(("+358501234567"), ("+39401234567"));
+    QCOMPARE(numberCompare, false);
 }
 
 void TestSymbianSimEngine::testCntSymbianSimFactory()
@@ -189,10 +192,9 @@ void TestSymbianSimEngine::removeAllContacts()
 {
     if(m_engine) {
         QContactManager::Error err(QContactManager::NoError);
+        // Ignoring error checking if api not implemented fully 
         QList<QContactLocalId> cnts_ids = m_engine->contactIds(QContactFilter(),
                 QList<QContactSortOrder>(), &err);
-        QVERIFY(err == QContactManager::NoError || err == QContactManager::DoesNotExistError);
-
         for(int i = 0; i < cnts_ids.count(); i++) {
             QVERIFY(m_engine->removeContact(cnts_ids[i], &err));
         }
diff --git a/plugins/declarative/connectivity/connectivity.pro b/plugins/declarative/connectivity/connectivity.pro
index f5bba29f1b..be49e009e7 100644
--- a/plugins/declarative/connectivity/connectivity.pro
+++ b/plugins/declarative/connectivity/connectivity.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += . \
                ../../../src/global \
                ../../../include \
@@ -7,7 +9,7 @@ INCLUDEPATH += . \
 
 DEPENDPATH += ../../../src/connectivity
 
-TARGET = $$qtLibraryTarget(declarative_connectivity)
+TARGET = $$mobilityPluginTarget(declarative_connectivity)
 TARGETPATH = QtMobility/connectivity
 
 TEMPLATE = lib
@@ -64,7 +66,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-#    TARGET.UID3 = 0x20021325
+#    TARGET.UID3 = $$mobilityUID(0x20021325)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_connectivity$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/contacts/contacts.pro b/plugins/declarative/contacts/contacts.pro
index 721d79e79e..12f2a7606a 100644
--- a/plugins/declarative/contacts/contacts.pro
+++ b/plugins/declarative/contacts/contacts.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += . \
                ../../../src/global \
                ../../../include \
@@ -10,7 +12,7 @@ DEPENDPATH += ../../../src/contacts
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(declarative_contacts)
+TARGET = $$mobilityPluginTarget(declarative_contacts)
 TARGETPATH = QtMobility/contacts
 DEFINES += QT_MAKEDLL
 PLUGIN_TYPE = declarative
@@ -67,7 +69,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20021325
+    TARGET.UID3 = $$mobilityUID(0x20021325)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_contacts$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/feedback/feedback.pro b/plugins/declarative/feedback/feedback.pro
index e8cdddc76e..a843d7703c 100644
--- a/plugins/declarative/feedback/feedback.pro
+++ b/plugins/declarative/feedback/feedback.pro
@@ -1,9 +1,11 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/feedback
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_feedback)
+TARGET  = $$mobilityPluginTarget(declarative_feedback)
 TARGETPATH = QtMobility/feedback
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -38,7 +40,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x200315FC
+    TARGET.UID3 = $$mobilityUID(0x200315FC)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_feedback$${QT_LIBINFIX}.dll qmldir
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/gallery/gallery.pro b/plugins/declarative/gallery/gallery.pro
index 4e015fd988..159c44201b 100644
--- a/plugins/declarative/gallery/gallery.pro
+++ b/plugins/declarative/gallery/gallery.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 DEPENDPATH += .
 INCLUDEPATH += . \
     ../../../include \
@@ -5,7 +7,7 @@ INCLUDEPATH += . \
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(declarative_gallery)
+TARGET = $$mobilityPluginTarget(declarative_gallery)
 TARGETPATH = QtMobility/gallery
 
 PLUGIN_TYPE = declarative
@@ -46,7 +48,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x2002BFCC
+    TARGET.UID3 = $$mobilityUID(0x2002BFCC)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_gallery$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/location/location.pro b/plugins/declarative/location/location.pro
index 6378258926..445200b4a3 100644
--- a/plugins/declarative/location/location.pro
+++ b/plugins/declarative/location/location.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += qt plugin mobility
-TARGET  = $$qtLibraryTarget(declarative_location)
+TARGET  = $$mobilityPluginTarget(declarative_location)
 MOBILITY += location
 PLUGIN_TYPE = declarative
 QT += declarative network
@@ -104,7 +106,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20033007
+    TARGET.UID3 = $$mobilityUID(0x20033007)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_location$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/location/qdeclarativegeomapgroupobject.cpp b/plugins/declarative/location/qdeclarativegeomapgroupobject.cpp
index 29651d74ec..04a0266e30 100644
--- a/plugins/declarative/location/qdeclarativegeomapgroupobject.cpp
+++ b/plugins/declarative/location/qdeclarativegeomapgroupobject.cpp
@@ -65,7 +65,8 @@ QTM_BEGIN_NAMESPACE
 */
 
 QDeclarativeGeoMapGroupObject::QDeclarativeGeoMapGroupObject(QDeclarativeItem *parent)
-    : QDeclarativeGeoMapObject(parent)
+    : QDeclarativeGeoMapObject(parent),
+      visible_(true)
 {
     group_ = new QGeoMapGroupObject();
     setMapObject(group_);
@@ -243,6 +244,25 @@ void QDeclarativeGeoMapGroupObject::moveEvent(QDeclarativeGeoMapMouseEvent *even
     group is visible.
 */
 
+void QDeclarativeGeoMapGroupObject::setVisible(bool visible)
+{
+    if (visible_ == visible)
+        return;
+
+    visible_ = visible;
+
+    for (int i = 0; i < objects_.size(); ++i) {
+        objects_[i]->setVisible(visible_);
+    }
+
+    emit visibleChanged(visible_);
+}
+
+bool QDeclarativeGeoMapGroupObject::isVisible() const
+{
+    return visible_;
+}
+
 #include "moc_qdeclarativegeomapgroupobject_p.cpp"
 
 QTM_END_NAMESPACE
diff --git a/plugins/declarative/location/qdeclarativegeomapgroupobject_p.h b/plugins/declarative/location/qdeclarativegeomapgroupobject_p.h
index 97398f1abf..a824d97fca 100644
--- a/plugins/declarative/location/qdeclarativegeomapgroupobject_p.h
+++ b/plugins/declarative/location/qdeclarativegeomapgroupobject_p.h
@@ -57,6 +57,7 @@ class QDeclarativeGeoMapGroupObject : public QDeclarativeGeoMapObject
     Q_OBJECT
 
     Q_PROPERTY(QDeclarativeListProperty<QDeclarativeGeoMapObject> objects READ objects)
+    Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged)
 
 public:
     QDeclarativeGeoMapGroupObject(QDeclarativeItem *parent = 0);
@@ -75,6 +76,12 @@ public:
     virtual void exitEvent();
     virtual void moveEvent(QDeclarativeGeoMapMouseEvent *event);
 
+    void setVisible(bool visible);
+    bool isVisible() const;
+
+Q_SIGNALS:
+    void visibleChanged(bool visible);
+
 private:
     static void child_append(QDeclarativeListProperty<QDeclarativeGeoMapObject> *prop, QDeclarativeGeoMapObject *mapObject);
     static int child_count(QDeclarativeListProperty<QDeclarativeGeoMapObject> *prop);
@@ -83,6 +90,7 @@ private:
 
     QGeoMapGroupObject* group_;
     QList<QDeclarativeGeoMapObject*> objects_;
+    bool visible_;
 };
 
 QTM_END_NAMESPACE
diff --git a/plugins/declarative/location/qdeclarativegraphicsgeomap.cpp b/plugins/declarative/location/qdeclarativegraphicsgeomap.cpp
index 5f9a03baec..1e815d3ab1 100644
--- a/plugins/declarative/location/qdeclarativegraphicsgeomap.cpp
+++ b/plugins/declarative/location/qdeclarativegraphicsgeomap.cpp
@@ -46,6 +46,7 @@
 #include "qdeclarativegeoserviceprovider_p.h"
 #include "qdeclarativelandmark_p.h"
 #include "qdeclarativegeomapgroupobject_p.h"
+#include "qlocationnetworkaccessmanagerfactory.h"
 
 #include <qgeoserviceprovider.h>
 #include <qgeomappingmanager.h>
@@ -56,6 +57,7 @@
 #include <QDeclarativeContext>
 #include <QtDeclarative/qdeclarativeinfo.h>
 #include <QModelIndex>
+#include <QDeclarativeEngine>
 
 #include <QDebug>
 
@@ -274,6 +276,11 @@ void QDeclarativeGraphicsGeoMap::setPlugin(QDeclarativeGeoServiceProvider *plugi
         return;
     }
 
+    // Share declarative factory with location plugins
+    QLocationNetworkAccessManagerFactory *namf =
+        QLocationNetworkAccessManagerFactory::instance();
+    namf->setDeclarativeFactory(qmlEngine(this)->networkAccessManagerFactory());
+
     mappingManager_ = serviceProvider_->mappingManager();
     if (!mappingManager_ || serviceProvider_->error() != QGeoServiceProvider::NoError) {
         qWarning() << serviceProvider_->errorString();
diff --git a/plugins/declarative/messaging/messaging.pro b/plugins/declarative/messaging/messaging.pro
index 5cc7c96dbc..faac908357 100644
--- a/plugins/declarative/messaging/messaging.pro
+++ b/plugins/declarative/messaging/messaging.pro
@@ -1,9 +1,11 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/messaging
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_messaging)
+TARGET  = $$mobilityPluginTarget(declarative_messaging)
 TARGETPATH = QtMobility/messaging
 PLUGIN_TYPE = declarative
 
@@ -41,7 +43,7 @@ simulator|contains(qmf_enabled, yes) {
             CONFIG += link_pkgconfig
             PKGCONFIG += qmfclient
         } else {
-            LIBS += -L$$(QMF_LIBDIR) -l$$qtLibraryTarget(qmfclient)
+            LIBS += -L$$(QMF_LIBDIR) -l$$mobilityPluginTarget(qmfclient)
         }
     }
 }
@@ -52,7 +54,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20031601
+    TARGET.UID3 = $$mobilityUID(0x20031601)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_messaging$${QT_LIBINFIX}.dll qmldir
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/multimedia/multimedia.pro b/plugins/declarative/multimedia/multimedia.pro
index a5213d5d8a..2777560467 100644
--- a/plugins/declarative/multimedia/multimedia.pro
+++ b/plugins/declarative/multimedia/multimedia.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/multimedia \
                ../../../src/multimedia/effects \
                ../../../src/multimedia/video
@@ -5,7 +7,7 @@ INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_multimedia)
+TARGET  = $$mobilityPluginTarget(declarative_multimedia)
 TARGETPATH = QtMultimediaKit
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -41,7 +43,7 @@ INSTALLS += qmldir
 symbian {
     # In Symbian, a library should enjoy _largest_ possible capability set.
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x20021313
+    TARGET.UID3 = $$mobilityUID(0x20021313)
     TARGET.EPOCALLOWDLLDATA=1
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_multimedia$${QT_LIBINFIX}.dll qmldir 
diff --git a/plugins/declarative/organizer/organizer.pro b/plugins/declarative/organizer/organizer.pro
index 34aa3f0ffd..f1742ce6c8 100644
--- a/plugins/declarative/organizer/organizer.pro
+++ b/plugins/declarative/organizer/organizer.pro
@@ -1,3 +1,5 @@
+include(../../../features/utils.pri)
+
 DEPENDPATH += .
 INCLUDEPATH += . \
     ../../../include \
@@ -11,7 +13,7 @@ INCLUDEPATH += . \
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(declarative_organizer)
+TARGET = $$mobilityPluginTarget(declarative_organizer)
 TARGETPATH = QtMobility/organizer
 DEFINES += QT_MAKEDLL
 PLUGIN_TYPE = declarative
@@ -67,7 +69,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20021326
+    TARGET.UID3 = $$mobilityUID(0x20021326)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_organizer$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/publishsubscribe/publishsubscribe.pro b/plugins/declarative/publishsubscribe/publishsubscribe.pro
index 37224dbb8f..63a8d88d6e 100644
--- a/plugins/declarative/publishsubscribe/publishsubscribe.pro
+++ b/plugins/declarative/publishsubscribe/publishsubscribe.pro
@@ -1,10 +1,12 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/publishsubscribe
 DEPENDPATH += ../../../src/publishsubscribe
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_publishsubscribe)
+TARGET  = $$mobilityPluginTarget(declarative_publishsubscribe)
 TARGETPATH = QtMobility/publishsubscribe
 PLUGIN_TYPE = declarative
 DEFINES += QT_MAKEDLL
@@ -41,7 +43,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20021322
+    TARGET.UID3 = $$mobilityUID(0x20021322)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_publishsubscribe$${QT_LIBINFIX}.dll qmldir
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/sensors/sensors.pro b/plugins/declarative/sensors/sensors.pro
index 996b90c846..6503b53619 100644
--- a/plugins/declarative/sensors/sensors.pro
+++ b/plugins/declarative/sensors/sensors.pro
@@ -1,9 +1,11 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/sensors
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_sensors)
+TARGET  = $$mobilityPluginTarget(declarative_sensors)
 TARGETPATH = QtMobility/sensors
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -28,7 +30,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x20021324
+    TARGET.UID3 = $$mobilityUID(0x20021324)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_sensors$${QT_LIBINFIX}.dll qmldir 
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/declarative/serviceframework/serviceframework.pro b/plugins/declarative/serviceframework/serviceframework.pro
index da048d3e52..6bb4d75788 100644
--- a/plugins/declarative/serviceframework/serviceframework.pro
+++ b/plugins/declarative/serviceframework/serviceframework.pro
@@ -1,10 +1,12 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/serviceframework
 INCLUDEPATH += ../../../src/global
 INCLUDEPATH += .
 
 TEMPLATE = lib
 CONFIG += qt plugin
-TARGET  = $$qtLibraryTarget(declarative_serviceframework)
+TARGET  = $$mobilityPluginTarget(declarative_serviceframework)
 TARGETPATH = QtMobility/serviceframework
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -29,7 +31,7 @@ INSTALLS += qmldir
 symbian {
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
-    TARGET.UID3 = 0x20021323
+    TARGET.UID3 = $$mobilityUID(0x20021323)
     load(armcc_warnings)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_serviceframework$${QT_LIBINFIX}.dll qmldir 
diff --git a/plugins/declarative/systeminfo/qdeclarativegeneralinfo.cpp b/plugins/declarative/systeminfo/qdeclarativegeneralinfo.cpp
index 7ef83661dc..be5469daec 100644
--- a/plugins/declarative/systeminfo/qdeclarativegeneralinfo.cpp
+++ b/plugins/declarative/systeminfo/qdeclarativegeneralinfo.cpp
@@ -78,7 +78,7 @@ Q_GLOBAL_STATIC(QSystemInfo, generalInfo)
 
 
 /*!
-    \qmlsignal SystemInfo::startCurrentLanguageChanged()
+    \qmlsignal GeneralInfo::currentLanguageChanged(string language)
     \since Mobility 1.1
 
     This handler is called when current system language has changed.
@@ -89,6 +89,12 @@ QDeclarativeGeneralInfo::QDeclarativeGeneralInfo(QObject *parent) :
 {
 }
 
+/*!
+    \qmlmethod void GeneralInfo::startCurrentLanguageChanged()
+    \since Mobility 1.1
+
+    Start the connection for the currentLanguageChanged signal.
+*/
 void QDeclarativeGeneralInfo::startCurrentLanguageChanged()
 {
     connect(generalInfo(),SIGNAL(currentLanguageChanged(QString)),
@@ -102,7 +108,7 @@ void QDeclarativeGeneralInfo::declarativeCurrentLanguageChanged(const QString &l
 }
 
 /*!
-  \qmlproperty string QDeclarativeGeneralInfo::osVersion
+  \qmlproperty string GeneralInfo::osVersion
   \since Mobility 1.1
 
    Returns the version of the Operating System.
@@ -113,7 +119,7 @@ QString QDeclarativeGeneralInfo::osVersion()
 }
 
 /*!
-  \qmlproperty string QDeclarativeGeneralInfo::qtCoreVersion
+  \qmlproperty string GeneralInfo::qtCoreVersion
   \since Mobility 1.1
 
    Returns the version of the installed Qt Core library.
@@ -124,7 +130,7 @@ QString QDeclarativeGeneralInfo::qtCoreVersion()
 }
 
 /*!
-  \qmlproperty string QDeclarativeGeneralInfo::firmwareVersion
+  \qmlproperty string GeneralInfo::firmwareVersion
   \since Mobility 1.1
 
    Returns the version of the firmware as a whole.
@@ -135,7 +141,7 @@ QString QDeclarativeGeneralInfo::firmwareVersion()
 }
 
 /*!
-  \qmlproperty string QDeclarativeGeneralInfo::qtMobilityVersion
+  \qmlproperty string GeneralInfo::qtMobilityVersion
   \since Mobility 1.1
 
    Returns the version of the installed Qt Mobility library.
@@ -145,3 +151,22 @@ QString QDeclarativeGeneralInfo::qtMobilityVersion()
     return generalInfo()->version(QSystemInfo::QtMobility);
 }
 
+/*!
+    \qmlproperty string GeneralInfo::currentLanguage
+    \since Mobility 1.1
+    Returns the current language in two letter ISO 639-1 format.
+ */
+
+/*!
+    \qmlproperty list GeneralInfo::availableLanguages
+    \since Mobility 1.1
+    Returns a QStringList of available Qt language translations in two letter ISO 639-1 format.
+    If the Qt translations cannot be found, returns the current system language.
+*/
+
+/*!
+    \qmlproperty string GeneralInfo::currentCountryCode
+    \since Mobility 1.1
+    Returns the two letter ISO 3166-1 for the current country code.
+*/
+
diff --git a/plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp b/plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp
index 3f1c034d43..0a65c68a04 100644
--- a/plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp
+++ b/plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp
@@ -150,21 +150,21 @@ QtMobility 1.2:
 \sa QSystemNetworkInfo
 */
 /*!
-    \qmlsignal NetworkInfo::statusChanged()
+    \qmlsignal NetworkInfo::statusChanged(string networkStatus)
     \since Mobility 1.1
 
     This handler is called when network status has changed.
     Note: To receive this notification, you must first call \a startStatusChanged.
 */
 /*!
-    \qmlsignal NetworkInfo::signalStrengthChanged()
+    \qmlsignal NetworkInfo::signalStrengthChanged(int signalStrength)
     \since Mobility 1.1
 
     This handler is called when network signal strength has changed.
     Note: To receive this notification, you must first call \a startSignalStrengthChanged.
 */
 /*!
-    \qmlsignal NetworkInfo::nameChanged()
+    \qmlsignal NetworkInfo::nameChanged(string networkName)
     \since Mobility 1.1
 
     This handler is called when network name has changed.
@@ -178,19 +178,33 @@ QtMobility 1.2:
     Note: To receive this notification, you must first call \a startModeChanged.
 */
 /*!
-    \qmlsignal NetworkInfo::currentMobileCountryCodeChanged()
+    \qmlsignal NetworkInfo::currentMobileCountryCodeChanged(string mcc)
     \since Mobility 1.1
 
     This handler is called when network MCC has changed.
     Note: To receive this notification, you must first call \a startCurrentMobileCountryCodeChanged.
 */
 /*!
-    \qmlsignal NetworkInfo::currentMobileNetworkCodeChanged()
+    \qmlsignal NetworkInfo::currentMobileNetworkCodeChanged(string mnc)
     \since Mobility 1.1
 
     This handler is called when network MNC has changed.
     Note: To receive this notification, you must first call \a startCurrentMobileNetworkCodeChanged.
 */
+/*!
+    \qmlsignal NetworkInfo::cellIdChanges(int cellId)
+    \since Mobility 1.1
+
+    This handler is called when cell id has changed.
+    Note: To receive this notification, you must first call \a startCellIdChanged.
+*/
+/*!
+    \qmlsignal NetworkInfo::cellDataTechnologyChanges(QSystemNetworkInfo::CellDataTechnology cellTech)
+    \since Mobility 1.1
+
+    This handler is called when cell data technology has changed.
+    Note: To receive this notification, you must first call \a startCellDataChanged.
+*/
 
 QDeclarativeNetworkInfo::QDeclarativeNetworkInfo(QObject *parent) :
     QSystemNetworkInfo(parent)
@@ -324,7 +338,7 @@ void QDeclarativeNetworkInfo::startStatusChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorStatusChanges
-    \brief Use the statusChanged signal.
+    Use the statusChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorStatusChanges()
@@ -352,7 +366,7 @@ void QDeclarativeNetworkInfo::startSignalStrengthChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorSignalStrengthChanges
-    \brief Use the signalStrengthChanged signal.
+    Use the signalStrengthChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorSignalStrengthChanges()
@@ -380,7 +394,7 @@ void QDeclarativeNetworkInfo::startNameChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorNameChanges
-    \brief Use the nameChanged signal.
+    Use the nameChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorNameChanges()
@@ -408,6 +422,7 @@ void QDeclarativeNetworkInfo::startModeChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorModeChanges
+    Use the modeChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorModeChanges()
@@ -436,7 +451,7 @@ void QDeclarativeNetworkInfo::startCurrentMobileCountryCodeChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorCurrentMobileCountryCodeChanges
-    \brief Use the monitoringCurrentMobileCountryCodeChanged signal.
+    Use the currentMobileCountryCodeChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorCurrentMobileCountryCodeChanges()
@@ -464,7 +479,7 @@ void QDeclarativeNetworkInfo::startCurrentMobileNetworkCodeChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorCurrentMobileNetworkCodeChanges
-    \brief Use the monitorCurrentMobileNetworkCodeChanged signal.
+    Use the currentMobileNetworkCodeChanged signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorCurrentMobileNetworkCodeChanges()
@@ -616,8 +631,8 @@ QSystemNetworkInfo::NetworkMode QDeclarativeNetworkInfo::mode()
 
 
 /*!
-    \qmlproperty bool NetworkInfo::monitorCellDataTechnologyChanges
-    \brief Use the cellDataTechnologyChanges signal.
+    \qmlproperty bool NetworkInfo::monitorCellDataChanges
+    Use the cellDataTechnologyChanges signal.
     \since Mobility 1.2
 
    \sa QSystemNetworkInfo::cellDataTechnologyChanged
@@ -646,7 +661,7 @@ void QDeclarativeNetworkInfo::startCellDataChanged(bool on)
 
 /*!
     \qmlproperty bool NetworkInfo::monitorCellIdChanges
-    \brief Use the cellIdChanges signal.
+    Use the cellIdChanges signal.
     \since Mobility 1.2
     */
 bool QDeclarativeNetworkInfo::monitorCellIdChanges()
diff --git a/plugins/declarative/systeminfo/systeminfo.pro b/plugins/declarative/systeminfo/systeminfo.pro
index a567acad01..4d98fdfc7e 100644
--- a/plugins/declarative/systeminfo/systeminfo.pro
+++ b/plugins/declarative/systeminfo/systeminfo.pro
@@ -1,10 +1,12 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH += ../../../src/systeminfo
 DEPENDPATH += ../../../src/systeminfo
 INCLUDEPATH += ../../../src/global
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET  = $$qtLibraryTarget(declarative_systeminfo)
+TARGET  = $$mobilityPluginTarget(declarative_systeminfo)
 TARGETPATH = QtMobility/systeminfo
 PLUGIN_TYPE = declarative
 include(../../../common.pri)
@@ -45,7 +47,7 @@ symbian {
     # Allow writable DLL data
     TARGET.EPOCALLOWDLLDATA = 1
     # Target UID, makes every Symbian app unique
-    TARGET.UID3 = 0x200315F9
+    TARGET.UID3 = $$mobilityUID(0x200315F9)
     # Specifies what files shall be deployed: the plugin itself and the qmldir file.
     importFiles.sources = $$DESTDIR/declarative_systeminfo$${QT_LIBINFIX}.dll qmldir
     importFiles.path = $$QT_IMPORTS_BASE_DIR/$$TARGETPATH
diff --git a/plugins/feedback/immersion/immersion.pro b/plugins/feedback/immersion/immersion.pro
index f16e78245d..c1adb1c075 100644
--- a/plugins/feedback/immersion/immersion.pro
+++ b/plugins/feedback/immersion/immersion.pro
@@ -1,7 +1,9 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
 QT = core
-TARGET = $$qtLibraryTarget(qtfeedback_immersion)
+TARGET = $$mobilityPluginTarget(qtfeedback_immersion)
 PLUGIN_TYPE=feedback
 
 include(../../../common.pri)
@@ -18,7 +20,6 @@ MOBILITY = feedback
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
-    TARGET = $${TARGET}$${QT_LIBINFIX}
     load(armcc_warnings)
 
     target.path = /sys/bin
diff --git a/plugins/feedback/mmk/mmk.pro b/plugins/feedback/mmk/mmk.pro
index 56d68c68f8..7eb7cb3037 100644
--- a/plugins/feedback/mmk/mmk.pro
+++ b/plugins/feedback/mmk/mmk.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtfeedback_mmk)
+TARGET = $$mobilityPluginTarget(qtfeedback_mmk)
 PLUGIN_TYPE=feedback
 
 include(../../../common.pri)
@@ -16,8 +18,7 @@ MOBILITY = feedback multimedia
 symbian: {
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
-    TARGET.UID3 = 0x200315FF
-    TARGET = $${TARGET}$${QT_LIBINFIX}
+    TARGET.UID3 = $$mobilityUID(0x200315FF)
     load(armcc_warnings)
 
     target.path = /sys/bin
diff --git a/plugins/feedback/symbian/qfeedback_symbian.cpp b/plugins/feedback/symbian/qfeedback_symbian.cpp
index 11573de03c..c10f96bd36 100644
--- a/plugins/feedback/symbian/qfeedback_symbian.cpp
+++ b/plugins/feedback/symbian/qfeedback_symbian.cpp
@@ -78,12 +78,19 @@ QFeedbackSymbian::QFeedbackSymbian()
 #endif
 
     initActuators();
+    connect(qApp, SIGNAL(aboutToQuit()), this, SLOT(freeResources()));
 }
 
 QFeedbackSymbian::~QFeedbackSymbian()
 {
+    freeResources();
+}
+
+void QFeedbackSymbian::freeResources()
+{
 #ifdef USE_CHWRMHAPTICS_PLZ
     qDeleteAll(m_haptics);
+    m_haptics.clear();
 #endif
 }
 
diff --git a/plugins/feedback/symbian/qfeedback_symbian.h b/plugins/feedback/symbian/qfeedback_symbian.h
index 337f2e8246..cdb320cb69 100644
--- a/plugins/feedback/symbian/qfeedback_symbian.h
+++ b/plugins/feedback/symbian/qfeedback_symbian.h
@@ -238,6 +238,9 @@ private:
     void initActuators();
     QList<QFeedbackActuator*> m_actuators;
     CCoeControl *defaultWidget();
+
+private slots:
+    void freeResources();
 };
 #endif //HAS_CUSTOM_EFFECTS
 
diff --git a/plugins/feedback/symbian/symbian.pro b/plugins/feedback/symbian/symbian.pro
index 1cd2c5c612..0de6bc5eda 100644
--- a/plugins/feedback/symbian/symbian.pro
+++ b/plugins/feedback/symbian/symbian.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtfeedback_symbian)
+TARGET = $$mobilityPluginTarget(qtfeedback_symbian)
 PLUGIN_TYPE=feedback
 
 include(../../../common.pri)
@@ -48,8 +50,7 @@ symbian {
 
     TARGET.EPOCALLOWDLLDATA=1
     TARGET.CAPABILITY = All -Tcb
-    TARGET.UID3=0x200315FE
-    TARGET = $${TARGET}$${QT_LIBINFIX}
+    TARGET.UID3 = $$mobilityUID(0x200315FE)
 
     load(armcc_warnings)
 
diff --git a/plugins/geoservices/nokia/nokia.pro b/plugins/geoservices/nokia/nokia.pro
index 1b2e050e0b..997a5ab7f2 100644
--- a/plugins/geoservices/nokia/nokia.pro
+++ b/plugins/geoservices/nokia/nokia.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtgeoservices_nokia)
+TARGET = $$mobilityPluginTarget(qtgeoservices_nokia)
 PLUGIN_TYPE=geoservices
 
 include(../../../common.pri)
@@ -45,7 +47,7 @@ INCLUDEPATH += $$SOURCE_DIR/src/location \
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x2002BFCA
+    TARGET.UID3 = $$mobilityUID(0x2002BFCA)
     pluginDep.sources = $${TARGET}.dll
     pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
     DEPLOYMENT += pluginDep      
diff --git a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
index 2b2842d550..3a0539bf6e 100755
--- a/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeomappingmanagerengine_nokia.cpp
@@ -50,6 +50,7 @@
 #include "qgeomapreply_nokia.h"
 #include "qgeotiledmapdata_nokia.h"
 #include "marclanguagecodes.h"
+#include "qlocationnetworkaccessmanagerfactory.h"
 
 #include <qgeotiledmaprequest.h>
 
@@ -212,7 +213,8 @@ QGeoMappingManagerEngineNokia::QGeoMappingManagerEngineNokia(const QMap<QString,
     modes << QGraphicsGeoMap::OnlineMode;
     setSupportedConnectivityModes(modes);
 
-    m_networkManager = new QNetworkAccessManager(this);
+    // Get manager from declarative factory or create a new one
+    m_networkManager = QLocationNetworkAccessManagerFactory::instance()->create(this);
 
     if (parameters.contains("mapping.proxy")) {
         QString proxy = parameters.value("mapping.proxy").toString();
diff --git a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
index cf448ef202..89d38e9f5d 100644
--- a/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp
@@ -48,6 +48,7 @@
 
 #include "qgeoroutingmanagerengine_nokia.h"
 #include "qgeoroutereply_nokia.h"
+#include "qlocationnetworkaccessmanagerfactory.h"
 
 #include <QStringList>
 #include <QNetworkProxy>
@@ -61,7 +62,8 @@ QGeoRoutingManagerEngineNokia::QGeoRoutingManagerEngineNokia(const QMap<QString,
         m_referer(QGeoServiceProviderFactoryNokia::defaultReferer),
         m_serviceDisabled(false)
 {
-    m_networkManager = new QNetworkAccessManager(this);
+    // Get manager from declarative factory or create a new one
+    m_networkManager = QLocationNetworkAccessManagerFactory::instance()->create(this);
 
     if (parameters.contains("routing.proxy")) {
         QString proxy = parameters.value("routing.proxy").toString();
diff --git a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
index 13d7276782..c5b703aa41 100644
--- a/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeosearchmanagerengine_nokia.cpp
@@ -49,6 +49,7 @@
 #include "qgeosearchmanagerengine_nokia.h"
 #include "qgeosearchreply_nokia.h"
 #include "marclanguagecodes.h"
+#include "qlocationnetworkaccessmanagerfactory.h"
 
 #include <qgeoaddress.h>
 #include <qgeocoordinate.h>
@@ -62,7 +63,8 @@ QGeoSearchManagerEngineNokia::QGeoSearchManagerEngineNokia(const QMap<QString, Q
         m_token(QGeoServiceProviderFactoryNokia::defaultToken),
         m_referer(QGeoServiceProviderFactoryNokia::defaultReferer)
 {
-    m_networkManager = new QNetworkAccessManager(this);
+    // Get manager from declarative factory or create a new one
+    m_networkManager = QLocationNetworkAccessManagerFactory::instance()->create(this);
 
     if (parameters.contains("places.proxy")) {
         QString proxy = parameters.value("places.proxy").toString();
diff --git a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
index d072a91d0a..d842b814bb 100644
--- a/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
+++ b/plugins/geoservices/nokia/qgeotiledmapdata_nokia.cpp
@@ -51,6 +51,7 @@
 #include "qgeomappingmanagerengine_nokia.h"
 #include "qgeoboundingbox.h"
 #include "qgeocoordinate.h"
+#include "qlocationnetworkaccessmanagerfactory.h"
 
 #include <QNetworkAccessManager>
 #include <QNetworkProxy>
@@ -83,7 +84,8 @@ QGeoTiledMapDataNokia::QGeoTiledMapDataNokia(QGeoMappingManagerEngineNokia *engi
     watermark(":/images/watermark.png"),
     m_logoPosition(engine->logoPosition())
 {
-    m_networkManager = new QNetworkAccessManager(this);
+    // Get manager from declarative factory or create a new one
+    m_networkManager = QLocationNetworkAccessManagerFactory::instance()->create(this);
     connect(m_networkManager, SIGNAL(finished(QNetworkReply*)), SLOT(copyrightReplyFinished(QNetworkReply*)));
 
     QString copyrightUrl = "http://";
diff --git a/plugins/landmarks/symbian_landmarks/symbian_landmarks.pro b/plugins/landmarks/symbian_landmarks/symbian_landmarks.pro
index 8fe9284a11..2bb9b1c94b 100644
--- a/plugins/landmarks/symbian_landmarks/symbian_landmarks.pro
+++ b/plugins/landmarks/symbian_landmarks/symbian_landmarks.pro
@@ -39,15 +39,17 @@
 #
 ##########################################################################
 
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
 QT += core
-TARGET = $$qtLibraryTarget(qtlandmarks_symbian)
+TARGET = $$mobilityPluginTarget(qtlandmarks_symbian)
 PLUGIN_TYPE=landmarks
 CONFIG += mobility
 MOBILITY = location
-
 include(../../../common.pri)
+
 include(symbian_landmarks_defines.pri)
 
 symbian {
@@ -56,7 +58,7 @@ symbian {
         INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
         TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x20031E8F
+    TARGET.UID3 = $$mobilityUID(0x20031E8F)
 
     LIBS += \
         -lflogger \
diff --git a/plugins/multimedia/m3u/m3u.pro b/plugins/multimedia/m3u/m3u.pro
index e6e64b875c..227e34919a 100644
--- a/plugins/multimedia/m3u/m3u.pro
+++ b/plugins/multimedia/m3u/m3u.pro
@@ -1,6 +1,8 @@
+include (../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmultimediakit_m3u)
+TARGET = $$mobilityPluginTarget(qtmultimediakit_m3u)
 
 PLUGIN_TYPE=playlistformats
 
@@ -17,7 +19,7 @@ HEADERS += qm3uhandler.h
 SOURCES += main.cpp \
            qm3uhandler.cpp
 symbian {
-    TARGET.UID3 = 0x2002BFC7
+    TARGET.UID3 = $$mobilityUID(0x2002BFC7)
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
     
diff --git a/plugins/multimedia/symbian/ecam/camera_s60.pri b/plugins/multimedia/symbian/ecam/camera_s60.pri
index 6f7d023376..070685b9d9 100644
--- a/plugins/multimedia/symbian/ecam/camera_s60.pri
+++ b/plugins/multimedia/symbian/ecam/camera_s60.pri
@@ -131,7 +131,7 @@ HEADERS += \
     $$PWD/s60cameraengine.h \
     $$PWD/s60cameraviewfinderengine.h \
     $$PWD/s60cameraengineobserver.h \
-    $$PWD/s60videorenderercontrol.h \
+    $$PWD/s60bitmapviewfinderrenderercontrol.h \
     $$PWD/s60cameracapturedestinationcontrol.h \
     $$PWD/s60cameracapturebufferformatcontrol.h \
     $$PWD/s60filenamegenerator.h
@@ -158,7 +158,7 @@ SOURCES += \
     $$PWD/s60cameraadvsettings.cpp \
     $$PWD/s60cameraengine.cpp \
     $$PWD/s60cameraviewfinderengine.cpp \
-    $$PWD/s60videorenderercontrol.cpp \
+    $$PWD/s60bitmapviewfinderrenderercontrol.cpp \
     $$PWD/s60cameracapturedestinationcontrol.cpp \
     $$PWD/s60cameracapturebufferformatcontrol.cpp \
     $$PWD/s60filenamegenerator.cpp
diff --git a/plugins/multimedia/symbian/ecam/ecam.pro b/plugins/multimedia/symbian/ecam/ecam.pro
index 31f30b61cd..2706b86ed9 100644
--- a/plugins/multimedia/symbian/ecam/ecam.pro
+++ b/plugins/multimedia/symbian/ecam/ecam.pro
@@ -4,10 +4,12 @@
 #
 ######################################################################
 
+include (../../../../features/utils.pri)
+
 TEMPLATE =      lib
 CONFIG +=       plugin
 
-TARGET =        $$qtLibraryTarget(qtmultimediakit_ecamengine)
+TARGET =        $$mobilityPluginTarget(qtmultimediakit_ecamengine)
 PLUGIN_TYPE =   mediaservice
 include (../../../../common.pri)
 
@@ -31,7 +33,7 @@ SOURCES += s60cameraserviceplugin.cpp
 
 load(data_caging_paths)
 TARGET.EPOCALLOWDLLDATA =   1
-TARGET.UID3 =               0x2002BFC2
+TARGET.UID3 =               $$mobilityUID(0x2002BFC2)
 TARGET.CAPABILITY =         ALL -TCB
 
 # Make a sis package from plugin + api + stub (plugin)
diff --git a/plugins/multimedia/symbian/ecam/s60videorenderercontrol.cpp b/plugins/multimedia/symbian/ecam/s60bitmapviewfinderrenderercontrol.cpp
index 3e488fe5d4..647158e199 100644
--- a/plugins/multimedia/symbian/ecam/s60videorenderercontrol.cpp
+++ b/plugins/multimedia/symbian/ecam/s60bitmapviewfinderrenderercontrol.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -41,36 +41,37 @@
 
 #include <qabstractvideosurface.h>
 
-#include "s60videorenderercontrol.h"
+#include "s60bitmapviewfinderrenderercontrol.h"
 
-S60VideoRendererControl::S60VideoRendererControl(QObject *parent) :
+S60BitmapViewFinderRendererControl::S60BitmapViewFinderRendererControl(QObject *parent) :
     QVideoRendererControl(parent),
     m_surface(0)
 {
 }
 
-S60VideoRendererControl::~S60VideoRendererControl()
+S60BitmapViewFinderRendererControl::~S60BitmapViewFinderRendererControl()
 {
     // Stop surface if still active
     if (m_surface && m_surface->isActive())
         m_surface->stop();
 }
 
-QAbstractVideoSurface *S60VideoRendererControl::surface() const
+QAbstractVideoSurface *S60BitmapViewFinderRendererControl::surface() const
 {
     return m_surface;
 }
 
-void S60VideoRendererControl::setSurface(QAbstractVideoSurface *surface)
+void S60BitmapViewFinderRendererControl::setSurface(QAbstractVideoSurface *surface)
 {
-    if (surface == 0) {
-        // Stop current surface if needed
-        if (m_surface && m_surface->isActive())
-            m_surface->stop();
+    if (m_surface != surface) {
+        if (surface == 0) {
+            // Stop current surface if needed
+            if (m_surface && m_surface->isActive())
+                m_surface->stop();
+        }
+        m_surface = surface;
+        emit surfaceChanged();
     }
-
-    m_surface = surface;
-    emit viewFinderSurfaceSet();
 }
 
 // End of file
diff --git a/plugins/multimedia/symbian/ecam/s60videorenderercontrol.h b/plugins/multimedia/symbian/ecam/s60bitmapviewfinderrenderercontrol.h
index 9ef3332697..8cdd34ffba 100644
--- a/plugins/multimedia/symbian/ecam/s60videorenderercontrol.h
+++ b/plugins/multimedia/symbian/ecam/s60bitmapviewfinderrenderercontrol.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -39,38 +39,32 @@
 **
 ****************************************************************************/
 
-#ifndef S60VIDEORENDERERCONTROL_H
-#define S60VIDEORENDERERCONTROL_H
+#ifndef S60BITMAPVIEWFINDERRENDERERCONTROL_H
+#define S60BITMAPVIEWFINDERRENDERERCONTROL_H
 
 #include <qvideorenderercontrol.h>
 
 /*
  * Control for QGraphicsVideoItem. Viewfinder frames are streamed to a surface
- * which is drawn to the display by the Qt Graphics Vide Framework.
+ * which is drawn to the display by the Qt Graphics View Framework.
  * VideoRendererControl uses only Bitmap Viewfinder.
  */
-class S60VideoRendererControl : public QVideoRendererControl
+class S60BitmapViewFinderRendererControl : public QVideoRendererControl
 {
     Q_OBJECT
+public:
+    S60BitmapViewFinderRendererControl(QObject *parent = 0);
+    virtual ~S60BitmapViewFinderRendererControl();
 
-public: // Constructor & Destructor
-
-    S60VideoRendererControl(QObject *parent = 0);
-    virtual ~S60VideoRendererControl();
-
-public: // S60VideoRendererControl
-
+    // S60VideoRendererControl
     QAbstractVideoSurface *surface() const;
     void setSurface(QAbstractVideoSurface *surface);
 
-signals: // Internal Signals
-
-    void viewFinderSurfaceSet();
-
-private: // Data
+signals:
+    void surfaceChanged();
 
+private:
     QAbstractVideoSurface   *m_surface;
-
 };
 
-#endif // S60VIDEORENDERERCONTROL_H
+#endif // S60VIEWFINDERRENDERERCONTROL_H
diff --git a/plugins/multimedia/symbian/ecam/s60cameraservice.cpp b/plugins/multimedia/symbian/ecam/s60cameraservice.cpp
index 48d977aefe..cc3c03e690 100644
--- a/plugins/multimedia/symbian/ecam/s60cameraservice.cpp
+++ b/plugins/multimedia/symbian/ecam/s60cameraservice.cpp
@@ -54,16 +54,20 @@
 #include "s60mediarecordercontrol.h"
 #include "s60videocapturesession.h"
 #include "s60imagecapturesession.h"
-#include "s60videowidgetcontrol.h"
 #include "s60mediacontainercontrol.h"
 #include "s60videoencodercontrol.h"
 #include "s60audioencodercontrol.h"
 #include "s60imageencodercontrol.h"
 #include "s60cameralockscontrol.h"
-#include "s60videorenderercontrol.h"
-#include "s60videowindowcontrol.h"
+#include "s60bitmapviewfinderrenderercontrol.h"
 #include "s60cameracapturedestinationcontrol.h"
 #include "s60cameracapturebufferformatcontrol.h"
+#include "s60videooutputfactory.h"
+#include "s60videowidgetcontrol.h"
+#include "s60videowindowcontrol.h"
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+#include "s60videoeglrenderercontrol.h"
+#endif
 
 #include "s60cameraviewfinderengine.h" // ViewfinderOutputType
 
@@ -87,13 +91,12 @@ S60CameraService::S60CameraService(QObject *parent) :
         m_mediaFormat = new S60MediaContainerControl(m_videosession, this);
         m_videoEncoder = new S60VideoEncoderControl(m_videosession, this);
         m_audioEncoder = new S60AudioEncoderControl(m_videosession, this);
-        m_viewFinderWidget = new S60VideoWidgetControl(this);
         m_imageEncoderControl = new S60ImageEncoderControl(m_imagesession, this);
         m_locksControl = new S60CameraLocksControl(this, m_imagesession, this);
-        m_rendererControl = new S60VideoRendererControl(this);
-        m_windowControl = new S60VideoWindowControl(this);
+        m_bitmapRendererControl = new S60BitmapViewFinderRendererControl(this);
         m_captureDestinationControl = new S60CameraCaptureDestinationControl(m_imagesession, this);
         m_bufferFormatControl = new S60CameraCaptureBufferFormatControl(m_imagesession, this);
+        m_videoOutputFactory = new S60VideoOutputFactory(this);
     }
 }
 
@@ -135,15 +138,6 @@ S60CameraService::~S60CameraService()
     if (m_control)
         delete m_control;
 
-    // Delete viewfinder controls after CameraControl to be sure that
-    // ViewFinder gets stopped before widget (and window) is destroyed
-    if (m_viewFinderWidget)
-        delete m_viewFinderWidget;
-    if (m_rendererControl)
-        delete m_rendererControl;
-    if (m_windowControl)
-        delete m_windowControl;
-
     // Delete sessions
     if (m_videosession)
         delete m_videosession;
@@ -174,36 +168,6 @@ QMediaControl *S60CameraService::requestControl(const char *name)
     if (qstrcmp(name, QCameraFlashControl_iid) == 0)
         return m_flashControl;
 
-    if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
-        if (m_viewFinderWidget) {
-            m_control->setVideoOutput(m_viewFinderWidget,
-                                      S60CameraViewfinderEngine::OutputTypeVideoWidget);
-            return m_viewFinderWidget;
-        } else {
-            return 0;
-        }
-    }
-
-    if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
-        if (m_rendererControl) {
-            m_control->setVideoOutput(m_rendererControl,
-                                      S60CameraViewfinderEngine::OutputTypeRenderer);
-            return m_rendererControl;
-        } else {
-            return 0;
-        }
-    }
-
-    if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
-        if (m_windowControl) {
-            m_control->setVideoOutput(m_windowControl,
-                                      S60CameraViewfinderEngine::OutputTypeVideoWindow);
-            return m_windowControl;
-        } else {
-            return 0;
-        }
-    }
-
     if (qstrcmp(name, QCameraFocusControl_iid) == 0)
         return m_focusControl;
 
@@ -228,23 +192,38 @@ QMediaControl *S60CameraService::requestControl(const char *name)
     if (qstrcmp(name, QCameraCaptureBufferFormatControl_iid) == 0)
         return m_bufferFormatControl;
 
-    return 0;
+    QMediaControl *videoOutputControl = m_videoOutputFactory->requestControl(name);
+    if (!videoOutputControl && qstrcmp(name, QVideoRendererControl_iid) == 0)
+        videoOutputControl = m_bitmapRendererControl;
+    if (qobject_cast<S60VideoWidgetControl *>(videoOutputControl))
+        m_control->setVideoOutput(videoOutputControl,
+                                  S60CameraViewfinderEngine::OutputTypeVideoWidget);
+    else if (qobject_cast<S60VideoWindowControl *>(videoOutputControl))
+        m_control->setVideoOutput(videoOutputControl,
+                                  S60CameraViewfinderEngine::OutputTypeVideoWindow);
+    else if (qobject_cast<S60BitmapViewFinderRendererControl *>(videoOutputControl)
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+             || qobject_cast<S60VideoEglRendererControl *>(videoOutputControl)
+#endif
+        )
+        m_control->setVideoOutput(videoOutputControl,
+                                  S60CameraViewfinderEngine::OutputTypeRenderer);
+    return videoOutputControl;
 }
 
 void S60CameraService::releaseControl(QMediaControl *control)
 {
-    if (control == 0)
-        return;
-
-    // Release viewfinder output
-    if (control == m_viewFinderWidget)
+    if (qobject_cast<S60VideoWidgetControl *>(control))
         m_control->releaseVideoOutput(S60CameraViewfinderEngine::OutputTypeVideoWidget);
-
-    if (control == m_rendererControl)
-        m_control->releaseVideoOutput(S60CameraViewfinderEngine::OutputTypeRenderer);
-
-    if (control == m_windowControl)
+    else if (qobject_cast<S60VideoWindowControl *>(control))
         m_control->releaseVideoOutput(S60CameraViewfinderEngine::OutputTypeVideoWindow);
+    else if (qobject_cast<S60BitmapViewFinderRendererControl *>(control)
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+             || qobject_cast<S60VideoEglRendererControl *>(control)
+#endif
+        )
+        m_control->releaseVideoOutput(S60CameraViewfinderEngine::OutputTypeRenderer);
+    m_videoOutputFactory->releaseControl(control);
 }
 
 int S60CameraService::deviceCount()
diff --git a/plugins/multimedia/symbian/ecam/s60cameraservice.h b/plugins/multimedia/symbian/ecam/s60cameraservice.h
index 9a4d9f7e1d..f275210e7c 100644
--- a/plugins/multimedia/symbian/ecam/s60cameraservice.h
+++ b/plugins/multimedia/symbian/ecam/s60cameraservice.h
@@ -60,13 +60,12 @@ QT_FORWARD_DECLARE_CLASS(S60CameraExposureControl)
 QT_FORWARD_DECLARE_CLASS(S60CameraFlashControl)
 QT_FORWARD_DECLARE_CLASS(S60CameraImageProcessingControl)
 QT_FORWARD_DECLARE_CLASS(S60CameraImageCaptureControl)
-QT_FORWARD_DECLARE_CLASS(S60VideoWidgetControl)
 QT_FORWARD_DECLARE_CLASS(S60ImageEncoderControl)
 QT_FORWARD_DECLARE_CLASS(S60CameraLocksControl)
-QT_FORWARD_DECLARE_CLASS(S60VideoRendererControl)
-QT_FORWARD_DECLARE_CLASS(S60VideoWindowControl)
+QT_FORWARD_DECLARE_CLASS(S60BitmapViewFinderRendererControl)
 QT_FORWARD_DECLARE_CLASS(S60CameraCaptureDestinationControl)
 QT_FORWARD_DECLARE_CLASS(S60CameraCaptureBufferFormatControl)
+QT_FORWARD_DECLARE_CLASS(S60VideoOutputFactory)
 
 class S60CameraService : public QMediaService
 {
@@ -90,26 +89,25 @@ public: // Static Device Info
 
 private: // Data
 
-    S60ImageCaptureSession          *m_imagesession;
-    S60VideoCaptureSession          *m_videosession;
-    S60MediaContainerControl        *m_mediaFormat;
-    S60VideoEncoderControl          *m_videoEncoder;
-    S60AudioEncoderControl          *m_audioEncoder;
-    S60CameraControl                *m_control;
-    S60VideoDeviceControl           *m_videoDeviceControl;
-    S60CameraFocusControl           *m_focusControl;
-    S60CameraExposureControl        *m_exposureControl;
-    S60CameraFlashControl           *m_flashControl;
-    S60CameraImageProcessingControl *m_imageProcessingControl;
-    S60CameraImageCaptureControl    *m_imageCaptureControl;
-    S60MediaRecorderControl         *m_media;
-    S60VideoWidgetControl           *m_viewFinderWidget;
-    S60ImageEncoderControl          *m_imageEncoderControl;
-    S60CameraLocksControl           *m_locksControl;
-    S60VideoRendererControl         *m_rendererControl;
-    S60VideoWindowControl           *m_windowControl;
-    S60CameraCaptureDestinationControl *m_captureDestinationControl;
+    S60ImageCaptureSession              *m_imagesession;
+    S60VideoCaptureSession              *m_videosession;
+    S60MediaContainerControl            *m_mediaFormat;
+    S60VideoEncoderControl              *m_videoEncoder;
+    S60AudioEncoderControl              *m_audioEncoder;
+    S60CameraControl                    *m_control;
+    S60VideoDeviceControl               *m_videoDeviceControl;
+    S60CameraFocusControl               *m_focusControl;
+    S60CameraExposureControl            *m_exposureControl;
+    S60CameraFlashControl               *m_flashControl;
+    S60CameraImageProcessingControl     *m_imageProcessingControl;
+    S60CameraImageCaptureControl        *m_imageCaptureControl;
+    S60MediaRecorderControl             *m_media;
+    S60ImageEncoderControl              *m_imageEncoderControl;
+    S60CameraLocksControl               *m_locksControl;
+    S60BitmapViewFinderRendererControl  *m_bitmapRendererControl;
+    S60CameraCaptureDestinationControl  *m_captureDestinationControl;
     S60CameraCaptureBufferFormatControl *m_bufferFormatControl;
+    S60VideoOutputFactory               *m_videoOutputFactory;
 };
 
 #endif // S60CAMERASERVICE_H
diff --git a/plugins/multimedia/symbian/ecam/s60cameraviewfinderengine.cpp b/plugins/multimedia/symbian/ecam/s60cameraviewfinderengine.cpp
index eedce8df88..b5b74edd7d 100644
--- a/plugins/multimedia/symbian/ecam/s60cameraviewfinderengine.cpp
+++ b/plugins/multimedia/symbian/ecam/s60cameraviewfinderengine.cpp
@@ -50,11 +50,17 @@
 #include "s60cameracontrol.h"
 #include "s60videowidgetcontrol.h"
 #include "s60videowidgetdisplay.h"
-#include "s60videorenderercontrol.h"
+#include "s60bitmapviewfinderrenderercontrol.h"
 #include "s60videowindowcontrol.h"
 #include "s60videowindowdisplay.h"
 #include "s60cameraconstants.h"
 
+#ifdef VIDEOOUTPUT_EGL_RENDERER
+#include <QTimer>
+#include "s60nativewindow.h"
+#include "s60videoeglrenderercontrol.h"
+#endif
+
 #include <coemain.h>    // CCoeEnv
 #include <coecntrl.h>   // CCoeControl
 #include <w32std.h>
@@ -87,7 +93,8 @@ S60CameraViewfinderEngine::S60CameraViewfinderEngine(S60CameraControl *control,
     m_viewfinderType(OutputTypeNotSet),
     m_viewfinderNativeType(EBitmapViewFinder), // Default type
     m_isViewFinderVisible(true),
-    m_vfErrorsSignalled(0)
+    m_vfErrorsSignalled(0),
+    m_dummyWindow(0)
 {
     m_cameraControl = control;
 
@@ -105,6 +112,14 @@ S60CameraViewfinderEngine::S60CameraViewfinderEngine(S60CameraControl *control,
     }
     // From now on it is safe to assume engine exists
 
+#ifdef VIDEOOUTPUT_EGL_RENDERER
+    // CCamera provides no API for starting the viewfinder (and therefore
+    // creating a viewfinder surface) without passing a native window
+    // handle.  We therefore create an invisible window, pass this to
+    // CCamera and then extract from it the background surface handle.
+	m_dummyWindow = new S60NativeWindow(this);
+#endif
+
     // Detect UI Rotations
     connect(QApplication::desktop(), SIGNAL(resized(int)), this, SLOT(handleDesktopResize(int)));
 }
@@ -216,14 +231,18 @@ void S60CameraViewfinderEngine::setVideoRendererControl(QObject *viewfinderOutpu
     if (m_viewfinderOutput)
         releaseControl(m_viewfinderType);
 
-    S60VideoRendererControl* viewFinderRenderControl =
-        qobject_cast<S60VideoRendererControl*>(viewfinderOutput);
+    QVideoRendererControl *rendererControl =
+        qobject_cast<QVideoRendererControl *>(viewfinderOutput);
 
-    if (viewFinderRenderControl) {
-        m_viewfinderNativeType = EBitmapViewFinder; // Always Bitmap
+    if (rendererControl) {
+        m_viewfinderNativeType = EBitmapViewFinder;
+#ifdef VIDEOOUTPUT_EGL_RENDERER
+        if (qobject_cast<S60VideoEglRendererControl *>(rendererControl))
+            m_viewfinderNativeType = EDirectScreenViewFinder;
+#endif
 
-        connect(viewFinderRenderControl, SIGNAL(viewFinderSurfaceSet()),
-            this, SLOT(rendererSurfaceSet()));
+        connect(rendererControl, SIGNAL(surfaceChanged()),
+                this, SLOT(rendererSurfaceChanged()));
 
         m_viewfinderOutput = viewfinderOutput;
         m_viewfinderType = OutputTypeRenderer;
@@ -255,8 +274,8 @@ void S60CameraViewfinderEngine::setVideoRendererControl(QObject *viewfinderOutpu
         if (m_vfState == EVFIsConnectedIsStartedIsVisible)
             startViewfinder(true, false);
 
-        if (viewFinderRenderControl->surface())
-            rendererSurfaceSet();
+        if (rendererControl->surface())
+            rendererSurfaceChanged();
     }
 }
 
@@ -326,6 +345,9 @@ void S60CameraViewfinderEngine::setVideoWindowControl(QObject *viewfinderOutput)
 
 void S60CameraViewfinderEngine::releaseControl(ViewfinderOutputType type)
 {
+    if (m_viewfinderType != type)
+        return;
+
     if (m_vfState == EVFIsConnectedIsStartedIsVisible)
         stopViewfinder(true, false);
 
@@ -426,17 +448,32 @@ void S60CameraViewfinderEngine::startViewfinder(bool internalStart, bool suppres
             return;
 
         if (m_viewfinderNativeType == EDirectScreenViewFinder) {
+            m_window = 0;
+            QRect extentRect;
+            QRect clipRect;
 
-            if (RWindow *window = m_viewfinderDisplay ? m_viewfinderDisplay->windowHandle() : 0) {
-                m_window = window;
-            } else {
+            if (m_viewfinderDisplay) {
+                m_window = m_viewfinderDisplay->windowHandle();
+                extentRect = m_viewfinderDisplay->extentRect();
+                clipRect = m_viewfinderDisplay->clipRect();
+            }
+#ifdef VIDEOOUTPUT_EGL_RENDERER
+            else if (qobject_cast<S60VideoEglRendererControl *>(m_viewfinderOutput)) {
+                m_window = m_dummyWindow->windowHandle();
+                QSize windowSize;
+                if (m_window)
+                    windowSize = QSize(m_window->Size().iWidth, m_window->Size().iHeight);
+                extentRect = QRect(QPoint(0, 0), windowSize);
+                clipRect = extentRect;
+            }
+#endif
+
+            if (!m_window) {
                 emit error(QCamera::CameraError, tr("Requesting window for viewfinder failed."));
                 qWarning("Requesting window for viewfinder failed. Viewfinder may not be visible.");
                 return;
             }
 
-            const QRect extentRect = m_viewfinderDisplay ? m_viewfinderDisplay->extentRect() : QRect();
-            const QRect clipRect = m_viewfinderDisplay ? m_viewfinderDisplay->clipRect() : QRect();
             TRect extentRectSymbian = qRect2TRect(extentRect);
             TRect clipRectSymbian = qRect2TRect(clipRect);
 
@@ -447,6 +484,15 @@ void S60CameraViewfinderEngine::startViewfinder(bool internalStart, bool suppres
                 else
                     emit error(QCamera::CameraError, tr("Starting viewfinder failed."));
                 return;
+            } else {
+#ifdef VIDEOOUTPUT_EGL_RENDERER
+                if (qobject_cast<S60VideoEglRendererControl *>(m_viewfinderOutput))
+                    // Temporary workaround for a bug in the BCM2727 graphics driver
+                    // Without this delay, images acquired from the EGL endpoint all
+                    // contain the same data, which may be a valid viewfinder frame,
+                    // or may be garbage.
+                    QTimer::singleShot(500, this, SLOT(setRendererNativeSurface()));
+#endif
             }
 
             m_actualViewFinderSize = QSize(extentRectSymbian.Size().iWidth, extentRectSymbian.Size().iHeight);
@@ -515,6 +561,17 @@ void S60CameraViewfinderEngine::startViewfinder(bool internalStart, bool suppres
         m_viewfinderDisplay->setHasContent(true);
 }
 
+void S60CameraViewfinderEngine::setRendererNativeSurface()
+{
+#ifdef VIDEOOUTPUT_EGL_RENDERER
+    S60VideoEglRendererControl *rendererControl =
+        qobject_cast<S60VideoEglRendererControl *>(m_viewfinderOutput);
+    const QSize windowSize(m_window->Size().iWidth, m_window->Size().iHeight);
+    rendererControl->setNativeSize(windowSize);
+    rendererControl->setNativeSurface(m_dummyWindow->nativeSurface());
+#endif
+}
+
 void S60CameraViewfinderEngine::stopViewfinder(const bool internalStop, bool suppressHasContentChanged)
 {
     // Stop if viewfinder is started
@@ -548,6 +605,8 @@ void S60CameraViewfinderEngine::stopViewfinder(const bool internalStop, bool sup
         }
     }
 
+    m_window = 0;
+
     if (m_viewfinderDisplay && !suppressHasContentChanged)
         m_viewfinderDisplay->setHasContent(false);
 }
@@ -606,57 +665,55 @@ void S60CameraViewfinderEngine::resetViewfinderDisplay()
     }
 }
 
-void S60CameraViewfinderEngine::rendererSurfaceSet()
+void S60CameraViewfinderEngine::rendererSurfaceChanged()
 {
-    S60VideoRendererControl* viewFinderRenderControl =
-        qobject_cast<S60VideoRendererControl*>(m_viewfinderOutput);
+    QVideoRendererControl *rendererControl =
+        qobject_cast<QVideoRendererControl*>(m_viewfinderOutput);
+    Q_ASSERT(rendererControl);
 
     // Reset old surface if needed
     if (m_viewfinderSurface) {
         handleVisibilityChange(false);
         disconnect(m_viewfinderSurface);
-        if (viewFinderRenderControl->surface())
-            stopViewfinder(true); // Temporary stop
-        else
-            stopViewfinder(); // Stop for good
+        stopViewfinder(true);
         m_viewfinderSize = QApplication::desktop()->screenGeometry().size();
         m_viewfinderSurface = 0;
     }
 
-    // Set new surface
-    m_viewfinderSurface = viewFinderRenderControl->surface();
-    if (!m_viewfinderSurface)
-        return;
-    if (!m_viewfinderSurface->nativeResolution().isEmpty()) {
-        if (m_viewfinderSurface->nativeResolution() != m_viewfinderSize)
-            resetViewfinderSize(m_viewfinderSurface->nativeResolution());
-    }
-
-    connect(m_viewfinderSurface, SIGNAL(nativeResolutionChanged(const QSize&)),
-        this, SLOT(resetViewfinderSize(QSize)));
+    m_viewfinderSurface = rendererControl->surface();
+    if (m_viewfinderSurface) {
+        // Set new surface
+        if (!m_viewfinderSurface->nativeResolution().isEmpty())
+            if (m_viewfinderSurface->nativeResolution() != m_viewfinderSize)
+                resetViewfinderSize(m_viewfinderSurface->nativeResolution());
+
+        connect(m_viewfinderSurface, SIGNAL(nativeResolutionChanged(const QSize&)),
+            this, SLOT(resetViewfinderSize(QSize)));
+
+        // Set Surface Properties
+        if (m_viewfinderSurface->supportedPixelFormats().contains(QVideoFrame::Format_RGB32))
+            m_surfaceFormat = QVideoSurfaceFormat(m_actualViewFinderSize, QVideoFrame::Format_RGB32);
+        else if (m_viewfinderSurface->supportedPixelFormats().contains(QVideoFrame::Format_ARGB32))
+            m_surfaceFormat = QVideoSurfaceFormat(m_actualViewFinderSize, QVideoFrame::Format_ARGB32);
+        else {
+            return;
+        }
+        m_surfaceFormat.setFrameRate(KViewfinderFrameRate);
+        m_surfaceFormat.setYCbCrColorSpace(QVideoSurfaceFormat::YCbCr_Undefined); // EColor16MU (compatible with EColor16MA)
+        m_surfaceFormat.setPixelAspectRatio(1,1); // PAR 1:1
 
-    // Set Surface Properties
-    if (m_viewfinderSurface->supportedPixelFormats().contains(QVideoFrame::Format_RGB32))
-        m_surfaceFormat = QVideoSurfaceFormat(m_actualViewFinderSize, QVideoFrame::Format_RGB32);
-    else if (m_viewfinderSurface->supportedPixelFormats().contains(QVideoFrame::Format_ARGB32))
-        m_surfaceFormat = QVideoSurfaceFormat(m_actualViewFinderSize, QVideoFrame::Format_ARGB32);
-    else {
-        return;
+        if (qobject_cast<S60BitmapViewFinderRendererControl *>(rendererControl))
+            connect(this, SIGNAL(viewFinderFrameReady(const CFbsBitmap &)),
+                this, SLOT(viewFinderBitmapReady(const CFbsBitmap &)));
     }
-    m_surfaceFormat.setFrameRate(KViewfinderFrameRate);
-    m_surfaceFormat.setYCbCrColorSpace(QVideoSurfaceFormat::YCbCr_Undefined); // EColor16MU (compatible with EColor16MA)
-    m_surfaceFormat.setPixelAspectRatio(1,1); // PAR 1:1
 
-
-    connect(this, SIGNAL(viewFinderFrameReady(const CFbsBitmap &)),
-        this, SLOT(viewFinderBitmapReady(const CFbsBitmap &)));
-
-    // Surface set, viewfinder is "visible"
-    handleVisibilityChange(true);
+    handleVisibilityChange(m_viewfinderSurface != 0);
 }
 
 void S60CameraViewfinderEngine::viewFinderBitmapReady(const CFbsBitmap &bitmap)
 {
+    Q_ASSERT(qobject_cast<S60BitmapViewFinderRendererControl *>(m_viewfinderOutput));
+
     CFbsBitmap *bitmapPtr = const_cast<CFbsBitmap*>(&bitmap);
     QPixmap pixmap = QPixmap::fromSymbianCFbsBitmap(bitmapPtr);
 
diff --git a/plugins/multimedia/symbian/ecam/s60cameraviewfinderengine.h b/plugins/multimedia/symbian/ecam/s60cameraviewfinderengine.h
index 5eac701eb1..005ac26714 100644
--- a/plugins/multimedia/symbian/ecam/s60cameraviewfinderengine.h
+++ b/plugins/multimedia/symbian/ecam/s60cameraviewfinderengine.h
@@ -53,6 +53,7 @@ QT_FORWARD_DECLARE_CLASS(S60CameraControl)
 QT_FORWARD_DECLARE_CLASS(QAbstractVideoSurface)
 QT_FORWARD_DECLARE_CLASS(QDesktopWidget)
 QT_FORWARD_DECLARE_CLASS(S60VideoDisplay)
+QT_FORWARD_DECLARE_CLASS(S60NativeWindow)
 
 // For DirectScreen ViewFinder
 QT_FORWARD_DECLARE_CLASS(RWsSession)
@@ -122,7 +123,8 @@ private slots:
     void handleWindowChange(RWindow *handle);
     void handleDesktopResize(int screen);
     void handleContentAspectRatioChange(const QSize& newSize);
-    void rendererSurfaceSet();
+    void rendererSurfaceChanged();
+    void setRendererNativeSurface();
 
 private: // Enums
 
@@ -171,6 +173,7 @@ private: // Data
     QVideoSurfaceFormat     m_surfaceFormat; // Used only by QVideoRendererControl
     bool                    m_isViewFinderVisible;
     int                     m_vfErrorsSignalled;
+    S60NativeWindow         *m_dummyWindow;
 };
 
 #endif // S60CAMERAVIEWFINDERENGINE_H
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
index 39db63de4f..d8032cc49a 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
@@ -47,15 +47,14 @@
 #include "s60audiocontainercontrol.h"
 #include "s60mmtrace.h"
 
-S60AudioCaptureService::S60AudioCaptureService(QObject *parent):
-    QMediaService(parent)
+S60AudioCaptureService::S60AudioCaptureService(QObject *parent)
+    : QMediaService(parent)
 {
     TRACE("S60AudioCaptureService::S60AudioCaptureService" << qtThisPtr());
-
     m_session = new S60AudioCaptureSession(this);
-    m_encoderControl = new S60AudioEncoderControl(m_session,this);
-    m_recorderControl = new S60AudioMediaRecorderControl(m_session,this);
-    m_endpointSelector = new S60AudioEndpointSelector(m_session,this); 
+    m_encoderControl = new S60AudioEncoderControl(m_session, this);
+    m_recorderControl = new S60AudioMediaRecorderControl(m_session, this);
+    m_endpointSelector = new S60AudioEndpointSelector(m_session, this);
     m_containerControl = new S60AudioContainerControl(m_session, this);
 }
 
@@ -67,22 +66,16 @@ S60AudioCaptureService::~S60AudioCaptureService()
 QMediaControl *S60AudioCaptureService::requestControl(const char *name)
 {
     QMediaControl *result = 0;
-
     if (qstrcmp(name,QMediaRecorderControl_iid) == 0)
         result = m_recorderControl;
-
     if (qstrcmp(name,QAudioEncoderControl_iid) == 0)
         result =  m_encoderControl;
-
     if (qstrcmp(name,QAudioEndpointSelector_iid) == 0)
         result =  m_endpointSelector;
-    
     if (qstrcmp(name,QMediaContainerControl_iid) == 0)
         result =  m_containerControl;
-
     TRACE("S60AudioCaptureService::requestControl" << qtThisPtr()
           << "name" << name << "result" << result);
-
     return result;
 }
 
@@ -90,6 +83,5 @@ void S60AudioCaptureService::releaseControl(QMediaControl *control)
 {
     TRACE("S60AudioCaptureService::releaseControl" << qtThisPtr()
           << "control" << control);
-
     Q_UNUSED(control)
 }
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h
index 040f97d297..3a36e7d6c8 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h
@@ -43,7 +43,6 @@
 #define S60AUDIOCAPTURESERVICE_H
 
 #include <QtCore/qobject.h>
-
 #include <qmediaservice.h>
 
 QT_USE_NAMESPACE
@@ -54,7 +53,6 @@ class S60AudioMediaRecorderControl;
 class S60AudioEndpointSelector;
 class S60AudioContainerControl;
 
-
 class S60AudioCaptureService : public QMediaService
 {
     Q_OBJECT
@@ -64,6 +62,7 @@ public:
 
     QMediaControl *requestControl(const char *name);
     void releaseControl(QMediaControl *control);
+
 private:
     S60AudioCaptureSession       *m_session;
     S60AudioEncoderControl       *m_encoderControl;
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
index a443d96de5..f653ed96f5 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
@@ -43,7 +43,6 @@
 #include "s60mmtrace.h"
 #include <QtCore/qurl.h>
 #include <QDir>
-
 #include <mda/common/audio.h>
 #include <mda/common/resource.h>
 #include <mda/client/utility.h>
@@ -60,9 +59,9 @@ const QString S60AudioCaptureSession::voiceCall("Voice Call");
 const QString S60AudioCaptureSession::fmRadio("FM Radio");
 #endif
 
-S60AudioCaptureSession::S60AudioCaptureSession(QObject *parent):
-    QObject(parent)
-    , m_recorderUtility(NULL)
+S60AudioCaptureSession::S60AudioCaptureSession(QObject *parent)
+    : QObject(parent)
+    , m_recorderUtility(0)
     , m_captureState(ENotInitialized)
     , m_controllerIdMap(QHash<QString, ControllerData>())
     , m_audioCodeclist(QHash<QString, CodecData>())
@@ -71,8 +70,8 @@ S60AudioCaptureSession::S60AudioCaptureSession(QObject *parent):
 {
     TRACE("S60AudioCaptureSession::S60AudioCaptureSession" << qtThisPtr());
 #ifdef AUDIOINPUT_ROUTING
-    m_audioInput = NULL;
-    m_setActiveEndPoint = FALSE;
+    m_audioInput = 0;
+    m_setActiveEndPoint = false;
     m_audioEndpoint = S60AudioCaptureSession::microPhone;
 #endif //AUDIOINPUT_ROUTING
     TRAPD(err, initializeSessionL());
@@ -143,7 +142,6 @@ QMediaRecorder::Error S60AudioCaptureSession::fromSymbianErrorToMultimediaError(
 S60AudioCaptureSession::~S60AudioCaptureSession()
 {
     TRACE("S60AudioCaptureSession::~S60AudioCaptureSession" << qtThisPtr());
-    //stop the utility before deleting it
     stop();
     if (m_recorderUtility)
         delete m_recorderUtility;
@@ -220,9 +218,8 @@ bool S60AudioCaptureSession::setAudioCodec(const QString &codecName)
 {
     TRACE("S60AudioCaptureSession::setAudioCodec" << qtThisPtr()
           << "codec" << codecName);
-
     QStringList codecs = supportedAudioCodecs();
-    if(codecs.contains(codecName)) {
+    if (codecs.contains(codecName)) {
         m_format.setCodec(codecName);
         return true;
     }
@@ -233,14 +230,12 @@ bool S60AudioCaptureSession::setAudioContainer(const QString &containerMimeType)
 {
     TRACE("S60AudioCaptureSession::setAudioContainer" << qtThisPtr()
           << "mimeType" << containerMimeType);
-
     QStringList containers = supportedAudioContainers();
-    if (containerMimeType == "audio/mpeg")
-        {
+    if (containerMimeType == "audio/mpeg") {
         m_container = "audio/mp4";
         return true;
-        }
-    if(containers.contains(containerMimeType)) {
+    }
+    if (containers.contains(containerMimeType)) {
         m_container = containerMimeType;
         return true;
     }
@@ -262,11 +257,10 @@ QUrl S60AudioCaptureSession::outputLocation() const
     return m_sink;
 }
 
-bool S60AudioCaptureSession::setOutputLocation(const QUrl& sink)
+bool S60AudioCaptureSession::setOutputLocation(const QUrl &sink)
 {
     TRACE("S60AudioCaptureSession::setOutputLocation" << qtThisPtr()
           << "location" << sink);
-
     QString filename = QDir::toNativeSeparators(sink.toString());
     TPtrC16 path(reinterpret_cast<const TUint16*>(filename.utf16()));
     TRAPD(err, BaflUtils::EnsurePathExistsL(m_fsSession,path));
@@ -274,7 +268,7 @@ bool S60AudioCaptureSession::setOutputLocation(const QUrl& sink)
         m_sink = sink;
         setError(err);
         return true;
-    }else {
+    } else {
         setError(err);
         return false;
     }
@@ -284,7 +278,6 @@ qint64 S60AudioCaptureSession::position() const
 {
     if ((m_captureState != ERecording) || !m_recorderUtility)
         return 0;
-
     return m_recorderUtility->Duration().Int64() / 1000;
 }
 
@@ -297,20 +290,21 @@ void S60AudioCaptureSession::prepareSinkL()
         QDir outputDir(QDir::rootPath());
         int lastImage = 0;
         int fileCount = 0;
-        foreach(QString fileName, outputDir.entryList(QStringList() << "recordclip_*")) {
+        foreach (QString fileName, outputDir.entryList(QStringList() << "recordclip_*")) {
             int imgNumber = fileName.mid(5, fileName.size() - 9).toInt();
             lastImage = qMax(lastImage, imgNumber);
             if (outputDir.exists(fileName))
                 fileCount += 1;
         }
         lastImage += fileCount;
-        m_sink = QUrl(QDir::toNativeSeparators(outputDir.canonicalPath() + QString("/recordclip_%1").arg(lastImage + 1, 4, 10, QLatin1Char('0'))));
+        m_sink = QUrl(QDir::toNativeSeparators(outputDir.canonicalPath()
+                      + QString("/recordclip_%1").arg(lastImage + 1, 4, 10, QLatin1Char('0'))));
     }
 
     QString sink = QDir::toNativeSeparators(m_sink.toString());
     TPtrC16 path(reinterpret_cast<const TUint16*>(sink.utf16()));
     if (BaflUtils::FileExists(m_fsSession, path))
-            BaflUtils::DeleteFile(m_fsSession, path);
+        BaflUtils::DeleteFile(m_fsSession, path);
 
     int index = sink.lastIndexOf('.');
     if (index != -1)
@@ -328,15 +322,16 @@ void S60AudioCaptureSession::record()
         return;
 
     if (m_captureState == EInitialized || m_captureState == ERecordComplete) {
-        prepareSinkL();
-        QString filename = m_sink.toString();
-        TPtrC16 sink(reinterpret_cast<const TUint16*>(filename.utf16()));
-        TUid controllerUid(TUid::Uid(m_controllerIdMap.value(m_container).controllerUid));
-        TUid formatUid(TUid::Uid(m_controllerIdMap.value(m_container).destinationFormatUid));
-
-        TRAPD(err,m_recorderUtility->OpenFileL(sink));
+        TRAPD(err, prepareSinkL());
+        if (!err) {
+            QString filename = m_sink.toString();
+            TPtrC16 sink(reinterpret_cast<const TUint16*>(filename.utf16()));
+            TUid controllerUid(TUid::Uid(m_controllerIdMap.value(m_container).controllerUid));
+            TUid formatUid(TUid::Uid(m_controllerIdMap.value(m_container).destinationFormatUid));
+            TRAP(err, m_recorderUtility->OpenFileL(sink));
+        }
         setError(err);
-    }else if (m_captureState == EPaused) {
+    } else if (m_captureState == EPaused) {
         m_recorderUtility->SetPosition(m_pausedPosition);
         TRAPD(error, m_recorderUtility->RecordL());
         setError(error);
@@ -348,15 +343,12 @@ void S60AudioCaptureSession::record()
 void S60AudioCaptureSession::mute(bool muted)
 {
     TRACE("S60AudioCaptureSession::mute" << qtThisPtr() << "muted" << muted);
-
     if (!m_recorderUtility)
         return;
-
     if (muted)
         m_recorderUtility->SetGain(0);
     else
         m_recorderUtility->SetGain(m_recorderUtility->MaxGain());
-
     m_isMuted = muted;
 }
 
@@ -371,7 +363,7 @@ void S60AudioCaptureSession::setDefaultSettings()
 
     // Setting AMR to default format if supported
     if (m_controllerIdMap.count() > 0) {
-        if ( m_controllerIdMap.contains("audio/amr"))
+        if (m_controllerIdMap.contains("audio/amr"))
             m_container = QString("audio/amr");
         else
             m_container = m_controllerIdMap.keys()[0];
@@ -383,18 +375,17 @@ void S60AudioCaptureSession::setDefaultSettings()
             m_format.setFrequency(8000);
             m_format.setSampleType(QAudioFormat::SignedInt);
             m_format.setCodec("AMR");
-        }else
+        } else {
             m_format.setCodec(m_audioCodeclist.keys()[0]);
+        }
     }
 }
 
 void S60AudioCaptureSession::pause()
 {
     TRACE("S60AudioCaptureSession::pause" << qtThisPtr());
-
     if (!m_recorderUtility)
         return;
-
     m_pausedPosition = m_recorderUtility->Position();
     m_recorderUtility->Stop();
     m_captureState = EPaused;
@@ -404,21 +395,15 @@ void S60AudioCaptureSession::pause()
 void S60AudioCaptureSession::stop()
 {
     TRACE("S60AudioCaptureSession::stop" << qtThisPtr());
-
     if (!m_recorderUtility)
         return;
-
     m_recorderUtility->Stop();
-
 #ifdef AUDIOINPUT_ROUTING
-    //delete audio input instance before closing the utility.
-    if (m_audioInput)
-     {
+    if (m_audioInput) {
         delete m_audioInput;
-        m_audioInput = NULL;
-     }
-#endif //AUDIOINPUT_ROUTING
-
+        m_audioInput = 0;
+    }
+#endif
     m_recorderUtility->Close();
     m_captureState = ERecordComplete;
     emit stateChanged(m_captureState);
@@ -429,28 +414,25 @@ void S60AudioCaptureSession::stop()
 void S60AudioCaptureSession::initAudioInputs()
 {
     TRACE("S60AudioCaptureSession::initAudioInputs" << qtThisPtr());
-
     m_audioInputs[S60AudioCaptureSession::microPhone] = QString("Microphone associated with the currently active speaker.");
     m_audioInputs[S60AudioCaptureSession::voiceCall] = QString("Audio stream associated with the current phone call.");
     m_audioInputs[S60AudioCaptureSession::fmRadio] = QString("Audio of the currently tuned FM radio station.");
 }
 
-#endif //AUDIOINPUT_ROUTING
+#endif
 
 void S60AudioCaptureSession::setActiveEndpoint(const QString& audioEndpoint)
 {
     TRACE("S60AudioCaptureSession::setActiveEndpoint" << qtThisPtr()
           << "endpoint" << audioEndpoint);
-
     if (!m_audioInputs.keys().contains(audioEndpoint))
         return;
-
     if (activeEndpoint().compare(audioEndpoint) != 0) {
         m_audioEndpoint = audioEndpoint;
 #ifdef AUDIOINPUT_ROUTING
-        m_setActiveEndPoint = TRUE;
+        m_setActiveEndPoint = true;
 #endif
-       }
+    }
 }
 
 QList<QString> S60AudioCaptureSession::availableEndpoints() const
@@ -467,13 +449,13 @@ QString S60AudioCaptureSession::endpointDescription(const QString& name) const
 
 QString S60AudioCaptureSession::activeEndpoint() const
 {
-    QString inputSourceName = NULL;
+    QString inputSourceName;
 #ifdef AUDIOINPUT_ROUTING
     if (m_audioInput) {
         CAudioInput::TAudioInputArray input = m_audioInput->AudioInput();
         inputSourceName = qStringFromTAudioInputPreference(input[0]);
     }
-#endif //AUDIOINPUT_ROUTING
+#endif
     return inputSourceName;
 }
 
@@ -482,17 +464,17 @@ QString S60AudioCaptureSession::defaultEndpoint() const
 #ifdef AUDIOINPUT_ROUTING
     return QString(S60AudioCaptureSession::microPhone);
 #else
-    return NULL;
+    return QString();
 #endif
 }
 
 #ifdef AUDIOINPUT_ROUTING
 
-void S60AudioCaptureSession::doSetAudioInputL(const QString& name)
+void S60AudioCaptureSession::doSetAudioInputL(const QString &name)
 {
     TRACE("S60AudioCaptureSession::doSetAudioInputL" << qtThisPtr()
           << "name" << name);
-    TInt err(KErrNone);
+    TInt err = KErrNone;
 
     if (!m_recorderUtility)
         return;
@@ -507,23 +489,19 @@ void S60AudioCaptureSession::doSetAudioInputL(const QString& name)
     else // S60AudioCaptureSession::microPhone
         input = CAudioInput::EDefaultMic;
 
-        RArray<CAudioInput::TAudioInputPreference> inputArray;
-        inputArray.Append(input);
-
-        if (m_audioInput){
-            TRAP(err,m_audioInput->SetAudioInputL(inputArray.Array()));
+    RArray<CAudioInput::TAudioInputPreference> inputArray;
+    inputArray.Append(input);
 
-            if (err == KErrNone) {
-                emit activeEndpointChanged(name);
-            }
-            else{
-                setError(err);
-            }
-        }
-        inputArray.Close();
+    if (m_audioInput){
+        TRAP(err,m_audioInput->SetAudioInputL(inputArray.Array()));
+        if (err == KErrNone)
+            emit activeEndpointChanged(name);
+        else
+            setError(err);
+    }
+    inputArray.Close();
 }
 
-
 QString S60AudioCaptureSession::qStringFromTAudioInputPreference(CAudioInput::TAudioInputPreference input) const
 {
     if (input == CAudioInput::EVoiceCall)
@@ -535,19 +513,16 @@ QString S60AudioCaptureSession::qStringFromTAudioInputPreference(CAudioInput::TA
 }
 #endif //AUDIOINPUT_ROUTING
 
-
 void S60AudioCaptureSession::MoscoStateChangeEvent(CBase* aObject,
         TInt aPreviousState, TInt aCurrentState, TInt aErrorCode)
 {
     TRACE("S60AudioCaptureSession::MoscoStateChangeEvent" << qtThisPtr()
           << "prevState" << aPreviousState << "currentState" << aCurrentState
           << "error" << aErrorCode);
-
     if (aErrorCode==KErrNone) {
 	    TRAPD(err, MoscoStateChangeEventL(aObject, aPreviousState, aCurrentState, NULL));
 	    setError(err);
-	}
-    else {
+	} else {
         setError(aErrorCode);
     }
 }
@@ -557,33 +532,29 @@ void S60AudioCaptureSession::MoscoStateChangeEventL(CBase* aObject,
 {
 	if (aObject != m_recorderUtility)
 	    return;
-
-		switch(aCurrentState) {
-        case CMdaAudioClipUtility::EOpen: {
-            if(aPreviousState == CMdaAudioClipUtility::ENotReady) {
-                applyAudioSettingsL();
-                m_recorderUtility->SetGain(m_recorderUtility->MaxGain());
-                TRAPD(err, m_recorderUtility->RecordL());
-                setError(err);
-                m_captureState = EOpenCompelete;
-                emit stateChanged(m_captureState);
-            }
-            break;
-        }
-        case CMdaAudioClipUtility::ENotReady: {
-            m_captureState = EInitialized;
-            emit stateChanged(m_captureState);
-            break;
-        }
-        case CMdaAudioClipUtility::ERecording: {
-            m_captureState = ERecording;
+    switch(aCurrentState) {
+    case CMdaAudioClipUtility::EOpen: {
+        if (aPreviousState == CMdaAudioClipUtility::ENotReady) {
+            applyAudioSettingsL();
+            m_recorderUtility->SetGain(m_recorderUtility->MaxGain());
+            TRAPD(err, m_recorderUtility->RecordL());
+            setError(err);
+            m_captureState = EOpenCompelete;
             emit stateChanged(m_captureState);
-            break;
         }
-        default: {
-            break;
-        }
-		}
+        break;
+    }
+    case CMdaAudioClipUtility::ENotReady:
+        m_captureState = EInitialized;
+        emit stateChanged(m_captureState);
+        break;
+    case CMdaAudioClipUtility::ERecording:
+        m_captureState = ERecording;
+        emit stateChanged(m_captureState);
+        break;
+    default:
+        break;
+    }
 }
 
 void S60AudioCaptureSession::updateAudioContainersL()
@@ -608,10 +579,10 @@ void S60AudioCaptureSession::updateAudioContainersL()
 	//Get all audio record controllers/formats that are supported
 	pluginParameters->ListImplementationsL(controllers);
 
-	for (TInt index=0; index<controllers.Count(); index++) {
+	for (TInt index=0; index<controllers.Count(); ++index) {
 		const RMMFFormatImplInfoArray& recordFormats =
 			controllers[index]->RecordFormats();
-		for (TInt j=0; j<recordFormats.Count(); j++) {
+		for (TInt j=0; j<recordFormats.Count(); ++j) {
 			const CDesC8Array& mimeTypes = recordFormats[j]->SupportedMimeTypes();
 			const CDesC8Array& fileExtensions = recordFormats[j]->SupportedFileExtensions();
 			TInt mimeCount = mimeTypes.Count();
@@ -622,7 +593,7 @@ void S60AudioCaptureSession::updateAudioContainersL()
                 TPtrC8 mimeType = mimeTypes[0];
                 QString type = QString::fromUtf8((char *)mimeType.Ptr(), mimeType.Length());
 
-            if (type != "audio/basic") {
+                if (type != "audio/basic") {
                     ControllerData data;
                     data.controllerUid = controllers[index]->Uid().iUid;
                     data.destinationFormatUid = recordFormats[j]->Uid().iUid;
@@ -640,66 +611,58 @@ void S60AudioCaptureSession::updateAudioContainersL()
 
 void S60AudioCaptureSession::retrieveSupportedAudioSampleRatesL()
 {
-    if (!m_recorderUtility) {
+    if (!m_recorderUtility)
         return;
-    }
-
     m_supportedSampleRates.clear();
-
     RArray<TUint> supportedSampleRates;
     CleanupClosePushL(supportedSampleRates);
     m_recorderUtility->GetSupportedSampleRatesL(supportedSampleRates);
-    for (TInt j = 0; j < supportedSampleRates.Count(); j++ )
+    for (TInt j=0; j<supportedSampleRates.Count(); ++j)
         m_supportedSampleRates.append(supportedSampleRates[j]);
-
     CleanupStack::PopAndDestroy(&supportedSampleRates);
 }
 
 QList<int> S60AudioCaptureSession::supportedAudioSampleRates(const QAudioEncoderSettings &settings) const
 {
     QList<int> supportedSampleRates;
-
     if (!settings.codec().isEmpty()) {
         if (settings.codec() == "AMR")
             supportedSampleRates.append(8000);
         else
             supportedSampleRates = m_supportedSampleRates;
-    }else
+    } else {
         supportedSampleRates = m_supportedSampleRates;
-
+    }
     return supportedSampleRates;
 }
 
 void S60AudioCaptureSession::populateAudioCodecsDataL()
 {
-    if (!m_recorderUtility) {
+    if (!m_recorderUtility)
         return;
-    }
-
     if (m_controllerIdMap.contains("audio/amr")) {
         CodecData data;
         data.codecDescription = QString("GSM AMR Codec");
-        m_audioCodeclist[QString("AMR")]=data;
+        m_audioCodeclist[QString("AMR")] = data;
     }
     if (m_controllerIdMap.contains("audio/basic")) {
         CodecData data;
         data.fourCC = KMMFFourCCCodeALAW;
         data.codecDescription = QString("Sun/Next ""Au"" audio codec");
-        m_audioCodeclist[QString("AULAW")]=data;
+        m_audioCodeclist[QString("AULAW")] = data;
     }
     if (m_controllerIdMap.contains("audio/wav")) {
         CodecData data;
         data.fourCC = KMMFFourCCCodePCM16;
         data.codecDescription = QString("Pulse code modulation");
-        m_audioCodeclist[QString("PCM")]=data;
+        m_audioCodeclist[QString("PCM")] = data;
     }
     if (m_controllerIdMap.contains("audio/mp4")) {
         CodecData data;
         data.fourCC = KMMFFourCCCodeAAC;
         data.codecDescription = QString("Advanced Audio Codec");
-        m_audioCodeclist[QString("AAC")]=data;
+        m_audioCodeclist[QString("AAC")] = data;
     }
-
     // default samplerates
     m_supportedSampleRates << 96000 << 88200 << 64000 << 48000 << 44100 << 32000 << 24000 << 22050 << 16000 << 12000 << 11025 << 8000;
 }
@@ -707,7 +670,6 @@ void S60AudioCaptureSession::populateAudioCodecsDataL()
 void S60AudioCaptureSession::applyAudioSettingsL()
 {
     TRACE("S60AudioCaptureSession::applyAudioSettingsL" << qtThisPtr());
-
     if (!m_recorderUtility)
         return;
 
@@ -715,14 +677,14 @@ void S60AudioCaptureSession::applyAudioSettingsL()
     //CAudioInput needs to be re-initialized every time recording starts
     if (m_audioInput) {
         delete m_audioInput;
-        m_audioInput = NULL;
+        m_audioInput = 0;
     }
 
     if (m_setActiveEndPoint) {
         m_audioInput = CAudioInput::NewL(*m_recorderUtility);
         doSetAudioInputL(m_audioEndpoint);
     }
-#endif //AUDIOINPUT_ROUTING
+#endif
 
     if (m_format.codec() == "AMR")
         return;
@@ -736,29 +698,27 @@ void S60AudioCaptureSession::applyAudioSettingsL()
     CleanupClosePushL(supportedDataTypes);
     TRAP_IGNORE(m_recorderUtility->GetSupportedDestinationDataTypesL(supportedDataTypes));
     TInt num = supportedDataTypes.Count();
-    if (num > 0 ) {
+    if (num > 0) {
         supportedDataTypes.SortUnsigned();
         int index = supportedDataTypes.Find(fourCC.FourCC());
-         if (index != KErrNotFound) {
+        if (index != KErrNotFound)
             TRAP_IGNORE(m_recorderUtility->SetDestinationDataTypeL(supportedDataTypes[index]));
-        }
     }
 
     supportedDataTypes.Reset();
     CleanupStack::PopAndDestroy(&supportedDataTypes);
 
     if (m_recorderUtility->DestinationSampleRateL() != m_format.frequency()) {
-
         RArray<TUint> supportedSampleRates;
         CleanupClosePushL(supportedSampleRates);
         m_recorderUtility->GetSupportedSampleRatesL(supportedSampleRates);
-    for (TInt i = 0; i < supportedSampleRates.Count(); i++ ) {
-        TUint supportedSampleRate = supportedSampleRates[i];
-        if (supportedSampleRate == m_format.frequency()) {
-            m_recorderUtility->SetDestinationSampleRateL(m_format.frequency());
-            break;
+        for (TInt i=0; i<supportedSampleRates.Count(); ++i) {
+            TUint supportedSampleRate = supportedSampleRates[i];
+            if (supportedSampleRate == m_format.frequency()) {
+                m_recorderUtility->SetDestinationSampleRateL(m_format.frequency());
+                break;
+            }
         }
-    }
         supportedSampleRates.Reset();
         CleanupStack::PopAndDestroy(&supportedSampleRates);
     }
@@ -768,7 +728,7 @@ void S60AudioCaptureSession::applyAudioSettingsL()
         RArray<TUint> supportedChannels;
         CleanupClosePushL(supportedChannels);
         m_recorderUtility->GetSupportedNumberOfChannelsL(supportedChannels);
-        for (TInt l = 0; l < supportedChannels.Count(); l++ ) {
+        for (TInt l=0; l < supportedChannels.Count(); ++l) {
             if (supportedChannels[l] == m_format.channels()) {
                 m_recorderUtility->SetDestinationNumberOfChannelsL(m_format.channels());
                 break;
@@ -783,7 +743,7 @@ void S60AudioCaptureSession::applyAudioSettingsL()
             RArray<TUint> supportedBitRates;
             CleanupClosePushL(supportedBitRates);
             m_recorderUtility->GetSupportedBitRatesL(supportedBitRates);
-            for (TInt l = 0; l < supportedBitRates.Count(); l++ ) {
+            for (TInt l=0; l<supportedBitRates.Count(); ++l) {
                 if (supportedBitRates[l] == m_audioEncoderSettings.bitRate()) {
                     m_recorderUtility->SetDestinationBitRateL(m_audioEncoderSettings.bitRate());
                     break;
@@ -798,44 +758,36 @@ void S60AudioCaptureSession::applyAudioSettingsL()
 TFourCC S60AudioCaptureSession::determinePCMFormat()
 {
     TFourCC fourCC;
-
     if (m_format.sampleSize() == 8) {
         // 8 bit
         switch (m_format.sampleType()) {
-        case QAudioFormat::SignedInt: {
+        case QAudioFormat::SignedInt:
             fourCC.Set(KMMFFourCCCodePCM8);
             break;
-        }
-        case QAudioFormat::UnSignedInt: {
+        case QAudioFormat::UnSignedInt:
             fourCC.Set(KMMFFourCCCodePCMU8);
             break;
-        }
         case QAudioFormat::Float:
         case QAudioFormat::Unknown:
-        default: {
+        default:
             fourCC.Set(KMMFFourCCCodePCM8);
             break;
         }
-        }
     } else if (m_format.sampleSize() == 16) {
         // 16 bit
         switch (m_format.sampleType()) {
-        case QAudioFormat::SignedInt: {
+        case QAudioFormat::SignedInt:
             fourCC.Set(m_format.byteOrder()==QAudioFormat::BigEndian?
                 KMMFFourCCCodePCM16B:KMMFFourCCCodePCM16);
             break;
-        }
-        case QAudioFormat::UnSignedInt: {
+        case QAudioFormat::UnSignedInt:
             fourCC.Set(m_format.byteOrder()==QAudioFormat::BigEndian?
                 KMMFFourCCCodePCMU16B:KMMFFourCCCodePCMU16);
             break;
-        }
-        default: {
+        default:
             fourCC.Set(KMMFFourCCCodePCM16);
             break;
         }
-        }
     }
-
     return fourCC;
 }
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h
index b2801470df..f1a33c2cd5 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h
@@ -63,6 +63,7 @@
 #endif //AUDIOINPUT_ROUTING
 
 QT_BEGIN_NAMESPACE
+
 struct ControllerData
 {
 	int controllerUid;
@@ -76,19 +77,19 @@ struct CodecData
     TFourCC fourCC;
     QString codecDescription;
 };
+
 QT_END_NAMESPACE
 
 QT_USE_NAMESPACE
 
-class S60AudioCaptureSession : public QObject, public MMdaObjectStateChangeObserver
+class S60AudioCaptureSession : public QObject
+                             , public MMdaObjectStateChangeObserver
 {
     Q_OBJECT
     Q_PROPERTY(qint64 position READ position NOTIFY positionChanged)
     Q_ENUMS(TAudioCaptureState)
 public:
-
-    enum TAudioCaptureState
-    {
+    enum TAudioCaptureState {
         ENotInitialized = 0,
         EInitialized,
         EOpenCompelete,
@@ -125,13 +126,14 @@ public:
     QString activeEndpoint() const;
     QString defaultEndpoint() const;
     QList<QString> availableEndpoints() const;
-    QString endpointDescription(const QString& name) const;
+    QString endpointDescription(const QString &name) const;
 
 #ifdef AUDIOINPUT_ROUTING
     static const QString microPhone;
     static const QString voiceCall;
     static const QString fmRadio;
-#endif //AUDIOINPUT_ROUTING
+#endif
+
 private:
     void initializeSessionL();
     void setError(TInt aError);
@@ -143,6 +145,7 @@ private:
     void applyAudioSettingsL();
     TFourCC determinePCMFormat();
     void setDefaultSettings();
+
     // MMdaObjectStateChangeObserver
     void MoscoStateChangeEvent(CBase* aObject, TInt aPreviousState,
             TInt aCurrentState, TInt aErrorCode);
@@ -152,18 +155,18 @@ private:
 #ifdef AUDIOINPUT_ROUTING
     QString qStringFromTAudioInputPreference(CAudioInput::TAudioInputPreference input) const;
     void initAudioInputs();
-    void doSetAudioInputL(const QString& name);
-#endif //AUDIOINPUT_ROUTING
+    void doSetAudioInputL(const QString &name);
+#endif
 
 public Q_SLOTS:
-    void setActiveEndpoint(const QString& audioEndpoint);
-
+    void setActiveEndpoint(const QString &audioEndpoint);
 
 Q_SIGNALS:
     void stateChanged(S60AudioCaptureSession::TAudioCaptureState);
     void positionChanged(qint64 position);
     void error(int error, const QString &errorString);
     void activeEndpointChanged(const QString &audioEndpoint);
+
 private:
     QString m_container;
     QUrl m_sink;
@@ -182,12 +185,10 @@ private:
 #ifdef AUDIOINPUT_ROUTING
     bool m_setActiveEndPoint;
     CAudioInput *m_audioInput;
+#endif
 
-#endif //AUDIOINPUT_ROUTING
     QMap<QString, QString> m_audioInputs;
     QString m_audioEndpoint;
-
-
 };
 
 #endif // S60AUDIOCAPTURESESSION_H
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
index 54eec244eb..54e4774145 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
@@ -50,7 +50,7 @@ S60AudioContainerControl::S60AudioContainerControl(QObject *parent)
 }
 
 S60AudioContainerControl::S60AudioContainerControl(QObject *session, QObject *parent)
-   : QMediaContainerControl(parent)
+    : QMediaContainerControl(parent)
 {
     TRACE("S60AudioContainerControl::S60AudioContainerControl" << qtThisPtr());
     m_session = qobject_cast<S60AudioCaptureSession*>(session);
@@ -77,4 +77,3 @@ QString S60AudioContainerControl::containerDescription(const QString &containerM
 {
     return m_session->audioContainerDescription(containerMimeType);
 }
-
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h
index e657b4319c..239e4728d5 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h
@@ -45,14 +45,13 @@
 #include "qmediacontainercontrol.h"
 #include <QtCore/qstringlist.h>
 
-
 QT_USE_NAMESPACE
 
 class S60AudioCaptureSession;
 
 class S60AudioContainerControl : public QMediaContainerControl
 {
-Q_OBJECT
+    Q_OBJECT
 public:
     S60AudioContainerControl(QObject *parent = 0);
     S60AudioContainerControl(QObject *session, QObject *parent = 0);
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
index cc058fbe38..17da5c0791 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
@@ -42,14 +42,12 @@
 #include "s60audioencodercontrol.h"
 #include "s60audiocapturesession.h"
 #include "s60mmtrace.h"
-
 #include "qaudioformat.h"
 
 S60AudioEncoderControl::S60AudioEncoderControl(QObject *session, QObject *parent)
-    :QAudioEncoderControl(parent), m_quality(QtMultimediaKit::NormalQuality)
+    : QAudioEncoderControl(parent), m_quality(QtMultimediaKit::NormalQuality)
 {
     TRACE("S60AudioEncoderControl::S60AudioEncoderControl" << qtThisPtr());
-
     m_session = qobject_cast<S60AudioCaptureSession*>(session);
     QAudioFormat fmt = m_session->format();
     // medium, 22050Hz mono S16
@@ -124,23 +122,19 @@ QStringList S60AudioEncoderControl::supportedEncodingOptions(const QString &code
     QStringList list;
     if (codec == "PCM") 
         list << "quality" << "channels" << "samplerate";        
-     return list;
+    return list;
 }
 
 QVariant S60AudioEncoderControl::encodingOption(const QString &codec, const QString &name) const
 {
     if (codec == "PCM") {
         QAudioFormat fmt = m_session->format();
-        
-        if(qstrcmp(name.toLocal8Bit().constData(), "quality") == 0) {
+        if(qstrcmp(name.toLocal8Bit().constData(), "quality") == 0)
             return QVariant(quality());
-        }        
-        else if(qstrcmp(name.toLocal8Bit().constData(), "channels") == 0) {
+        else if(qstrcmp(name.toLocal8Bit().constData(), "channels") == 0)
             return QVariant(fmt.channels());
-        }                
-        else if(qstrcmp(name.toLocal8Bit().constData(), "samplerate") == 0) {
+        else if(qstrcmp(name.toLocal8Bit().constData(), "samplerate") == 0)
             return QVariant(fmt.frequency());
-        }       
     }
     return QVariant();
 }
@@ -150,17 +144,14 @@ void S60AudioEncoderControl::setEncodingOption(
 {
     TRACE("S60AudioEncoderControl::setEncodingOption" << qtThisPtr()
           << "codec" << codec << "name" << name << "value" << value);
-
     if (codec == "PCM") {
         QAudioFormat fmt = m_session->format();
-
-        if(qstrcmp(name.toLocal8Bit().constData(), "quality") == 0) {
+        if(qstrcmp(name.toLocal8Bit().constData(), "quality") == 0)
             setQuality((QtMultimediaKit::EncodingQuality)value.toInt(), fmt);
-        } else if(qstrcmp(name.toLocal8Bit().constData(), "channels") == 0) {
+        else if(qstrcmp(name.toLocal8Bit().constData(), "channels") == 0)
             fmt.setChannels(value.toInt());
-        } else if(qstrcmp(name.toLocal8Bit().constData(), "samplerate") == 0) {
+        else if(qstrcmp(name.toLocal8Bit().constData(), "samplerate") == 0)
             fmt.setFrequency(value.toInt());
-        }
         m_session->setFormat(fmt);
     }
 }
@@ -169,7 +160,6 @@ QList<int> S60AudioEncoderControl::supportedSampleRates(const QAudioEncoderSetti
 {
     if (continuous)
         *continuous = false;
-    
     return m_session->supportedAudioSampleRates(settings);       
 }
 
@@ -187,17 +177,15 @@ void S60AudioEncoderControl::setAudioSettings(const QAudioEncoderSettings &setti
           << "channelCount" << settings.channelCount()
           << "sampleRate" << settings.sampleRate()
           << "quality" << settings.quality());
-
     QAudioFormat fmt = m_session->format();
     if (settings.encodingMode() == QtMultimediaKit::ConstantQualityEncoding) {
         fmt.setCodec(settings.codec());
         setQuality(settings.quality(), fmt);
-        if (settings.sampleRate() > 0) {
+        if (settings.sampleRate() > 0)
             fmt.setFrequency(settings.sampleRate());
-        }
         if (settings.channelCount() > 0)
             fmt.setChannels(settings.channelCount());
-    }else {
+    } else {
         if (settings.sampleRate() == 8000) {
             fmt.setSampleType(QAudioFormat::UnSignedInt);
             fmt.setSampleSize(8);
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h
index df44b498df..0e77d00532 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h
@@ -63,7 +63,7 @@ public:
     QList<int> supportedSampleRates(const QAudioEncoderSettings &settings, bool *continuous = 0) const;
     
     QAudioEncoderSettings audioSettings() const;
-    void setAudioSettings(const QAudioEncoderSettings&);
+    void setAudioSettings(const QAudioEncoderSettings &settings);
     
     QStringList supportedEncodingOptions(const QString &codec) const;
     QVariant encodingOption(const QString &codec, const QString &name) const;
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
index ac2b02db59..558f03ace6 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
@@ -46,12 +46,12 @@
 #include <qaudiodeviceinfo.h>
 
 S60AudioEndpointSelector::S60AudioEndpointSelector(QObject *session, QObject *parent)
-    :QAudioEndpointSelector(parent)
+    : QAudioEndpointSelector(parent)
 {
     TRACE("S60AudioEndpointSelector::S60AudioEndpointSelector" << qtThisPtr());
     m_session = qobject_cast<S60AudioCaptureSession*>(session); 
-
-    connect(m_session, SIGNAL(activeEndpointChanged(const QString &)), this, SIGNAL(activeEndpointChanged(const QString &)));
+    connect(m_session, SIGNAL(activeEndpointChanged(const QString &)),
+            this, SIGNAL(activeEndpointChanged(const QString &)));
 }
 
 S60AudioEndpointSelector::~S60AudioEndpointSelector()
@@ -64,7 +64,7 @@ QList<QString> S60AudioEndpointSelector::availableEndpoints() const
     return m_session->availableEndpoints();
 }
 
-QString S60AudioEndpointSelector::endpointDescription(const QString& name) const
+QString S60AudioEndpointSelector::endpointDescription(const QString &name) const
 {
     return m_session->endpointDescription(name);
 }
@@ -79,7 +79,7 @@ QString S60AudioEndpointSelector::activeEndpoint() const
     return m_session->activeEndpoint();
 }
 
-void S60AudioEndpointSelector::setActiveEndpoint(const QString& name)
+void S60AudioEndpointSelector::setActiveEndpoint(const QString &name)
 {
     TRACE("S60AudioEndpointSelector::setActiveEndpoint" << qtThisPtr()
           << "name" << name);
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h
index f9668108bd..d565e957a4 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h
@@ -43,7 +43,6 @@
 #define S60AUDIOENDPOINTSELECTOR_H
 
 #include <QStringList>
-
 #include <qaudioendpointselector.h>
 
 QT_USE_NAMESPACE
@@ -52,24 +51,20 @@ class S60AudioCaptureSession;
 
 class S60AudioEndpointSelector : public QAudioEndpointSelector
 {
-
-Q_OBJECT
-
+    Q_OBJECT
 public:
     S60AudioEndpointSelector(QObject *session, QObject *parent = 0);
     ~S60AudioEndpointSelector();
 
     QList<QString> availableEndpoints() const;
-    QString endpointDescription(const QString& name) const;
+    QString endpointDescription(const QString &name) const;
     QString defaultEndpoint() const;
     QString activeEndpoint() const;
 
-    
 public Q_SLOTS:
-    void setActiveEndpoint(const QString& name);
+    void setActiveEndpoint(const QString &name);
 
 private:
-
     S60AudioCaptureSession* m_session;
 };
 
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
index 2c7c96e78e..a473a12d9c 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
@@ -44,14 +44,16 @@
 #include "s60mmtrace.h"
 
 S60AudioMediaRecorderControl::S60AudioMediaRecorderControl(QObject *session, QObject *parent)
-    :QMediaRecorderControl(parent), m_state(QMediaRecorder::StoppedState)
+    : QMediaRecorderControl(parent), m_state(QMediaRecorder::StoppedState)
 {
     TRACE("S60AudioMediaRecorderControl::S60AudioMediaRecorderControl" << qtThisPtr());
-
     m_session = qobject_cast<S60AudioCaptureSession*>(session);
-    connect(m_session, SIGNAL(positionChanged(qint64)), this, SIGNAL(durationChanged(qint64)));
-    connect(m_session, SIGNAL(stateChanged(S60AudioCaptureSession::TAudioCaptureState)), this, SLOT(updateState(S60AudioCaptureSession::TAudioCaptureState)));
-    connect(m_session,SIGNAL(error(int,const QString &)),this,SIGNAL(error(int,const QString &)));
+    connect(m_session, SIGNAL(positionChanged(qint64)),
+            this, SIGNAL(durationChanged(qint64)));
+    connect(m_session, SIGNAL(stateChanged(S60AudioCaptureSession::TAudioCaptureState)),
+            this, SLOT(updateState(S60AudioCaptureSession::TAudioCaptureState)));
+    connect(m_session,SIGNAL(error(int, const QString &)),
+            this, SIGNAL(error(int, const QString &)));
 }
 
 S60AudioMediaRecorderControl::~S60AudioMediaRecorderControl()
@@ -64,11 +66,10 @@ QUrl S60AudioMediaRecorderControl::outputLocation() const
     return m_session->outputLocation();
 }
 
-bool S60AudioMediaRecorderControl::setOutputLocation(const QUrl& sink)
+bool S60AudioMediaRecorderControl::setOutputLocation(const QUrl &sink)
 {
     TRACE("S60AudioMediaRecorderControl::setOutputLocation" << qtThisPtr()
           << "sink" << sink);
-
     return m_session->setOutputLocation(sink);
 }
 
@@ -116,21 +117,18 @@ qint64 S60AudioMediaRecorderControl::duration() const
 void S60AudioMediaRecorderControl::record()
 {
     TRACE("S60AudioMediaRecorderControl::record" << qtThisPtr());
-
     m_session->record();
 }
 
 void S60AudioMediaRecorderControl::pause()
 {
     TRACE("S60AudioMediaRecorderControl::pause" << qtThisPtr());
-
     m_session->pause();
 }
 
 void S60AudioMediaRecorderControl::stop()
 {
     TRACE("S60AudioMediaRecorderControl::stop" << qtThisPtr());
-
     m_session->stop();
 }
 
@@ -139,6 +137,11 @@ bool S60AudioMediaRecorderControl::isMuted() const
     return m_session->muted();
 }
 
+void S60AudioMediaRecorderControl::applySettings()
+{
+
+}
+
 void S60AudioMediaRecorderControl::setMuted(bool muted)
 {
     if (muted != isMuted()) {
diff --git a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h
index 1312050caa..d766111028 100644
--- a/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h
+++ b/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h
@@ -44,33 +44,25 @@
 
 #include <QtCore/qobject.h>
 #include <QUrl>
-
 #include "qmediarecorder.h"
 #include "qmediarecordercontrol.h"
-
 #include "s60audiocapturesession.h"
 
 QT_USE_NAMESPACE
 
-//class S60AudioCaptureSession;
-
 class S60AudioMediaRecorderControl : public QMediaRecorderControl
 {
     Q_OBJECT
 public:
-    S60AudioMediaRecorderControl(QObject *session,QObject *parent = 0);
+    S60AudioMediaRecorderControl(QObject *session, QObject *parent = 0);
     ~S60AudioMediaRecorderControl();
 
     QUrl outputLocation() const;
     bool setOutputLocation(const QUrl &sink);
-
     QMediaRecorder::State state() const;
-
     qint64 duration() const;
-
     bool isMuted() const;
-
-    void applySettings() {}
+    void applySettings();
 
 private:                    
     QMediaRecorder::State convertState(S60AudioCaptureSession::TAudioCaptureState aState) const;
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri b/plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri
index aef2145bd4..6786f1a2be 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri
@@ -35,6 +35,8 @@ HEADERS += \
     $$PWD/s60mediarecognizer.h \
     $$PWD/s60audioplayersession.h \
     $$PWD/s60mediaplayeraudioendpointselector.h \
+    $$PWD/s60mediaplayerutils.h \
+    $$PWD/s60mediasettings.h \
     $$PWD/s60mediastreamcontrol.h \
     $$PWD/s60medianetworkaccesscontrol.h
 
@@ -47,6 +49,8 @@ SOURCES += \
     $$PWD/s60mediarecognizer.cpp \
     $$PWD/s60audioplayersession.cpp \
     $$PWD/s60mediaplayeraudioendpointselector.cpp \
+    $$PWD/s60mediaplayerutils.cpp \
+    $$PWD/s60mediasettings.cpp \
     $$PWD/s60mediastreamcontrol.cpp \
     $$PWD/s60medianetworkaccesscontrol.cpp
 
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
index 82125da719..caa9384ec5 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
@@ -41,15 +41,6 @@
 
 #include "s60audioplayersession.h"
 #include "s60mmtrace.h"
-#include <QtCore/qdebug.h>
-#include <QtCore/qvariant.h>
-
-/*!
-    Constructs the CMdaAudioPlayerUtility object with given \a parent QObject.
-
-    And Registers for Audio Loading Notifications.
-
-*/
 
 S60AudioPlayerSession::S60AudioPlayerSession(QObject *parent)
     : S60MediaPlayerSession(parent)
@@ -57,22 +48,13 @@ S60AudioPlayerSession::S60AudioPlayerSession(QObject *parent)
     , m_audioEndpoint("Default")
 {
     TRACE("S60AudioPlayerSession::S60AudioPlayerSession" << qtThisPtr());
-
 #ifdef HAS_AUDIOROUTING
     m_audioOutput = 0;
-#endif //HAS_AUDIOROUTING    
+#endif
     QT_TRAP_THROWING(m_player = CAudioPlayer::NewL(*this, 0, EMdaPriorityPreferenceNone));
     m_player->RegisterForAudioLoadingNotification(*this);
 }
 
-
-/*!
-   Destroys the CMdaAudioPlayerUtility object.
-
-    And Unregister the observer.
-
-*/
-
 S60AudioPlayerSession::~S60AudioPlayerSession()
 {
     TRACE("S60AudioPlayerSession::~S60AudioPlayerSession" << qtThisPtr());
@@ -85,12 +67,6 @@ S60AudioPlayerSession::~S60AudioPlayerSession()
     delete m_player;
 }
 
-/*!
-
-   Opens the a file from \a path.
-
-*/
-
 void S60AudioPlayerSession::doLoadL(const TDesC &path)
 {
 #ifdef HAS_AUDIOROUTING
@@ -98,27 +74,21 @@ void S60AudioPlayerSession::doLoadL(const TDesC &path)
     if (m_audioOutput)
         m_audioOutput->UnregisterObserver(*this);
     delete m_audioOutput;
-    m_audioOutput = NULL;
-#endif //HAS_AUDIOROUTING
+    m_audioOutput = 0;
+#endif
     m_player->OpenFileL(path);
 }
 
-/*!
-
-  Returns the duration of the audio sample in microseconds.
-
-*/
+void S60AudioPlayerSession::doLoadUrlL(const TDesC &path)
+{
+    Q_UNUSED(path);
+}
 
 qint64 S60AudioPlayerSession::doGetDurationL() const
 {
     return m_player->Duration().Int64() / qint64(1000);
 }
 
-/*!
- *  Returns the current playback position in microseconds from the start of the clip.
-
-*/
-
 qint64 S60AudioPlayerSession::doGetPositionL() const
 {
     TTimeIntervalMicroSeconds ms = 0;
@@ -126,158 +96,85 @@ qint64 S60AudioPlayerSession::doGetPositionL() const
     return ms.Int64() / qint64(1000);
 }
 
-/*!
-   Returns TRUE if Video available or else FALSE
- */
-
 bool S60AudioPlayerSession::isVideoAvailable()
 {
     return false;
 }
 
-/*!
-   Returns TRUE if Audio available or else FALSE
- */
 bool S60AudioPlayerSession::isAudioAvailable()
 {
-    return true; // this is a bit happy scenario, but we do emit error that we can't play
+    return true;
 }
 
-/*!
-   Starts loading Media and sets media status to Buffering.
-
- */
-
 void S60AudioPlayerSession::MaloLoadingStarted()
 {
     TRACE("S60AudioPlayerSession::MaloLoadingStarted" << qtThisPtr());
-
     buffering();
 }
 
-
-/*!
-   Indicates loading Media is completed.
-
-   And sets media status to Buffered.
-
- */
-
 void S60AudioPlayerSession::MaloLoadingComplete()
 {
     TRACE("S60AudioPlayerSession::MaloLoadingComplete" << qtThisPtr());
-
     buffered();
 }
 
-/*!
-    Start or resume playing the current source.
-*/
-
 void S60AudioPlayerSession::doPlay()
 {
-    // For some reason loading progress callback are not called on emulator
-    // Same is the case with hardware. Will be fixed as part of QTMOBILITY-782.
-        
-    //#ifdef __WINSCW__
-        buffering();
-    //#endif
-        m_player->Play();
-    //#ifdef __WINSCW__
-        buffered();
-    //#endif
+    buffering();
+    m_player->Play();
+    buffered();
 }
 
-
-/*!
-    Pause playing the current source.
-*/
-
-
 void S60AudioPlayerSession::doPauseL()
 {
     m_player->Pause();
 }
 
-
-/*!
-
-    Stop playing, and reset the play position to the beginning.
-*/
-
 void S60AudioPlayerSession::doStop()
 {
     m_player->Stop();
 }
 
-/*!
-    Closes the current audio clip (allowing another clip to be opened)
-*/
-
 void S60AudioPlayerSession::doClose()
 {
 #ifdef HAS_AUDIOROUTING
     if (m_audioOutput) {
         m_audioOutput->UnregisterObserver(*this);
         delete m_audioOutput;
-        m_audioOutput = NULL;
+        m_audioOutput = 0;
     }
 #endif
     m_player->Close();
 }
 
-/*!
-
-    Changes the current playback volume to specified \a value.
-*/
-
 void S60AudioPlayerSession::doSetVolumeL(int volume)
 {
     m_player->SetVolume(volume * m_player->MaxVolume() / 100);
 }
 
-/*!
-    Sets the current playback position to \a microSeconds from the start of the clip.
-*/
-
 void S60AudioPlayerSession::doSetPositionL(qint64 microSeconds)
 {
     m_player->SetPosition(TTimeIntervalMicroSeconds(microSeconds));
 }
 
-/*!
-
-    Updates meta data entries in the current audio clip.
-*/
-
 void S60AudioPlayerSession::updateMetaDataEntriesL()
 {
     metaDataEntries().clear();
     int numberOfMetaDataEntries = 0;
-
-    //User::LeaveIfError(m_player->GetNumberOfMetaDataEntries(numberOfMetaDataEntries));
     m_player->GetNumberOfMetaDataEntries(numberOfMetaDataEntries);
-
-    for (int i = 0; i < numberOfMetaDataEntries; i++) {
-        CMMFMetaDataEntry *entry = NULL;
+    for (int i=0; i<numberOfMetaDataEntries; ++i) {
+        CMMFMetaDataEntry *entry = 0;
         entry = m_player->GetMetaDataEntryL(i);
-        metaDataEntries().insert(QString::fromUtf16(entry->Name().Ptr(), entry->Name().Length()), QString::fromUtf16(entry->Value().Ptr(), entry->Value().Length()));
+        metaDataEntries().insert(QString::fromUtf16(entry->Name().Ptr(), entry->Name().Length()),
+                                 QString::fromUtf16(entry->Value().Ptr(), entry->Value().Length()));
         delete entry;
     }
     emit metaDataChanged();
 }
 
-/*!
-    Sets the playbackRate with \a rate.
-*/
-
 void S60AudioPlayerSession::setPlaybackRate(qreal rate)
 {
     TRACE("S60AudioPlayerSession::setPlaybackRate" << qtThisPtr() << "rate" << rate);
-    /*Since AudioPlayerUtility doesn't support set playback rate hence
-     * setPlaybackRate emits playbackRateChanged signal for 1.0x ie normal playback.
-     * For all other playBackRates it sets and emits error signal.
-    */
     if (rate == 1.0) {
         emit playbackRateChanged(rate);
         return;
@@ -287,11 +184,6 @@ void S60AudioPlayerSession::setPlaybackRate(qreal rate)
     }
 }
 
-/*!
-
-    Returns the percentage of the audio clip loaded.
-*/
-
 int S60AudioPlayerSession::doGetBufferStatusL() const
 {
     int progress = 0;
@@ -299,16 +191,6 @@ int S60AudioPlayerSession::doGetBufferStatusL() const
     return progress;
 }
 
-/*!
-
-    Defines required client behaviour when an attempt to open and initialise an audio sample has completed,
-    successfully or not.
-
-    \a aError if KErrNone the sample is ready to play or else system wide error.
-
-    \a aDuration The duration of the audio sample.
-*/
-
 #ifdef S60_DRM_SUPPORTED
 void S60AudioPlayerSession::MdapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration)
 #else
@@ -316,15 +198,14 @@ void S60AudioPlayerSession::MapcInitComplete(TInt aError, const TTimeIntervalMic
 #endif
 {
     TRACE("S60AudioPlayerSession::MapcInitComplete" << qtThisPtr() << "error" << aError);
-
     Q_UNUSED(aDuration);
     setError(aError);
     if (KErrNone != aError)
         return;
 #ifdef HAS_AUDIOROUTING    
     TRAPD(err, 
-        m_audioOutput = CAudioOutput::NewL(*m_player);
-        m_audioOutput->RegisterObserverL(*this);
+          m_audioOutput = CAudioOutput::NewL(*m_player);
+          m_audioOutput->RegisterObserverL(*this);
     );
     setActiveEndpoint(m_audioEndpoint);
     setError(err);
@@ -333,14 +214,6 @@ void S60AudioPlayerSession::MapcInitComplete(TInt aError, const TTimeIntervalMic
         loaded();
 }
 
-/*!
-    Defines required client behaviour when an attempt to playback an audio sample has completed,
-    successfully or not.
-
-    \a aError if KErrNone the playback completed or else system wide error.
-*/
-
-
 #ifdef S60_DRM_SUPPORTED
 void S60AudioPlayerSession::MdapcPlayComplete(TInt aError)
 #else
@@ -348,29 +221,17 @@ void S60AudioPlayerSession::MapcPlayComplete(TInt aError)
 #endif
 {
     TRACE("S60AudioPlayerSession::MapcPlayComplete" << qtThisPtr() << "error" << aError);
-
     if (KErrNone == aError)
         endOfMedia();
     else
         setError(aError);
 }
 
-/*!
-    Defiens which Audio End point to use.
-
-    \a audioEndpoint audioEndpoint name.
-*/
-
-void S60AudioPlayerSession::doSetAudioEndpoint(const QString& audioEndpoint)
+void S60AudioPlayerSession::doSetAudioEndpoint(const QString &audioEndpoint)
 {
     m_audioEndpoint = audioEndpoint;
 }
 
-/*!
-
-    Returns audioEndpoint name.
-*/
-
 QString S60AudioPlayerSession::activeEndpoint() const
 {
     QString outputName = QString("Default");
@@ -383,10 +244,6 @@ QString S60AudioPlayerSession::activeEndpoint() const
     return outputName;
 }
 
-/*!
- *  Returns default Audio End point in use.
-*/
-
 QString S60AudioPlayerSession::defaultEndpoint() const
 {
     QString outputName = QString("Default");
@@ -399,17 +256,11 @@ QString S60AudioPlayerSession::defaultEndpoint() const
     return outputName;
 }
 
-/*!
-   Sets active end \a name as an Audio End point.
-*/
-
-void S60AudioPlayerSession::setActiveEndpoint(const QString& name)
+void S60AudioPlayerSession::setActiveEndpoint(const QString &name)
 {
     TRACE("S60AudioPlayerSession::setActiveEndpoint" << qtThisPtr() << "name" << name);
-
 #ifdef HAS_AUDIOROUTING
     CAudioOutput::TAudioOutputPreference output = CAudioOutput::ENoPreference;
-
     if (name == QString("Default"))
         output = CAudioOutput::ENoPreference;
     else if (name == QString("All"))
@@ -420,7 +271,6 @@ void S60AudioPlayerSession::setActiveEndpoint(const QString& name)
         output = CAudioOutput::EPrivate;
     else if (name == QString("Speaker"))
         output = CAudioOutput::EPublic;
-
     if (m_audioOutput) {
         TRAPD(err, m_audioOutput->SetAudioOutputL(output));
         setError(err);
@@ -428,34 +278,17 @@ void S60AudioPlayerSession::setActiveEndpoint(const QString& name)
 #endif
 }
 
-/*!
-    The default audio output has been changed.
-
-    \a aAudioOutput Audio Output object.
-
-    \a aNewDefault is CAudioOutput::TAudioOutputPreference.
-*/
-
-
 #ifdef HAS_AUDIOROUTING
 void S60AudioPlayerSession::DefaultAudioOutputChanged(CAudioOutput& aAudioOutput,
-                                        CAudioOutput::TAudioOutputPreference aNewDefault)
+                                                      CAudioOutput::TAudioOutputPreference aNewDefault)
 {
-    TRACE("S60AudioPlayerSession::DefaultAudioOutputChanged" << qtThisPtr() << "newDefault" << aNewDefault);
-
+    TRACE("S60AudioPlayerSession::DefaultAudioOutputChanged" << qtThisPtr()
+          << "newDefault" << aNewDefault);
     // Emit already implemented in setActiveEndpoint function
     Q_UNUSED(aAudioOutput)
     Q_UNUSED(aNewDefault)
 }
 
-
-/*!
-    Converts CAudioOutput::TAudioOutputPreference enum to QString.
-
-    \a output is  CAudioOutput::TAudioOutputPreference enum value.
-
-*/
-
 QString S60AudioPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::TAudioOutputPreference output) const
 {
     if (output == CAudioOutput::ENoPreference)
@@ -472,12 +305,7 @@ QString S60AudioPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::T
 }
 #endif
 
-/*!
-    Return True if its Seekable or else False.
-*/
-
 bool S60AudioPlayerSession::getIsSeekable() const
 {
-    return ETrue;
+    return true;
 }
-
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h
index 772d9fc9a7..a2dee6f517 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h
@@ -42,23 +42,22 @@
 #ifndef S60AUDIOPLAYERSESSION_H
 #define S60AUDIOPLAYERSESSION_H
 
-#include <QtCore/qobject.h>
 #include "s60mediaplayersession.h"
 
 #ifdef S60_DRM_SUPPORTED
-#include <drmaudiosampleplayer.h>
-typedef CDrmPlayerUtility CAudioPlayer;
-typedef MDrmAudioPlayerCallback MAudioPlayerObserver;
+#   include <drmaudiosampleplayer.h>
+    typedef CDrmPlayerUtility CAudioPlayer;
+    typedef MDrmAudioPlayerCallback MAudioPlayerObserver;
 #else
-#include <mdaaudiosampleplayer.h>
-typedef CMdaAudioPlayerUtility CAudioPlayer;
-typedef MMdaAudioPlayerCallback MAudioPlayerObserver;
+#   include <mdaaudiosampleplayer.h>
+    typedef CMdaAudioPlayerUtility CAudioPlayer;
+    typedef MMdaAudioPlayerCallback MAudioPlayerObserver;
 #endif
 
 #ifdef HAS_AUDIOROUTING
-#include <AudioOutput.h>
-#include <MAudioOutputObserver.h>
-#endif //HAS_AUDIOROUTING
+#   include <AudioOutput.h>
+#   include <MAudioOutputObserver.h>
+#endif
 
 class S60AudioPlayerSession : public S60MediaPlayerSession
                             , public MAudioPlayerObserver
@@ -72,32 +71,33 @@ public:
     S60AudioPlayerSession(QObject *parent);
     ~S60AudioPlayerSession();
     
-    //From S60MediaPlayerSession
+    // S60MediaPlayerSession
     bool isVideoAvailable();
     bool isAudioAvailable();
 
-    // From MAudioLoadingObserver
+    // MAudioLoadingObserver
     void MaloLoadingStarted();
     void MaloLoadingComplete();
     
 #ifdef HAS_AUDIOROUTING    
-    // From MAudioOutputObserver
-    void DefaultAudioOutputChanged( CAudioOutput& aAudioOutput,
-        CAudioOutput::TAudioOutputPreference aNewDefault );
-#endif //HAS_AUDIOROUTING    
+    // MAudioOutputObserver
+    void DefaultAudioOutputChanged(CAudioOutput& aAudioOutput,
+                                   CAudioOutput::TAudioOutputPreference aNewDefault);
+#endif
 
 public:
-    // From S60MediaPlayerAudioEndpointSelector
+    // S60MediaPlayerAudioEndpointSelector
     QString activeEndpoint() const;
     QString defaultEndpoint() const;
     void setPlaybackRate(qreal rate);
+
 public Q_SLOTS:
-    void setActiveEndpoint(const QString& name);
+    void setActiveEndpoint(const QString &name);
 
 protected:
-    //From S60MediaPlayerSession
+    // S60MediaPlayerSession
     void doLoadL(const TDesC &path);
-    void doLoadUrlL(const TDesC &path){Q_UNUSED(path)/*empty implementation*/}
+    void doLoadUrlL(const TDesC &path);
     void doPlay();
     void doStop();
     void doClose();
@@ -108,29 +108,30 @@ protected:
     void updateMetaDataEntriesL();
     int doGetBufferStatusL() const;
     qint64 doGetDurationL() const;
-    void doSetAudioEndpoint(const QString& audioEndpoint);
+    void doSetAudioEndpoint(const QString &audioEndpoint);
     bool getIsSeekable() const;
+
 private:
 #ifdef S60_DRM_SUPPORTED    
-    // From MMdaAudioPlayerCallback
+    // MMdaAudioPlayerCallback
     void MdapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration);
     void MdapcPlayComplete(TInt aError);
 #else
-    // From MDrmAudioPlayerCallback
+    // MDrmAudioPlayerCallback
     void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration);
     void MapcPlayComplete(TInt aError);
 #endif
     
 #ifdef HAS_AUDIOROUTING    
     QString qStringFromTAudioOutputPreference(CAudioOutput::TAudioOutputPreference output) const;
-#endif //HAS_AUDIOROUTING
+#endif
     
 private:
     CAudioPlayer *m_player;
 #ifdef HAS_AUDIOROUTING
     CAudioOutput *m_audioOutput;
-#endif //HAS_AUDIOROUTING
+#endif
     QString m_audioEndpoint;
 };
 
-#endif
+#endif // S60AUDIOPLAYERSESSION_H
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
index 2d23db0434..49d6656bb6 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
@@ -43,33 +43,20 @@
 #include "s60mediaplayercontrol.h"
 #include "s60mediaplayersession.h"
 #include "s60mmtrace.h"
-#include <QtCore/qdebug.h>
 
-/*!
- * Typecasts the \a control object to S60MediaPlayerControl object.
-*/
 S60MediaMetaDataProvider::S60MediaMetaDataProvider(QObject *control, QObject *parent)
     : QMetaDataReaderControl(parent)
-    , m_control(NULL)
+    , m_control(0)
 {
     TRACE("S60MediaMetaDataProvider::S60MediaMetaDataProvider" << qtThisPtr());
-
     m_control = qobject_cast<S60MediaPlayerControl*>(control);
 }
 
-/*!
- * Destructor
-*/
-
 S60MediaMetaDataProvider::~S60MediaMetaDataProvider()
 {
     TRACE("S60MediaMetaDataProvider::~S60MediaMetaDataProvider" << qtThisPtr());
 }
 
-/*!
- * Returns TRUE if MetaData is Available or else FALSE.
-*/
-
 bool S60MediaMetaDataProvider::isMetaDataAvailable() const
 {
     if (m_control->session())
@@ -77,18 +64,11 @@ bool S60MediaMetaDataProvider::isMetaDataAvailable() const
     return false;
 }
 
-/*!
- * Always returns FLASE.
-*/
 bool S60MediaMetaDataProvider::isWritable() const
 {
     return false;
 }
 
-/*!
- * Returns when \a key meta data is found in metaData.
-*/
-
 QVariant S60MediaMetaDataProvider::metaData(QtMultimediaKit::MetaData key) const
 {
     if (m_control->session())
@@ -96,10 +76,6 @@ QVariant S60MediaMetaDataProvider::metaData(QtMultimediaKit::MetaData key) const
     return QVariant();
 }
 
-/*!
- * Returns available metaData.
-*/
-
 QList<QtMultimediaKit::MetaData> S60MediaMetaDataProvider::availableMetaData() const
 {
     if (m_control->session())
@@ -107,10 +83,6 @@ QList<QtMultimediaKit::MetaData> S60MediaMetaDataProvider::availableMetaData() c
     return QList<QtMultimediaKit::MetaData>();
 }
 
-/*!
- * Returns when \a key string is found in extended metaData.
-*/
-
 QVariant S60MediaMetaDataProvider::extendedMetaData(const QString &key) const
 {
     if (m_control->session())
@@ -118,10 +90,6 @@ QVariant S60MediaMetaDataProvider::extendedMetaData(const QString &key) const
     return QVariant();
 }
 
-/*!
- * Returns available Extended MetaData.
-*/
-
 QStringList S60MediaMetaDataProvider::availableExtendedMetaData() const
 {
     if (m_control->session())
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h
index b7285c4ff6..4b97609844 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h
@@ -43,7 +43,6 @@
 #define S60MEDIAMETADATAPROVIDER_H
 
 #include <qmetadatareadercontrol.h>
-#include "s60mediaplayercontrol.h"
 
 QT_USE_NAMESPACE
 
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60medianetworkaccesscontrol.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60medianetworkaccesscontrol.cpp
index 1604fccc61..b88850c332 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60medianetworkaccesscontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60medianetworkaccesscontrol.cpp
@@ -48,19 +48,20 @@ S60MediaNetworkAccessControl::S60MediaNetworkAccessControl(QObject *parent)
     , m_iapId(KUseDefaultIap)
     , m_currentIndex(0)
 {
+
 }
 
 void S60MediaNetworkAccessControl::accessPointChanged(int id)
 {
-    if (!m_IapIdList.isEmpty())
-        m_NetworkObject = m_NetworkObjectList.at(m_IapIdList.indexOf(id));
-    emit configurationChanged(m_NetworkObject);
+    if (!m_iapIdList.isEmpty())
+        m_networkObject = m_networkObjectList.at(m_iapIdList.indexOf(id));
+    emit configurationChanged(m_networkObject);
 }
 
 S60MediaNetworkAccessControl::~S60MediaNetworkAccessControl()
 {
-    m_NetworkObjectList.clear();
-    m_IapIdList.clear();
+    m_networkObjectList.clear();
+    m_iapIdList.clear();
 }
 
 void S60MediaNetworkAccessControl::resetIndex()
@@ -74,44 +75,41 @@ void S60MediaNetworkAccessControl::setConfigurations(const QList<QNetworkConfigu
         m_currentIndex =0;
         TRAPD(error, retriveAccesspointIDL(configurations));
         if (error != KErrNone) {
-            m_NetworkObjectList.clear();
-            m_IapIdList.clear();
+            m_networkObjectList.clear();
+            m_iapIdList.clear();
         }
      }
 }
 
-TBool S60MediaNetworkAccessControl::isLastAccessPoint()
+bool S60MediaNetworkAccessControl::isLastAccessPoint()
 {
-    if (m_currentIndex == m_NetworkObjectList.size())
-        return TRUE;
+    if (m_currentIndex == m_networkObjectList.size())
+        return true;
     else
-        return FALSE;
+        return false;
 }
 
 int S60MediaNetworkAccessControl::accessPointId()
 {
-    if (m_IapIdList.isEmpty())
+    if (m_iapIdList.isEmpty())
         return m_iapId;
-
-    m_iapId = m_IapIdList.at(m_currentIndex);
-
+    m_iapId = m_iapIdList.at(m_currentIndex);
     if (isLastAccessPoint())
         m_currentIndex = 0;
     else
         m_currentIndex ++;
-
     return m_iapId;
 }
 
 QNetworkConfiguration S60MediaNetworkAccessControl::currentConfiguration() const
 {
-    return m_NetworkObject;
+    return m_networkObject;
 }
 
 void S60MediaNetworkAccessControl::retriveAccesspointIDL(const QList<QNetworkConfiguration> &configurationList)
 {
-     m_NetworkObjectList.clear();
-     m_IapIdList.clear();
+     m_networkObjectList.clear();
+     m_iapIdList.clear();
      TBuf<KBuffersize> iapName;
      TUint32 iapId;
      TInt err;
@@ -123,22 +121,22 @@ void S60MediaNetworkAccessControl::retriveAccesspointIDL(const QList<QNetworkCon
      // Open the IAP table
      CCommsDbTableView* view = commDB->OpenTableLC(TPtrC(IAP));
 
-     for (int i=0;i<=configurationList.size()- 1;i++) {
-     QString accesspointname = configurationList.at(i).name();
-     TBuf<KBuffersize> accesspointbuffer(accesspointname.utf16());
+     for (int i=0; i<=configurationList.size()- 1; ++i) {
+         QString accesspointname = configurationList.at(i).name();
+         TBuf<KBuffersize> accesspointbuffer(accesspointname.utf16());
          // Point to the first entry
          if (view->GotoFirstRecord() == KErrNone) {
-              do {
-                  view->ReadTextL(TPtrC(COMMDB_NAME), iapName);
-                  view->ReadUintL(TPtrC(COMMDB_ID), iapId);
-                  if (accesspointbuffer == iapName) {
-                      m_NetworkObjectList<<configurationList.at(i);
-                      m_IapIdList<<iapId;
-                  }
-                   // Store name and ID to where you want to
-               } while (err = view->GotoNextRecord(), err == KErrNone);
-           }
-      }
+             do {
+                 view->ReadTextL(TPtrC(COMMDB_NAME), iapName);
+                 view->ReadUintL(TPtrC(COMMDB_ID), iapId);
+                 if (accesspointbuffer == iapName) {
+                     m_networkObjectList << configurationList.at(i);
+                     m_iapIdList << iapId;
+                 }
+                 // Store name and ID to where you want to
+             } while (err = view->GotoNextRecord(), err == KErrNone);
+         }
+    }
     CleanupStack::PopAndDestroy(); // view
     CleanupStack::PopAndDestroy(); // commDB
 }
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60medianetworkaccesscontrol.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60medianetworkaccesscontrol.h
index 529d95f272..a1c7e7d5ee 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60medianetworkaccesscontrol.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60medianetworkaccesscontrol.h
@@ -39,19 +39,15 @@
 **
 ****************************************************************************/
 
-#ifndef S60MEDIANETWORKACCESSCONTROL_H_
-#define S60MEDIANETWORKACCESSCONTROL_H_
+#ifndef S60MEDIANETWORKACCESSCONTROL_H
+#define S60MEDIANETWORKACCESSCONTROL_H
 
-
-#include <QtCore/qobject.h>
-#include <QtCore/qlist.h>
-#include <QtCore/qstring.h>
-#include <qmetaobject.h>
-#include <QtNetwork/qnetworkconfiguration.h>
+#include <QtCore/QList>
+#include <QtNetwork/QNetworkConfiguration>
+#include <qmedianetworkaccesscontrol.h>
 #include <commdbconnpref.h>
 #include <commdb.h>
 #include <mmf/common/mmfcontrollerframeworkbase.h>
-#include <qmedianetworkaccesscontrol.h>
 #include "s60mediaplayercontrol.h"
 
 QT_BEGIN_NAMESPACE
@@ -63,27 +59,26 @@ QT_END_NAMESPACE
 class S60MediaNetworkAccessControl : public QMediaNetworkAccessControl
 {
     Q_OBJECT
-
 public:
-
     S60MediaNetworkAccessControl(QObject *parent = 0);
     ~S60MediaNetworkAccessControl();
 
     virtual void setConfigurations(const QList<QNetworkConfiguration> &configurations);
     virtual QNetworkConfiguration currentConfiguration() const;
     int accessPointId();
-    TBool isLastAccessPoint();
+    bool isLastAccessPoint();
     void resetIndex();
 
 public Q_SLOTS:
     void accessPointChanged(int);
 
 private:
-    void retriveAccesspointIDL(const QList<QNetworkConfiguration> &);
-    QList<int> m_IapIdList;
-    QList<QNetworkConfiguration> m_NetworkObjectList;
-    QNetworkConfiguration m_NetworkObject;
+    void retriveAccesspointIDL(const QList<QNetworkConfiguration> &accessPoint);
+    QList<int> m_iapIdList;
+    QList<QNetworkConfiguration> m_networkObjectList;
+    QNetworkConfiguration m_networkObject;
     int m_iapId;
     int m_currentIndex;
 };
-#endif /* S60MEDIANETWORKACCESSCONTROL_H_ */
+
+#endif // S60MEDIANETWORKACCESSCONTROL_H
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
index cdcc9f3841..c0885264d3 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
@@ -44,19 +44,11 @@
 #include "s60mediaplayeraudioendpointselector.h"
 #include "s60mmtrace.h"
 
-#include <QtGui/QIcon>
-#include <QtCore/QDebug>
-
-/*!
-    Constructs a new audio endpoint selector with the given \a parent.
-*/
-
 S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector(QObject *control, QObject *parent)
-   :QAudioEndpointSelector(parent)
+    : QAudioEndpointSelector(parent)
     , m_control(0)
 {
     TRACE("S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector" << qtThisPtr());
-
     m_control = qobject_cast<S60MediaPlayerControl*>(control);
     m_audioEndpointNames.append("Default");
     m_audioEndpointNames.append("All");
@@ -65,87 +57,66 @@ S60MediaPlayerAudioEndpointSelector::S60MediaPlayerAudioEndpointSelector(QObject
     m_audioEndpointNames.append("Speaker");
 }
 
-/*!
-    Destroys an audio endpoint selector.
-*/
-
 S60MediaPlayerAudioEndpointSelector::~S60MediaPlayerAudioEndpointSelector()
 {
     TRACE("S60MediaPlayerAudioEndpointSelector::~S60MediaPlayerAudioEndpointSelector" << qtThisPtr());
 }
 
-/*!
-    \return a list of available audio endpoints.
-*/
 
 QList<QString> S60MediaPlayerAudioEndpointSelector::availableEndpoints() const
 {
     return m_audioEndpointNames;
 }
 
-/*!
-    \return the description of the endpoint name.
-*/
-
 QString S60MediaPlayerAudioEndpointSelector::endpointDescription(const QString& name) const
 {
-    if (name == QString("Default")) //ENoPreference
+    if (name == QString("Default")) // ENoPreference
         return QString("Used to indicate that the playing audio can be routed to"
-            "any speaker. This is the default value for audio.");
-    else if (name == QString("All")) //EAll
+                       "any speaker. This is the default value for audio.");
+    else if (name == QString("All")) // EAll
         return QString("Used to indicate that the playing audio should be routed to all speakers.");
-    else if (name == QString("None")) //ENoOutput
+    else if (name == QString("None")) // ENoOutput
         return QString("Used to indicate that the playing audio should not be routed to any output.");
-    else if (name == QString("Earphone")) //EPrivate
+    else if (name == QString("Earphone")) // EPrivate
         return QString("Used to indicate that the playing audio should be routed to"
-            "the default private speaker. A private speaker is one that can only"
-            "be heard by one person.");
-    else if (name == QString("Speaker")) //EPublic
+                       "the default private speaker. A private speaker is one that can only"
+                       "be heard by one person.");
+    else if (name == QString("Speaker")) // EPublic
         return QString("Used to indicate that the playing audio should be routed to"
-            "the default public speaker. A public speaker is one that can "
-            "be heard by multiple people.");
-
+                       "the default public speaker. A public speaker is one that can "
+                       "be heard by multiple people.");
     return QString();
 }
 
-/*!
-    \return the name of the currently selected audio endpoint.
-*/
-
 QString S60MediaPlayerAudioEndpointSelector::activeEndpoint() const
 {
-    if (m_control->session()) {
+    if (m_control->session())
         return m_control->session()->activeEndpoint();
-    }
-    else {
+    else
         return m_control->mediaControlSettings().audioEndpoint();
-    }
 }
 
-/*!
-    \return the name of the default audio endpoint.
-*/
-
 QString S60MediaPlayerAudioEndpointSelector::defaultEndpoint() const
 {
-    if (m_control->session()) {
+    if (m_control->session())
         return m_control->session()->defaultEndpoint();
-    }
-    else {
+    else
         return m_control->mediaControlSettings().audioEndpoint();
-    }
 }
 
-/*!
-    Set the audio endpoint to \a name.
-*/
-
-void S60MediaPlayerAudioEndpointSelector::setActiveEndpoint(const QString& name)
+void S60MediaPlayerAudioEndpointSelector::setActiveEndpoint(const QString &name)
 {
     QString oldEndpoint = m_control->mediaControlSettings().audioEndpoint();
 
-    if (name != oldEndpoint && (name == QString("Default") || name == QString("All") ||
-        name == QString("None") || name == QString("Earphone") || name == QString("Speaker"))) {
+    if (name != oldEndpoint &&
+           (
+              name == QString("Default")
+           || name == QString("All")
+           || name == QString("None")
+           || name == QString("Earphone")
+           || name == QString("Speaker")
+           )
+        ) {
         TRACE("S60MediaPlayerAudioEndpointSelector::setActiveEndpoint" << qtThisPtr()
               << "name" << name);
         if (m_control->session()) {
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h
index 9f0fcfe4e6..4f726259eb 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h
@@ -42,8 +42,8 @@
 #ifndef S60MEDIAPLAYERAUDIOENDPOINTSELECTOR_H
 #define S60MEDIAPLAYERAUDIOENDPOINTSELECTOR_H
 
-#include <QStringList>
-
+#include <QtCore/QList>
+#include <QtCore/QString>
 #include <qaudioendpointselector.h>
 
 QT_USE_NAMESPACE
@@ -53,20 +53,18 @@ class S60MediaPlayerSession;
 
 class S60MediaPlayerAudioEndpointSelector : public QAudioEndpointSelector
 {
-
-Q_OBJECT
-
+    Q_OBJECT
 public:
     S60MediaPlayerAudioEndpointSelector(QObject *control, QObject *parent = 0);
     ~S60MediaPlayerAudioEndpointSelector();
 
     QList<QString> availableEndpoints() const ;
-    QString endpointDescription(const QString& name) const;
+    QString endpointDescription(const QString &name) const;
     QString defaultEndpoint() const;
     QString activeEndpoint() const;
 
 public Q_SLOTS:
-    void setActiveEndpoint(const QString& name);
+    void setActiveEndpoint(const QString &name);
 
 private:
     S60MediaPlayerControl* m_control;
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
index cb7b556867..6b88198706 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
@@ -1,4 +1,3 @@
-
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -40,40 +39,27 @@
 **
 ****************************************************************************/
 
+#include <QtCore/QDir>
+#include <QtCore/QUrl>
 #include "s60mediaplayercontrol.h"
 #include "s60mediaplayersession.h"
 #include "s60mmtrace.h"
 
-#include <QtCore/qdir.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qdebug.h>
-
-/*!
-    Constructs a new media player control with the given \a parent.
-*/
-
 S60MediaPlayerControl::S60MediaPlayerControl(S60MediaPlayerService *service)
-    : QMediaPlayerControl(service),
-      m_service(service),
-      m_session(NULL),
-      m_stream(NULL)
+    : QMediaPlayerControl(service)
+    , m_service(service)
+    , m_session(0)
+    , m_stream(0)
+    , m_mediaSettings(new S60MediaSettings(this))
 {
     TRACE("S60MediaPlayerControl::S60MediaPlayerControl" << qtThisPtr());
 }
 
-/*!
-    Destroys a media player control.
-*/
-
 S60MediaPlayerControl::~S60MediaPlayerControl()
 {
     TRACE("S60MediaPlayerControl::~S60MediaPlayerControl" << qtThisPtr());
 }
 
-/*!
-    \return the current playback position in milliseconds.
-*/
-
 qint64 S60MediaPlayerControl::position() const
 {
     if (m_session)
@@ -81,10 +67,6 @@ qint64 S60MediaPlayerControl::position() const
     return 0;
 }
 
-/*!
-   \return the duration of the current media in milliseconds.
-*/
-
 qint64 S60MediaPlayerControl::duration() const
 {
     if (m_session)
@@ -92,10 +74,6 @@ qint64 S60MediaPlayerControl::duration() const
     return -1;
 }
 
-/*!
-    \return the state of a player control.
-*/
-
 QMediaPlayer::State S60MediaPlayerControl::state() const
 {
     if (m_session)
@@ -103,22 +81,13 @@ QMediaPlayer::State S60MediaPlayerControl::state() const
     return QMediaPlayer::StoppedState;
 }
 
-/*!
-    \return the status of the current media.
-*/
-
 QMediaPlayer::MediaStatus S60MediaPlayerControl::mediaStatus() const
 {
     if (m_session)
         return m_session->mediaStatus();
-    return m_mediaSettings.mediaStatus();
+    return m_mediaSettings->mediaStatus();
 }
 
-/*!
-    \return the buffering progress of the current media.  Progress is measured in the percentage
-    of the buffer filled.
-*/
-
 int S60MediaPlayerControl::bufferStatus() const
 {
     if (m_session)
@@ -126,230 +95,132 @@ int S60MediaPlayerControl::bufferStatus() const
     return 0;
 }
 
-/*!
-    \return the audio volume of a player control.
-*/
-
 int S60MediaPlayerControl::volume() const
 {
     if (m_session)
         return m_session->volume();
-    return m_mediaSettings.volume();
+    return m_mediaSettings->volume();
 }
 
-/*!
-    \return the mute state of a player control.
-*/
-
 bool S60MediaPlayerControl::isMuted() const
 {
    if (m_session)
-       return  m_session->isMuted();
-   return m_mediaSettings.isMuted();
+       return m_session->isMuted();
+   return m_mediaSettings->isMuted();
 }
 
-/*!
-    Identifies if the current media is seekable.
-
-    \return true if it possible to seek within the current media, and false otherwise.
-*/
-
 bool S60MediaPlayerControl::isSeekable() const
 {
     if (m_session)
-       return  m_session->isSeekable();
+       return m_session->isSeekable();
     return false;
 }
 
-/*!
-    \return a range of times in milliseconds that can be played back.
-
-    Usually for local files this is a continuous interval equal to [0..duration()]
-    or an empty time range if seeking is not supported, but for network sources
-    it refers to the buffered parts of the media.
-*/
-
 QMediaTimeRange S60MediaPlayerControl::availablePlaybackRanges() const
 {
     QMediaTimeRange ranges;
-
-    if(m_session && m_session->isSeekable())
+    if (m_session && m_session->isSeekable())
         ranges.addInterval(0, m_session->duration());
-
     return ranges;
 }
 
-/*!
-    \return the rate of playback.
-*/
-
 qreal S60MediaPlayerControl::playbackRate() const
 {
-    return m_mediaSettings.playbackRate();
+    return m_mediaSettings->playbackRate();
 }
 
-/*!
-    Sets the \a rate of playback.
-*/
-
 void S60MediaPlayerControl::setPlaybackRate(qreal rate)
 {
     TRACE("S60MediaPlayerControl::setPlaybackRate" << qtThisPtr() << "rate" << rate);
-
-    //getting the current playbackrate
-    qreal currentPBrate = m_mediaSettings.playbackRate();
-    //checking if we need to change the Playback rate
-    if (!qFuzzyCompare(currentPBrate,rate))
+    qreal currentRate = m_mediaSettings->playbackRate();
+    if (!qFuzzyCompare(currentRate, rate))
     {
-        if(m_session)
+        if (m_session)
             m_session->setPlaybackRate(rate);
-
-        m_mediaSettings.setPlaybackRate(rate);
+        m_mediaSettings->setPlaybackRate(rate);
     }
 }
 
-/*!
-    Sets the playback \a pos of the current media.  This will initiate a seek and it may take
-    some time for playback to reach the position set.
-*/
-
 void S60MediaPlayerControl::setPosition(qint64 pos)
 {
     TRACE("S60MediaPlayerControl::setPosition" << qtThisPtr() << "pos" << pos);
-
     if (m_session)
         m_session->setPosition(pos);
 }
 
-/*!
-    Starts playback of the current media.
-
-    If successful the player control will immediately enter the \l {QMediaPlayer::PlayingState}
-    {playing} state.
-*/
-
 void S60MediaPlayerControl::play()
 {
     TRACE("S60MediaPlayerControl::play" << qtThisPtr());
-
     if (m_session)
         m_session->play();
 }
 
-/*!
-    Pauses playback of the current media.
-
-    If sucessful the player control will immediately enter the \l {QMediaPlayer::PausedState}
-    {paused} state.
-*/
-
 void S60MediaPlayerControl::pause()
 {
     TRACE("S60MediaPlayerControl::pause" << qtThisPtr());
-
     if (m_session)
         m_session->pause();
 }
 
-/*!
-    Stops playback of the current media.
-
-    If successful the player control will immediately enter the \l {QMediaPlayer::StoppedState}
-    {stopped} state.
-*/
-
 void S60MediaPlayerControl::stop()
 {
     TRACE("S60MediaPlayerControl::stop" << qtThisPtr());
-
     if (m_session)
         m_session->stop();
 }
 
-/*!
-    Sets the audio \a volume of a player control.
-*/
-
 void S60MediaPlayerControl::setVolume(int volume)
 {
     int boundVolume = qBound(0, volume, 100);
-    if (boundVolume == m_mediaSettings.volume())
+    if (boundVolume == m_mediaSettings->volume())
         return;
-
     TRACE("S60MediaPlayerControl::setVolume" << qtThisPtr()
           << "volume" << volume << "boundVolume" << boundVolume);
-
-    m_mediaSettings.setVolume(boundVolume);
-
+    m_mediaSettings->setVolume(boundVolume);
     if (m_session)
         m_session->setVolume(boundVolume);
 }
 
-/*!
-    Sets the \a muted state of a player control.
-*/
-
 void S60MediaPlayerControl::setMuted(bool muted)
 {
-    if (m_mediaSettings.isMuted() == muted)
+    if (m_mediaSettings->isMuted() == muted)
         return;
-
     TRACE("S60MediaPlayerControl::setMuted" << qtThisPtr() << "muted" << muted);
-
-    m_mediaSettings.setMuted(muted);
-
+    m_mediaSettings->setMuted(muted);
     if (m_session)
         m_session->setMuted(muted);
 }
 
-/*!
- * \return the current media source.
-*/
-
 QMediaContent S60MediaPlayerControl::media() const
 {
     return m_media;
 }
 
-/*!
-    \return the current media stream. This is only a valid if a stream was passed to setMedia().
-
-    \sa setMedia()
-*/
-
 const QIODevice *S60MediaPlayerControl::mediaStream() const
 {
     return m_stream;
 }
 
-/*!
-     Sets the current \a source media source.  If a \a stream is supplied; data will be read from that
-    instead of attempting to resolve the media source.  The media source may still be used to
-    supply media information such as mime type.
-
-    Setting the media to a null QMediaContent will cause the control to discard all
-    information relating to the current media source and to cease all I/O operations related
-    to that media.
-*/
-
 void S60MediaPlayerControl::setMedia(const QMediaContent &source, QIODevice *stream)
 {
     TRACE("S60MediaPlayerControl::setMedia" << qtThisPtr()
           << "source" << source.canonicalUrl().toString());
     Q_UNUSED(stream)
-    if (m_session && (m_media == source)) {
+    if (m_session && (m_media == source)&& !source.canonicalUrl().isEmpty()) {
         if (m_session->isStreaming())
             m_session->load(source);
     } else {
+        if (!source.canonicalUrl().isEmpty()) {
         delete m_session;
         m_session = 0;
         m_session = m_service->createPlayerSession(source);
+        }
         QMediaPlayer::MediaStatus mediaStatus = QMediaPlayer::NoMedia;
         if (m_session && !source.canonicalUrl().isEmpty()) {
             m_session->load(source);
             mediaStatus = m_session->mediaStatus();
         }
-        m_mediaSettings.setMediaStatus(mediaStatus);
+        m_mediaSettings->setMediaStatus(mediaStatus);
     }
     emit stateChanged(QMediaPlayer::StoppedState);
     if (m_media != source) {
@@ -358,42 +229,32 @@ void S60MediaPlayerControl::setMedia(const QMediaContent &source, QIODevice *str
     }
 }
 
-/*!
- * \return media player session.
-*/
 S60MediaPlayerSession* S60MediaPlayerControl::session()
 {
     return m_session;
 }
 
-/*!
- *   Sets \a output as a VideoOutput.
-*/
-
 void S60MediaPlayerControl::setVideoOutput(QObject *output)
 {
     TRACE("S60MediaPlayerControl::setVideoOutput" << qtThisPtr()
           << "output" << output);
-    m_mediaSettings.setVideoOutput(output);
+    m_mediaSettings->setVideoOutput(output);
     if (m_session)
         m_session->setVideoRenderer(output);
 }
 
-/*!
- * \return TRUE if Audio available or else FALSE.
-*/
+QObject *S60MediaPlayerControl::videoOutput() const
+{
+    return m_mediaSettings->videoOutput();
+}
 
 bool S60MediaPlayerControl::isAudioAvailable() const
 {
     if (m_session)
-        return m_session->isAudioAvailable(); 
+        return m_session->isAudioAvailable();
     return false;
 }
 
-/*!
- * \return TRUE if Video available or else FALSE.
-*/
-
 bool S60MediaPlayerControl::isVideoAvailable() const
 {
     if (m_session)
@@ -401,36 +262,22 @@ bool S60MediaPlayerControl::isVideoAvailable() const
     return false;
 }
 
-/*!
- * \return media settings.
- *
- * Media Settings include volume, muted, playbackRate, mediaStatus, audioEndpoint.
-*/
-const S60MediaSettings& S60MediaPlayerControl::mediaControlSettings() const
+const S60MediaSettings &S60MediaPlayerControl::mediaControlSettings() const
 {
-    return m_mediaSettings;
+    return *m_mediaSettings;
 }
 
-/*!
- * Set the audio endpoint to \a name.
-*/
-
-void S60MediaPlayerControl::setAudioEndpoint(const QString& name)
+void S60MediaPlayerControl::setAudioEndpoint(const QString &name)
 {
     TRACE("S60MediaPlayerControl::setAudioEndpoint" << qtThisPtr()
           << "name" << name);
-
-    m_mediaSettings.setAudioEndpoint(name);
+    m_mediaSettings->setAudioEndpoint(name);
 }
 
-/*!
- *  Sets media type \a type as Unknown, Video, Audio, Data.
-*/
-
-void S60MediaPlayerControl::setMediaType(S60MediaSettings::TMediaType type)
+void S60MediaPlayerControl::setMediaType(S60MediaSettings::MediaType type)
 {
     TRACE("S60MediaPlayerControl::setMediaType" << qtThisPtr()
           << "type" << type);
-
-    m_mediaSettings.setMediaType(type);
+    m_mediaSettings->setMediaType(type);
 }
+
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h
index e929a6ed09..3356170981 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h
@@ -42,11 +42,8 @@
 #ifndef S60MEDIAPLAYERCONTROL_H
 #define S60MEDIAPLAYERCONTROL_H
 
-#include <QtCore/qobject.h>
-
 #include <qmediaplayercontrol.h>
-
-#include <QtCore/qdebug.h>
+#include "s60mediasettings.h"
 
 QT_BEGIN_NAMESPACE
 class QMediaPlayer;
@@ -59,48 +56,6 @@ QT_USE_NAMESPACE
 class S60MediaPlayerSession;
 class S60MediaPlayerService;
 
-class S60MediaSettings
-{
-
-public:
-    S60MediaSettings() 
-        : m_volume(30)
-        , m_muted(false)
-        , m_playbackRate(0)
-        , m_mediaStatus(QMediaPlayer::NoMedia)
-        , m_audioEndpoint(QString("Default"))
-        , m_videoOutput(0)
-    {
-    }
-    
-    enum TMediaType {Unknown, Video, Audio, Data};
-
-    void setVolume(int volume) { m_volume = volume; }
-    void setMuted(bool muted) { m_muted = muted; }
-    void setPlaybackRate(qreal rate) { m_playbackRate = rate; }
-    void setMediaStatus(QMediaPlayer::MediaStatus status) {m_mediaStatus=status;}
-    void setAudioEndpoint(const QString& audioEndpoint) { m_audioEndpoint = audioEndpoint; }
-    void setMediaType(S60MediaSettings::TMediaType type) { m_mediaType = type; }
-    void setVideoOutput(QObject *value) { m_videoOutput = value; }
-    
-    int volume() const { return m_volume; }
-    bool isMuted() const { return m_muted; }
-    qreal playbackRate() const { return m_playbackRate; }
-    QMediaPlayer::MediaStatus mediaStatus() const {return m_mediaStatus;}
-    QString audioEndpoint() const { return m_audioEndpoint; }
-    S60MediaSettings::TMediaType mediaType() const { return m_mediaType; }
-    QObject *videoOutput() const { return m_videoOutput; }
-    
-private:
-    int m_volume;
-    bool m_muted;
-    qreal m_playbackRate;
-    QMediaPlayer::MediaStatus m_mediaStatus;
-    QString m_audioEndpoint;
-    S60MediaSettings::TMediaType m_mediaType;
-    QObject *m_videoOutput;
-};
-
 class S60MediaPlayerControl : public QMediaPlayerControl
 {
     Q_OBJECT
@@ -109,43 +64,44 @@ public:
     S60MediaPlayerControl(S60MediaPlayerService *service);
     ~S60MediaPlayerControl();
 
-    // from QMediaPlayerControl
-    virtual QMediaPlayer::State state() const;
-    virtual QMediaPlayer::MediaStatus mediaStatus() const;
-    virtual qint64 duration() const;
-    virtual qint64 position() const;
-    virtual void setPosition(qint64 pos);
-    virtual int volume() const;
-    virtual void setVolume(int volume);
-    virtual bool isMuted() const;
-    virtual void setMuted(bool muted);
-    virtual int bufferStatus() const;
-    virtual bool isAudioAvailable() const;
-    virtual bool isVideoAvailable() const;
-    virtual bool isSeekable() const;
-    virtual QMediaTimeRange availablePlaybackRanges() const;
-    virtual qreal playbackRate() const;
-    virtual void setPlaybackRate(qreal rate);
-    virtual QMediaContent media() const;
-    virtual const QIODevice *mediaStream() const;
-    virtual void setMedia(const QMediaContent&, QIODevice *);
-    virtual void play();
-    virtual void pause();
-    virtual void stop();
+    // QMediaPlayerControl
+    QMediaPlayer::State state() const;
+    QMediaPlayer::MediaStatus mediaStatus() const;
+    qint64 duration() const;
+    qint64 position() const;
+    void setPosition(qint64 pos);
+    int volume() const;
+    void setVolume(int volume);
+    bool isMuted() const;
+    void setMuted(bool muted);
+    int bufferStatus() const;
+    bool isAudioAvailable() const;
+    bool isVideoAvailable() const;
+    bool isSeekable() const;
+    QMediaTimeRange availablePlaybackRanges() const;
+    qreal playbackRate() const;
+    void setPlaybackRate(qreal rate);
+    QMediaContent media() const;
+    const QIODevice *mediaStream() const;
+    void setMedia(const QMediaContent &source, QIODevice *device);
+    void play();
+    void pause();
+    void stop();
 
     // Own methods
     S60MediaPlayerSession* session();
     void setVideoOutput(QObject *output);
+    QObject *videoOutput() const;
     const S60MediaSettings& mediaControlSettings() const;
-    void setAudioEndpoint(const QString& name);
-    void setMediaType(S60MediaSettings::TMediaType type);
+    void setAudioEndpoint(const QString &name);
+    void setMediaType(S60MediaSettings::MediaType type);
 
 private:
     S60MediaPlayerService *m_service;
     S60MediaPlayerSession *m_session;
     QMediaContent m_media;
     QIODevice *m_stream;
-    S60MediaSettings m_mediaSettings;
+    S60MediaSettings *m_mediaSettings;
 };
 
 #endif
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
index 7b32d8de28..0a7c1a12d9 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
@@ -42,130 +42,83 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qdebug.h>
 #include <QtGui/qwidget.h>
-
+#include <qmediaplaylistnavigator.h>
+#include <qmediaplaylist.h>
 #include "s60mediaplayerservice.h"
 #include "s60mediaplayercontrol.h"
 #include "s60videoplayersession.h"
 #include "s60audioplayersession.h"
 #include "s60mediametadataprovider.h"
 #include "s60mediarecognizer.h"
-#include "s60videowidgetcontrol.h"
-#include "s60videowindowcontrol.h"
+#include "s60videooutputfactory.h"
 #include "s60mediaplayeraudioendpointselector.h"
 #include "s60medianetworkaccesscontrol.h"
 #include "s60mediastreamcontrol.h"
 #include "s60mmtrace.h"
 
-#include <qmediaplaylistnavigator.h>
-#include <qmediaplaylist.h>
-
-/*!
-    Construct a media service with the given \a parent.
-*/
-
 S60MediaPlayerService::S60MediaPlayerService(QObject *parent)
     : QMediaService(parent)
-    , m_control(NULL)
-    , m_metaData(NULL)
-    , m_audioEndpointSelector(NULL)
-    , m_streamControl(NULL)
-    , m_networkAccessControl(NULL)
-    , m_videoOutput(NULL)
+    , m_control(0)
+    , m_metaData(0)
+    , m_audioEndpointSelector(0)
+    , m_streamControl(0)
+    , m_networkAccessControl(0)
+    , m_videoOutputFactory(0)
 {
     TRACE("S60MediaPlayerService::S60MediaPlayerService" << qtThisPtr());
-
     m_control = new S60MediaPlayerControl(this);
     m_metaData = new S60MediaMetaDataProvider(m_control, this);
     m_audioEndpointSelector = new S60MediaPlayerAudioEndpointSelector(m_control, this);
     m_streamControl = new S60MediaStreamControl(m_control, this);
     m_networkAccessControl =  new S60MediaNetworkAccessControl(this);
+    m_videoOutputFactory = new S60VideoOutputFactory(this);
 }
 
-/*!
-    Destroys a media service.
-*/
-
 S60MediaPlayerService::~S60MediaPlayerService()
 {
     TRACE("S60MediaPlayerService::~S60MediaPlayerService" << qtThisPtr());
 }
 
-/*!
-    \return a pointer to the media control, which matches the controller \a name.
-
-    If the service does not implement the control, or if it is unavailable a
-    null pointer is returned instead.
-
-    Controls must be returned to the service when no longer needed using the
-    releaseControl() function.
-*/
-
 QMediaControl *S60MediaPlayerService::requestControl(const char *name)
 {
     QMediaControl *result = 0;
-
     if (qstrcmp(name, QMediaPlayerControl_iid) == 0)
         result = m_control;
-
     if (qstrcmp(name, QMediaNetworkAccessControl_iid) == 0)
         result = m_networkAccessControl;
-
     if (qstrcmp(name, QMetaDataReaderControl_iid) == 0)
         result = m_metaData;
-
     if (qstrcmp(name, QAudioEndpointSelector_iid) == 0)
         result = m_audioEndpointSelector;
-
     if (qstrcmp(name, QMediaStreamsControl_iid) == 0)
         result = m_streamControl;
 
-    if (!m_videoOutput) {
-        if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
-            m_videoOutput = new S60VideoWidgetControl(this);
-        }
-        else if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
-            m_videoOutput = new S60VideoWindowControl(this);
-        }
-
-        if (m_videoOutput) {
-            m_control->setVideoOutput(m_videoOutput);
-            result = m_videoOutput;
-        }
-    }else {
-        if (qstrcmp(name, QVideoWidgetControl_iid) == 0 ||
-            qstrcmp(name, QVideoWindowControl_iid) == 0){
-            result = m_videoOutput;
-        }
+    if (!result) {
+        result = m_videoOutputFactory->requestControl(name);
+        if (result)
+            m_control->setVideoOutput(result);
     }
+
     TRACE("S60MediaPlayerService::requestControl" << qtThisPtr()
           << "name" << name << "result" << result);
     return result;
 }
 
-/*!
-    Releases a \a control back to the service.
-*/
-
 void S60MediaPlayerService::releaseControl(QMediaControl *control)
 {
     TRACE("S60MediaPlayerService::releaseControl" << qtThisPtr()
           << "control" << control);
 
-    if (control == m_videoOutput) {
-        m_videoOutput = 0;
-        m_control->setVideoOutput(m_videoOutput);
-    }
+    if (m_control->videoOutput() == control)
+        m_control->setVideoOutput(0);
+    m_videoOutputFactory->releaseControl(control);
 }
 
-/*!
- * \return media player session(audio playersesion/video playersession)
- *  by recognizing whether media is audio or video and sets it on media type.
-*/
 S60MediaPlayerSession* S60MediaPlayerService::createPlayerSession(const QMediaContent &content)
 {
     QUrl url = content.canonicalUrl();
     S60MediaPlayerSession *session = 0;
-    S60MediaSettings::TMediaType mediaType = S60MediaSettings::Unknown;
+    S60MediaSettings::MediaType mediaType = S60MediaSettings::Unknown;
     if (!url.isEmpty()) {
         S60MediaRecognizer *recognizer = new S60MediaRecognizer;
         const S60MediaRecognizer::MediaType recognizerMediaType = recognizer->mediaType(url);
@@ -186,16 +139,9 @@ S60MediaPlayerSession* S60MediaPlayerService::createPlayerSession(const QMediaCo
     return session;
 }
 
-/*!
- *  \return media playersession (videoplayersession).
- *  constructs the videoplayersession object and connects all the respective signals and slots.
- *  and initialises all the media settings.
-*/
-
 S60MediaPlayerSession* S60MediaPlayerService::createVideoPlayerSession()
 {
     S60VideoPlayerSession *session = new S60VideoPlayerSession(this, m_networkAccessControl);
-
     connect(session, SIGNAL(positionChanged(qint64)),
             m_control, SIGNAL(positionChanged(qint64)));
     connect(session, SIGNAL(playbackRateChanged(qreal)),
@@ -230,25 +176,16 @@ S60MediaPlayerSession* S60MediaPlayerService::createVideoPlayerSession()
             m_streamControl, SLOT(handleStreamsChanged()));
     connect(session, SIGNAL(accessPointChanged(int)),
             m_networkAccessControl, SLOT(accessPointChanged(int)));
-
     session->setVolume(m_control->mediaControlSettings().volume());
     session->setMuted(m_control->mediaControlSettings().isMuted());
     session->setAudioEndpoint(m_control->mediaControlSettings().audioEndpoint());
     session->setVideoRenderer(m_control->mediaControlSettings().videoOutput());
-
     return session;
 }
 
-/*!
- *  \return media playersession (audioplayersession).
- *  constructs the audioplayersession object and connects all the respective signals and slots.
- *  and initialises all the media settings.
-*/
-
 S60MediaPlayerSession* S60MediaPlayerService::createAudioPlayerSession()
 {
     S60AudioPlayerSession *session = new S60AudioPlayerSession(this);
-
     connect(session, SIGNAL(positionChanged(qint64)),
             m_control, SIGNAL(positionChanged(qint64)));
     connect(session, SIGNAL(playbackRateChanged(qreal)),
@@ -281,10 +218,9 @@ S60MediaPlayerSession* S60MediaPlayerService::createAudioPlayerSession()
             m_audioEndpointSelector, SIGNAL(activeEndpointChanged(const QString&)));
     connect(session, SIGNAL(mediaChanged()),
             m_streamControl, SLOT(handleStreamsChanged()));
-
     session->setVolume(m_control->mediaControlSettings().volume());
     session->setMuted(m_control->mediaControlSettings().isMuted());
     session->setAudioEndpoint(m_control->mediaControlSettings().audioEndpoint());
-
     return session;
 }
+
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h
index 4b2685a94b..54e772dd9e 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h
@@ -44,7 +44,6 @@
 
 #include <QtCore/qobject.h>
 #include <qmediaservice.h>
-
 #include "s60mediaplayeraudioendpointselector.h"
 
 QT_BEGIN_NAMESPACE
@@ -61,20 +60,19 @@ class S60MediaPlayerControl;
 class S60MediaMetaDataProvider;
 class S60MediaStreamControl;
 class S60MediaRecognizer;
-
+class S60MediaNetworkAccessControl;
+class S60VideoOutputFactory;
 class QMediaContent;
 class QMediaPlaylistNavigator;
-class S60MediaNetworkAccessControl;
 
 class S60MediaPlayerService : public QMediaService
 {
     Q_OBJECT
-
 public:
-
     S60MediaPlayerService(QObject *parent = 0);
     ~S60MediaPlayerService();
 
+    // QMediaService
     QMediaControl *requestControl(const char *name);
     void releaseControl(QMediaControl *control);
 
@@ -90,7 +88,7 @@ private:
     S60MediaPlayerAudioEndpointSelector *m_audioEndpointSelector;
     S60MediaStreamControl *m_streamControl;
     S60MediaNetworkAccessControl *m_networkAccessControl;
-    QMediaControl *m_videoOutput;
+    S60VideoOutputFactory *m_videoOutputFactory;
 };
 
 #endif
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
index 3cef38b3f8..79638d00eb 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
@@ -39,19 +39,13 @@
 **
 ****************************************************************************/
 
-#include "s60mediaplayersession.h"
-#include "s60mmtrace.h"
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qvariant.h>
-#include <QtCore/qtimer.h>
+#include <QtCore/QDir>
+#include <QtCore/QTimer>
 #include <mmf/common/mmferrors.h>
 #include <qmediatimerange.h>
-
-/*!
-    Construct a media playersession with the given \a parent.
-*/
+#include "s60mediaplayersession.h"
+#include "s60mediaplayerutils.h"
+#include "s60mmtrace.h"
 
 S60MediaPlayerSession::S60MediaPlayerSession(QObject *parent)
     : QObject(parent)
@@ -70,44 +64,28 @@ S60MediaPlayerSession::S60MediaPlayerSession(QObject *parent)
     , m_progressduration(0)
 {
     TRACE("S60MediaPlayerSession::S60MediaPlayerSession" << qtThisPtr());
-
     connect(m_progressTimer, SIGNAL(timeout()), this, SLOT(tick()));
     connect(m_stalledTimer, SIGNAL(timeout()), this, SLOT(stalled()));
 }
 
-/*!
-    Destroys a media playersession.
-*/
-
 S60MediaPlayerSession::~S60MediaPlayerSession()
 {
     TRACE("S60MediaPlayerSession::~S60MediaPlayerSession" << qtThisPtr());
 }
 
-/*!
- * \return the audio volume of a player session.
-*/
 int S60MediaPlayerSession::volume() const
 {
     return m_volume;
 }
 
-/*!
-    Sets the audio \a volume of a player session.
-*/
-
 void S60MediaPlayerSession::setVolume(int volume)
 {
     if (m_volume == volume)
         return;
-    
     TRACE("S60MediaPlayerSession::setVolume" << qtThisPtr() << "volume" << volume);
-
     m_volume = volume;
     emit volumeChanged(m_volume);
-
-    // Dont set symbian players volume until media loaded.
-    // Leaves with KerrNotReady although documentation says otherwise.
+    // Don't set player volume until media loaded
     if (!m_muted && 
         (  mediaStatus() == QMediaPlayer::LoadedMedia 
         || (mediaStatus() == QMediaPlayer::StalledMedia && state() != QMediaPlayer::StoppedState)
@@ -119,94 +97,55 @@ void S60MediaPlayerSession::setVolume(int volume)
     }
 }
 
-/*!
-    \return the mute state of a player session.
-*/
-
 bool S60MediaPlayerSession::isMuted() const
 {
     return m_muted;
 }
 
-/*!
-    Identifies if the current media is seekable.
-
-    \return true if it possible to seek within the current media, and false otherwise.
-*/
-
 bool S60MediaPlayerSession::isSeekable() const
 {
     return m_seekable;
 }
 
-/*!
-    Sets the \a status of the current media.
-*/
-
 void S60MediaPlayerSession::setMediaStatus(QMediaPlayer::MediaStatus status)
 {
     if (m_mediaStatus == status)
         return;
-
     TRACE("S60MediaPlayerSession::setMediaStatus" << qtThisPtr() << "status" << status);
-    
     m_mediaStatus = status;
-    
     emit mediaStatusChanged(m_mediaStatus);
-    
     if (m_play_requested && m_mediaStatus == QMediaPlayer::LoadedMedia)
         play();
 }
 
-/*!
-    Sets the \a state on media player.
-*/
-
 void S60MediaPlayerSession::setState(QMediaPlayer::State state)
 {
     if (m_state == state)
         return;
-    
     TRACE("S60MediaPlayerSession::setMediaStatus" << qtThisPtr() << "state" << state);
-
     m_state = state;
     emit stateChanged(m_state);
 }
 
-/*!
-    \return the state of a player session.
-*/
-
 QMediaPlayer::State S60MediaPlayerSession::state() const
 {
     return m_state;
 }
 
-/*!
-    \return the status of the current media.
-*/
-
 QMediaPlayer::MediaStatus S60MediaPlayerSession::mediaStatus() const
 {
     return m_mediaStatus;
 }
 
-/*!
- *  Loads the \a url for playback.
- *  If \a url is local file then it loads audio playersesion if its audio file.
- *  If it is a local video file then loads the video playersession.
-*/
-
 void S60MediaPlayerSession::load(const QMediaContent source)
 {
     TRACE("S60MediaPlayerSession::load" << qtThisPtr()
           << "source" << source.canonicalUrl().toString());
-
     m_source = source;
     setMediaStatus(QMediaPlayer::LoadingMedia);
     startStalledTimer();
-    m_stream = (source.canonicalUrl().scheme() == "file")?false:true;
-    m_UrlPath = source.canonicalUrl();
+    m_stream = (source.canonicalUrl().scheme() != "file");
+    m_url = source.canonicalUrl();
     TRAPD(err,
         if (m_stream)
             doLoadUrlL(QString2TPtrC(source.canonicalUrl().toString()));
@@ -216,35 +155,32 @@ void S60MediaPlayerSession::load(const QMediaContent source)
     m_isaudiostream = false;
 }
 
+bool S60MediaPlayerSession::getIsSeekable() const
+{
+    return ETrue;
+}
+
 TBool S60MediaPlayerSession::isStreaming()
 {
     return m_stream;
 }
 
-/*!
-    Start or resume playing the current source.
-*/
 void S60MediaPlayerSession::play()
 {
     TRACE("S60MediaPlayerSession::play" << qtThisPtr()
           << "state" << state() << "mediaStatus" << mediaStatus());
-
-    if ( (state() == QMediaPlayer::PlayingState && m_play_requested == false)
+    if (   (state() == QMediaPlayer::PlayingState && m_play_requested == false)
         || mediaStatus() == QMediaPlayer::UnknownMediaStatus
         || mediaStatus() == QMediaPlayer::NoMedia
         || mediaStatus() == QMediaPlayer::InvalidMedia)
         return;
-
     setState(QMediaPlayer::PlayingState);
-
     if (mediaStatus() == QMediaPlayer::LoadingMedia ||
        (mediaStatus() == QMediaPlayer::StalledMedia &&
-        state() == QMediaPlayer::StoppedState))
-   {
+        state() == QMediaPlayer::StoppedState)) {
         m_play_requested = true;
         return;
     }
-
     m_play_requested = false;
     m_duration = duration();
     setVolume(m_volume);
@@ -253,38 +189,25 @@ void S60MediaPlayerSession::play()
     doPlay();
 }
 
-/*!
-    Pause playing the current source.
-*/
-
 void S60MediaPlayerSession::pause()
 {
     TRACE("S60MediaPlayerSession::pause" << qtThisPtr());
-
     if (state() != QMediaPlayer::PlayingState)
         return;
-
     if (mediaStatus() == QMediaPlayer::NoMedia ||
         mediaStatus() == QMediaPlayer::InvalidMedia)
         return;
-
     setState(QMediaPlayer::PausedState);
     stopProgressTimer();
     TRAP_IGNORE(doPauseL());
     m_play_requested = false;
 }
 
-/*!
-    Stop playing, and reset the play position to the beginning.
-*/
-
 void S60MediaPlayerSession::stop()
 {
     TRACE("S60MediaPlayerSession::stop" << qtThisPtr());
-
     if (state() == QMediaPlayer::StoppedState)
         return;
-
     m_play_requested = false;
     m_state = QMediaPlayer::StoppedState;
     if (mediaStatus() == QMediaPlayer::BufferingMedia ||
@@ -300,129 +223,99 @@ void S60MediaPlayerSession::stop()
     emit stateChanged(m_state);
 }
 
-/*!
- * Sets \a renderer as video renderer.
-*/
-
 void S60MediaPlayerSession::setVideoRenderer(QObject *renderer)
 {
     TRACE("S60MediaPlayerSession::setVideoRenderer" << qtThisPtr()
           << "videoRenderer" << renderer);
-
     Q_UNUSED(renderer);
 }
 
-/*!
- *   the percentage of the temporary buffer filled before playback begins.
-
-    When the player object is buffering; this property holds the percentage of
-    the temporary buffer that is filled. The buffer will need to reach 100%
-    filled before playback can resume, at which time the MediaStatus will be
-    BufferedMedia.
-
-    \sa mediaStatus()
-*/
-
 int S60MediaPlayerSession::bufferStatus()
 {
     if (state() ==QMediaPlayer::StoppedState)
         return 0;
-
     if(   mediaStatus() == QMediaPlayer::LoadingMedia
        || mediaStatus() == QMediaPlayer::UnknownMediaStatus
        || mediaStatus() == QMediaPlayer::NoMedia
        || mediaStatus() == QMediaPlayer::InvalidMedia)
         return 0;
-
     int progress = 0;
     TRAPD(err, progress = doGetBufferStatusL());
     // If buffer status query not supported by codec return 100
     // do not set error
-    if(err == KErrNotSupported)
+    if (err == KErrNotSupported)
         return 100;
-
     setError(err);
     return progress;
 }
 
-/*!
- * return TRUE if Meta data is available in current media source.
-*/
-
 bool S60MediaPlayerSession::isMetadataAvailable() const
 {
     return !m_metaDataMap.isEmpty();
 }
 
-/*!
- * \return the \a key meta data.
-*/
 QVariant S60MediaPlayerSession::metaData(const QString &key) const
 {
     return m_metaDataMap.value(key);
 }
 
-/*!
- * \return the \a key meta data as QString.
-*/
-
 QVariant S60MediaPlayerSession::metaData(QtMultimediaKit::MetaData key) const
 {
     return metaData(metaDataKeyAsString(key));
 }
 
-/*!
- * \return List of all available meta data from current media source.
-*/
-
 QList<QtMultimediaKit::MetaData> S60MediaPlayerSession::availableMetaData() const
 {
     QList<QtMultimediaKit::MetaData> metaDataTags;
     if (isMetadataAvailable()) {
-        for (int i = QtMultimediaKit::Title; i <= QtMultimediaKit::ThumbnailImage; i++) {
+        for (int i=QtMultimediaKit::Title; i<=QtMultimediaKit::ThumbnailImage; ++i) {
             QString metaDataItem = metaDataKeyAsString((QtMultimediaKit::MetaData)i);
             if (!metaDataItem.isEmpty()) {
-                if (!metaData(metaDataItem).isNull()) {
+                if (!metaData(metaDataItem).isNull())
                     metaDataTags.append((QtMultimediaKit::MetaData)i);
-                }
             }
         }
     }
-
     return metaDataTags;
 }
 
-/*!
- * \return all available extended meta data of current media source.
-*/
-
 QStringList S60MediaPlayerSession::availableExtendedMetaData() const
 {
     return m_metaDataMap.keys();
 }
 
-/*!
- * \return meta data \a key as QString.
-*/
-
 QString S60MediaPlayerSession::metaDataKeyAsString(QtMultimediaKit::MetaData key) const
 {
     switch(key) {
-    case QtMultimediaKit::Title: return "title";
-    case QtMultimediaKit::AlbumArtist: return "artist";
-    case QtMultimediaKit::Comment: return "comment";
-    case QtMultimediaKit::Genre: return "genre";
-    case QtMultimediaKit::Year: return "year";
-    case QtMultimediaKit::Copyright: return "copyright";
-    case QtMultimediaKit::AlbumTitle: return "album";
-    case QtMultimediaKit::Composer: return "composer";
-    case QtMultimediaKit::TrackNumber: return "albumtrack";
-    case QtMultimediaKit::AudioBitRate: return "audiobitrate";
-    case QtMultimediaKit::VideoBitRate: return "videobitrate";
-    case QtMultimediaKit::Duration: return "duration";
-    case QtMultimediaKit::MediaType: return "contenttype";
-    case QtMultimediaKit::CoverArtImage: return "attachedpicture";
-    case QtMultimediaKit::SubTitle: // TODO: Find the matching metadata keys
+    case QtMultimediaKit::Title:
+        return "title";
+    case QtMultimediaKit::AlbumArtist:
+        return "artist";
+    case QtMultimediaKit::Comment:
+        return "comment";
+    case QtMultimediaKit::Genre:
+        return "genre";
+    case QtMultimediaKit::Year:
+        return "year";
+    case QtMultimediaKit::Copyright:
+        return "copyright";
+    case QtMultimediaKit::AlbumTitle:
+        return "album";
+    case QtMultimediaKit::Composer:
+        return "composer";
+    case QtMultimediaKit::TrackNumber:
+        return "albumtrack";
+    case QtMultimediaKit::AudioBitRate:
+       return "audiobitrate";
+    case QtMultimediaKit::VideoBitRate:
+        return "videobitrate";
+    case QtMultimediaKit::Duration:
+        return "duration";
+    case QtMultimediaKit::MediaType:
+        return "contenttype";
+    case QtMultimediaKit::CoverArtImage:
+       return "attachedpicture";
+    case QtMultimediaKit::SubTitle:
     case QtMultimediaKit::Description:
     case QtMultimediaKit::Category:
     case QtMultimediaKit::Date:
@@ -462,21 +355,15 @@ QString S60MediaPlayerSession::metaDataKeyAsString(QtMultimediaKit::MetaData key
     default:
         break;
     }
-
     return QString();
 }
 
-/*!
-    Sets the \a muted state of a player session.
-*/
-
 void S60MediaPlayerSession::setMuted(bool muted)
 {
     if (muted != m_muted) {
         TRACE("S60MediaPlayerSession::setMuted" << qtThisPtr() << "muted" << muted);
         m_muted = muted;
         emit mutedChanged(m_muted);
-
         if(   m_mediaStatus == QMediaPlayer::LoadedMedia
            || (m_mediaStatus == QMediaPlayer::StalledMedia && state() != QMediaPlayer::StoppedState)
            || m_mediaStatus == QMediaPlayer::BufferingMedia
@@ -488,10 +375,6 @@ void S60MediaPlayerSession::setMuted(bool muted)
     }
 }
 
-/*!
-   \return the duration of the current media in milliseconds.
-*/
-
 qint64 S60MediaPlayerSession::duration() const
 {
     if(   mediaStatus() == QMediaPlayer::LoadingMedia
@@ -500,16 +383,11 @@ qint64 S60MediaPlayerSession::duration() const
        || (mediaStatus() == QMediaPlayer::StalledMedia && state() == QMediaPlayer::StoppedState)
        || mediaStatus() == QMediaPlayer::InvalidMedia)
         return -1;
-
     qint64 pos = 0;
     TRAP_IGNORE(pos = doGetDurationL());
     return pos;
 }
 
-/*!
-    \return the current playback position in milliseconds.
-*/
-
 qint64 S60MediaPlayerSession::position() const
 {
     if(   mediaStatus() == QMediaPlayer::LoadingMedia
@@ -518,7 +396,6 @@ qint64 S60MediaPlayerSession::position() const
        || (mediaStatus() == QMediaPlayer::StalledMedia && state() == QMediaPlayer::StoppedState)
        || mediaStatus() == QMediaPlayer::InvalidMedia)
         return 0;
-
     qint64 pos = 0;
     TRAP_IGNORE(pos = doGetPositionL());
     if (pos < m_progressduration)
@@ -526,64 +403,39 @@ qint64 S60MediaPlayerSession::position() const
     return pos;
 }
 
-/*!
-    Sets the playback \a pos of the current media.  This will initiate a seek and it may take
-    some time for playback to reach the position set.
-*/
-
 void S60MediaPlayerSession::setPosition(qint64 pos)
 {
     if (position() == pos)
         return;
-
     TRACE("S60MediaPlayerSession::setPosition" << qtThisPtr() << "pos" << pos);
-
     QMediaPlayer::State originalState = state();
-
     if (originalState == QMediaPlayer::PlayingState)
         pause();
-
     TRAPD(err, doSetPositionL(pos * 1000));
     setError(err);
-
     if (err == KErrNone) {
         if (mediaStatus() == QMediaPlayer::EndOfMedia)
             setMediaStatus(QMediaPlayer::LoadedMedia);
-    }
-    else if (err == KErrNotSupported) {
+    } else if (err == KErrNotSupported) {
         m_seekable = false;
         emit seekableChanged(m_seekable);
     }
-
     if (originalState == QMediaPlayer::PlayingState)
         play();
-
     TRAP_IGNORE(m_progressduration = doGetPositionL());
     emit positionChanged(m_progressduration);
 }
 
-/*!
- * Set the audio endpoint to \a audioEndpoint.
-*/
-
 void S60MediaPlayerSession::setAudioEndpoint(const QString& audioEndpoint)
 {
     TRACE("S60MediaPlayerSession::setAudioEndpoint" << qtThisPtr()
           << "audioEndpoint" << audioEndpoint);
-
     doSetAudioEndpoint(audioEndpoint);
 }
 
-/*!
- * Loading of media source is completed.
- * And ready for playback. Updates all the media status, state, settings etc.
- * And emits the signals.
-*/
-
 void S60MediaPlayerSession::loaded()
 {
     TRACE("S60MediaPlayerSession::loaded" << qtThisPtr());
-
     stopStalledTimer();
     if (m_error == KErrNone || m_error == KErrMMPartialPlayback) {
         setMediaStatus(QMediaPlayer::LoadedMedia);
@@ -594,86 +446,51 @@ void S60MediaPlayerSession::loaded()
         emit videoAvailableChanged(isVideoAvailable());
         emit audioAvailableChanged(isAudioAvailable());
         emit mediaChanged();
-
         m_seekable = getIsSeekable();
     }
 }
 
-/*!
- * Playback is completed as medai source reached end of media.
-*/
 void S60MediaPlayerSession::endOfMedia()
 {
     TRACE("S60MediaPlayerSession::endOfMedia" << qtThisPtr());
-
+    stopProgressTimer();
     m_state = QMediaPlayer::StoppedState;
     setMediaStatus(QMediaPlayer::EndOfMedia);
-    //there is a chance that user might have called play from EOF callback
-    //if we are already in playing state, do not send state change callback
+    // There is a chance that user might have called play from EOF callback.
+    // If we are already in playing state, do not send state change callback.
     emit positionChanged(m_duration);
-    if(m_state == QMediaPlayer::StoppedState)
+    if (m_state == QMediaPlayer::StoppedState)
         emit stateChanged(QMediaPlayer::StoppedState);
 }
 
-/*!
- *  The percentage of the temporary buffer filling before playback begins.
-
-    When the player object is buffering; this property holds the percentage of
-    the temporary buffer that is filled. The buffer will need to reach 100%
-    filled before playback can resume, at which time the MediaStatus will be
-    BufferedMedia.
-
-    \sa mediaStatus()
-*/
-
 void S60MediaPlayerSession::buffering()
 {
     TRACE("S60MediaPlayerSession::buffering" << qtThisPtr());
-
     startStalledTimer();
     setMediaStatus(QMediaPlayer::BufferingMedia);
-
-//Buffering cannot happen in stopped state. Hence update the state
+    // Buffering cannot happen in stopped state. Hence update the state
     if (state() == QMediaPlayer::StoppedState)
         setState(QMediaPlayer::PausedState);
 }
 
-/*!
- * Buffer is filled with data and to for continuing/start playback.
-*/
-
 void S60MediaPlayerSession::buffered()
 {
     TRACE("S60MediaPlayerSession::buffered" << qtThisPtr());
-
     stopStalledTimer();
     setMediaStatus(QMediaPlayer::BufferedMedia);
 }
 
-/*!
- * Sets media status as stalled as waiting for the buffer to be filled to start playback.
-*/
-
 void S60MediaPlayerSession::stalled()
 {
     TRACE("S60MediaPlayerSession::stalled" << qtThisPtr());
-
     setMediaStatus(QMediaPlayer::StalledMedia);
 }
 
-/*!
- * \return all the meta data entries in the current media source.
-*/
-
-QMap<QString, QVariant>& S60MediaPlayerSession::metaDataEntries()
+QMap<QString, QVariant> &S60MediaPlayerSession::metaDataEntries()
 {
     return m_metaDataMap;
 }
 
-/*!
- * \return Error by converting Symbian specific error to Multimedia error.
-*/
-
 QMediaPlayer::Error S60MediaPlayerSession::fromSymbianErrorToMultimediaError(int error)
 {
     switch(error) {
@@ -736,24 +553,14 @@ QMediaPlayer::Error S60MediaPlayerSession::fromSymbianErrorToMultimediaError(int
     }
 }
 
-/*!
- * \return error.
- */
-
 int S60MediaPlayerSession::error() const
 {
     return m_error;
 }
 
-/*!
- * Sets the error.
- * * If playback complete/prepare complete ..., etc with successful then sets error as ZERO
- *  else Multimedia error.
-*/
-
 void S60MediaPlayerSession::setError(int error, const QString &errorString, bool forceReset)
 {
-    if( forceReset ) {
+    if (forceReset) {
         TRACE("S60MediaPlayerSession::setError" << qtThisPtr() << "forceReset");
         m_error = KErrNone;
         emit this->error(QMediaPlayer::NoError, QString());
@@ -800,142 +607,35 @@ void S60MediaPlayerSession::setAndEmitError(int error)
     emit this->error(rateError, symbianError);
 }
 
-/*!
- * emits the signal if there is a changes in position and buffering status.
- */
-
 void S60MediaPlayerSession::tick()
 {
     m_progressduration = position();
     emit positionChanged(m_progressduration);
-
     if (bufferStatus() < 100)
         emit bufferStatusChanged(bufferStatus());
 }
 
-/*!
- * Starts the timer once the media source starts buffering.
-*/
-
 void S60MediaPlayerSession::startProgressTimer()
 {
     TRACE("S60MediaPlayerSession::startProgressTimer" << qtThisPtr());
-
     m_progressTimer->start(500);
 }
 
-/*!
- * Stops the timer once the media source finished buffering.
-*/
-
 void S60MediaPlayerSession::stopProgressTimer()
 {
     TRACE("S60MediaPlayerSession::stopProgressTimer" << qtThisPtr());
-
     m_progressduration = 0;
     m_progressTimer->stop();
 }
 
-/*!
- * Starts the timer while waiting for some events to happen like source buffering or call backs etc.
- * So that if the events doesn't occur before stalled timer stops, it'll set the error/media status etc.
-*/
-
 void S60MediaPlayerSession::startStalledTimer()
 {
     TRACE("S60MediaPlayerSession::startStalledTimer" << qtThisPtr());
-
     m_stalledTimer->start(30000);
 }
 
-/*!
- *  Stops the timer when some events occurred while waiting for them.
- *  media source started buffering or call back is received etc.
-*/
-
 void S60MediaPlayerSession::stopStalledTimer()
 {
     TRACE("S60MediaPlayerSession::stopStalledTimer" << qtThisPtr());
-
     m_stalledTimer->stop();
 }
-
-/*!
- * \return Converted Symbian specific Descriptor to QString.
-*/
-
-QString S60MediaPlayerSession::TDesC2QString(const TDesC& aDescriptor)
-{
-    return QString::fromUtf16(aDescriptor.Ptr(), aDescriptor.Length());
-}
-
-/*!
- * \return Converted QString to non-modifiable pointer Descriptor.
-*/
-
-TPtrC S60MediaPlayerSession::QString2TPtrC( const QString& string )
-{
-	// Returned TPtrC is valid as long as the given parameter is valid and unmodified
-    return TPtrC16(static_cast<const TUint16*>(string.utf16()), string.length());
-}
-
-/*!
- * \return Converted Symbian TRect object to QRect object.
-*/
-
-QRect S60MediaPlayerSession::TRect2QRect(const TRect& tr)
-{
-    return QRect(tr.iTl.iX, tr.iTl.iY, tr.Width(), tr.Height());
-}
-
-/*!
- * \return converted QRect object to Symbian specific TRec object.
- */
-
-TRect S60MediaPlayerSession::QRect2TRect(const QRect& qr)
-{
-    return TRect(TPoint(qr.left(), qr.top()), TSize(qr.width(), qr.height()));
-}
-
-/*!
-    \fn bool S60MediaPlayerSession::isVideoAvailable();
-
-
-    Returns TRUE if Video is available.
-*/
-
-/*!
-    \fn bool S60MediaPlayerSession::isAudioAvailable();
-
-
-    Returns TRUE if Audio is available.
-*/
-
-/*!
-    \fn void S60MediaPlayerSession::setPlaybackRate (qreal rate);
-
-
-    Sets \a rate play back rate on media source. getIsSeekable
-*/
-
-/*!
-    \fn bool S60MediaPlayerSession::getIsSeekable () const;
-
-
-    \return TRUE if Seekable possible on current media source else FALSE.
-*/
-
-/*!
-    \fn QString S60MediaPlayerSession::activeEndpoint () const;
-
-
-    \return active end point name..
-*/
-
-/*!
-    \fn QString S60MediaPlayerSession::defaultEndpoint () const;
-
-
-    \return default end point name.
-*/
-
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h
index fc70d6ace8..cbba418b28 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h
@@ -42,18 +42,11 @@
 #ifndef S60MEDIAPLAYERSESSION_H
 #define S60MEDIAPLAYERSESSION_H
 
-#include <QtCore/qobject.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qpair.h>
+#include <QtCore/QUrl>
+#include <QtCore/QRect>
 #include <qmediaplayer.h>
-#include <e32cmn.h> // for TDesC
-#include <QRect>
 #include "s60mediaplayerservice.h"
 
-
-_LIT( KSeekable, "Seekable" );
-_LIT( KFalse, "0");
-
 QT_BEGIN_NAMESPACE
 class QMediaTimeRange;
 QT_END_NAMESPACE
@@ -68,7 +61,6 @@ public:
     S60MediaPlayerSession(QObject *parent);
     virtual ~S60MediaPlayerSession();
 
-    // for player control interface to use
     QMediaPlayer::State state() const;
     QMediaPlayer::MediaStatus mediaStatus() const;
     qint64 duration() const;
@@ -95,9 +87,9 @@ public:
     virtual void setVideoRenderer(QObject *renderer);
     void setMediaStatus(QMediaPlayer::MediaStatus);
     void setState(QMediaPlayer::State state);
-    void setAudioEndpoint(const QString& audioEndpoint);
+    void setAudioEndpoint(const QString &audioEndpoint);
     virtual void setPlaybackRate(qreal rate) = 0;
-    virtual bool getIsSeekable() const { return ETrue; }
+    virtual bool getIsSeekable() const;
     TBool isStreaming();
 
 protected:
@@ -113,33 +105,30 @@ protected:
     virtual void updateMetaDataEntriesL() = 0;
     virtual int doGetBufferStatusL() const = 0;
     virtual qint64 doGetDurationL() const = 0;
-    virtual void doSetAudioEndpoint(const QString& audioEndpoint) = 0;
+    virtual void doSetAudioEndpoint(const QString &audioEndpoint) = 0;
 
 public:
-    // From S60MediaPlayerAudioEndpointSelector
+    // S60MediaPlayerAudioEndpointSelector
     virtual QString activeEndpoint() const = 0;
     virtual QString defaultEndpoint() const = 0;
+
 public Q_SLOTS:
-    virtual void setActiveEndpoint(const QString& name) = 0;
+    virtual void setActiveEndpoint(const QString &name) = 0;
 
 protected:
     int error() const;
-    void setError(int error,  const QString &errorString = QString(), bool forceReset = false);
+    void setError(int error, const QString &errorString = QString(), bool forceReset = false);
     void setAndEmitError(int error);
     void loaded();
     void buffering();
     void buffered();
     void endOfMedia();
-    QMap<QString, QVariant>& metaDataEntries();
+    QMap<QString, QVariant> &metaDataEntries();
     QMediaPlayer::Error fromSymbianErrorToMultimediaError(int error);
     void startProgressTimer();
     void stopProgressTimer();
     void startStalledTimer();
     void stopStalledTimer();
-    QString TDesC2QString(const TDesC& aDescriptor);
-	TPtrC QString2TPtrC( const QString& string );
-	QRect TRect2QRect(const TRect& tr);
-	TRect QRect2TRect(const QRect& qr);
 
 protected slots:
     void tick();
@@ -154,7 +143,7 @@ signals:
     void audioAvailableChanged(bool audioAvailable);
     void bufferStatusChanged(int percentFilled);
     void seekableChanged(bool);     
-    void availablePlaybackRangesChanged(const QMediaTimeRange&);
+    void availablePlaybackRangesChanged(const QMediaTimeRange &range);
     void metaDataChanged();
     void error(int error, const QString &errorString);
     void activeEndpointChanged(const QString &name);
@@ -164,7 +153,7 @@ signals:
     void mutedChanged(bool muted);
 
 protected:
-    QUrl m_UrlPath;
+    QUrl m_url;
     bool m_stream;
     QMediaContent m_source;
     bool m_isaudiostream;
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videooutputinterface.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerutils.cpp
index f0e993339d..093479e115 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videooutputinterface.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerutils.cpp
@@ -1,3 +1,4 @@
+
 /****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
@@ -39,24 +40,25 @@
 **
 ****************************************************************************/
 
-#ifndef S60VIDEOOUTPUTINTERFACE_H
-#define S60VIDEOOUTPUTINTERFACE_H
+#include "s60mediaplayerutils.h"
 
-#include <QtCore/qglobal.h>
-#include <QtGui/qwindowdefs.h>
-#include <coecntrl.h>
+QString TDesC2QString(const TDesC &des)
+{
+    return QString::fromUtf16(des.Ptr(), des.Length());
+}
 
-class S60VideoOutputInterface
+TPtrC QString2TPtrC(const QString &string)
 {
-public:
-	RWindow *videoWindowHandle() const { return videoWinId() ? static_cast<RWindow *>(videoWinId()->DrawableWindow()) : 0 ; }
-    virtual WId videoWinId() const = 0;
-    // If VIDEOOUTPUT_GRAPHICS_SURFACES is defined, the return value is the video
-    // rectangle relative to the video window.  If not, the return value is the
-    // absolute screen rectangle.
-    virtual QRect videoDisplayRect() const = 0;
-    virtual Qt::AspectRatioMode videoAspectRatio() const = 0;
-};
+    // Returned TPtrC is valid as long as the given parameter is valid and unmodified
+    return TPtrC16(static_cast<const TUint16*>(string.utf16()), string.length());
+}
 
-#endif // S60VIDEOOUTPUTINTERFACE_H
+QRect TRect2QRect(const TRect &tr)
+{
+    return QRect(tr.iTl.iX, tr.iTl.iY, tr.Width(), tr.Height());
+}
 
+TRect QRect2TRect(const QRect &qr)
+{
+    return TRect(TPoint(qr.left(), qr.top()), TSize(qr.width(), qr.height()));
+}
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerutils.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerutils.h
new file mode 100644
index 0000000000..18b489dff5
--- /dev/null
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerutils.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef S60MEDIAPLAYERUTILS_H
+#define S60MEDIAPLAYERUTILS_H
+
+#include <QtCore/QString>
+#include <QtCore/QRect>
+#include <e32cmn.h>
+
+QString TDesC2QString(const TDesC &des);
+TPtrC QString2TPtrC(const QString &string);
+QRect TRect2QRect(const TRect &tr);
+TRect QRect2TRect(const QRect &qr);
+
+#endif // S60MEDIAPLAYERUTILS_H
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
index a0bf0b35fc..ea61560b41 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
@@ -39,14 +39,13 @@
 **
 ****************************************************************************/
 
+#include <QtCore/QUrl>
+#include <QtCore/QDir>
+#include "s60mediaplayerutils.h"
 #include "s60mediarecognizer.h"
 #include "s60mmtrace.h"
 #include <e32def.h>
 #include <e32cmn.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qdir.h>
-#include <QtCore/qdebug.h>
-
 #include <apgcli.h>
 
 static const TInt KMimeTypePrefixLength = 6; // "audio/" or "video/"
@@ -55,34 +54,20 @@ _LIT(KMimeTypePrefixAudio, "audio/");
 _LIT(KMimeTypePrefixVideo, "video/");
 _LIT(KMimeTypeRingingTone, "application/vnd.nokia.ringing-tone");
 
-/*!
-    Construct a media Recognizer with the given \a parent.
-*/
-
-S60MediaRecognizer::S60MediaRecognizer(QObject *parent) : QObject(parent)
+S60MediaRecognizer::S60MediaRecognizer(QObject *parent)
+    : QObject(parent)
 {
     TRACE("S60MediaRecognizer::S60MediaRecognizer" << qtThisPtr());
 }
 
-/*!
-    Destroys a media Recognizer.
-*/
-
 S60MediaRecognizer::~S60MediaRecognizer()
 {
     TRACE("S60MediaRecognizer::~S60MediaRecognizer" << qtThisPtr());
-
     m_file.Close();
     m_fileServer.Close();
     m_recognizer.Close();
 }
 
-/*!
- * \return media type of \a url.
- * \a url may be a streaming link or a local file.
- * If \a url is local file then identifies the media type and returns it.
-*/
-
 S60MediaRecognizer::MediaType S60MediaRecognizer::mediaType(const QUrl &url)
 {
     S60MediaRecognizer::MediaType result;
@@ -95,62 +80,36 @@ S60MediaRecognizer::MediaType S60MediaRecognizer::mediaType(const QUrl &url)
     return result;
 }
 
-/*!
- * \return Media type of \a file name by recognizing its mimetype whether its audio or video.
-*/
-
-S60MediaRecognizer::MediaType S60MediaRecognizer::identifyMediaType(const QString& fileName)
+S60MediaRecognizer::MediaType S60MediaRecognizer::identifyMediaType(const QString &fileName)
 {
-
-    S60MediaRecognizer::MediaType result = Video; // default to videoplayer
+    S60MediaRecognizer::MediaType result = NotSupported;
     bool recognizerOpened = false;
-
     TInt err = m_recognizer.Connect();
-    if (err == KErrNone) {
+    if (err == KErrNone)
         recognizerOpened = true;
-    }
-
     err = m_fileServer.Connect();
-    if (err == KErrNone) {
+    if (err == KErrNone)
         recognizerOpened = true;
-    }
-
     // This is needed for sharing file handles for the recognizer
     err = m_fileServer.ShareProtected();
-    if (err == KErrNone) {
+    if (err == KErrNone)
         recognizerOpened = true;
-    }
-
     if (recognizerOpened) {
         m_file.Close();
-        err = m_file.Open(m_fileServer, QString2TPtrC(QDir::toNativeSeparators(fileName)), EFileRead |
-            EFileShareReadersOnly);
-
+        err = m_file.Open(m_fileServer, QString2TPtrC(QDir::toNativeSeparators(fileName)),
+                          EFileRead | EFileShareReadersOnly);
         if (err == KErrNone) {
             TDataRecognitionResult recognizerResult;
             err = m_recognizer.RecognizeData(m_file, recognizerResult);
             if (err == KErrNone) {
                 const TPtrC mimeType = recognizerResult.iDataType.Des();
-
-                if (mimeType.Left(KMimeTypePrefixLength).Compare(KMimeTypePrefixAudio) == 0 ||
-                        mimeType.Compare(KMimeTypeRingingTone) == 0) {
+                if (mimeType.Left(KMimeTypePrefixLength).Compare(KMimeTypePrefixAudio) == 0
+                    || mimeType.Compare(KMimeTypeRingingTone) == 0)
                     result = Audio;
-                } else if (mimeType.Left(KMimeTypePrefixLength).Compare(KMimeTypePrefixVideo) == 0) {
+                else if (mimeType.Left(KMimeTypePrefixLength).Compare(KMimeTypePrefixVideo) == 0)
                     result = Video;
-                }
             }
         }
     }
-
     return result;
 }
-
-/*!
- * \return Symbian modifiable pointer descriptor from a QString \a string.
- */
-
-TPtrC S60MediaRecognizer::QString2TPtrC( const QString& string )
-{
-    // Returned TPtrC is valid as long as the given parameter is valid and unmodified
-    return TPtrC16(static_cast<const TUint16*>(string.utf16()), string.length());
-}
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h
index 0d654ca70b..300e066ff6 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h
@@ -39,11 +39,10 @@
 **
 ****************************************************************************/
 
-#ifndef S60MEDIARECOGNIZER_H_
-#define S60MEDIARECOGNIZER_H_
-
-#include <QtCore/qobject.h>
+#ifndef S60MEDIARECOGNIZER_H
+#define S60MEDIARECOGNIZER_H
 
+#include <QtCore/QObject>
 #include <apgcli.h>
 #include <f32file.h>
 
@@ -52,7 +51,6 @@ class QUrl;
 class S60MediaRecognizer : public QObject
 {
     Q_OBJECT
-    
 public:
     enum MediaType {
         Audio,
@@ -65,10 +63,7 @@ public:
     ~S60MediaRecognizer();
     
     S60MediaRecognizer::MediaType mediaType(const QUrl &url);
-    S60MediaRecognizer::MediaType identifyMediaType(const QString& fileName);
-
-protected:
-    TPtrC QString2TPtrC( const QString& string );
+    S60MediaRecognizer::MediaType identifyMediaType(const QString &fileName);
 
 private:
     RApaLsSession m_recognizer;
@@ -76,4 +71,4 @@ private:
     RFs m_fileServer;
 };
 
-#endif /* S60MEDIARECOGNIZER_H_ */
+#endif // S60MEDIARECOGNIZER_H
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediasettings.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediasettings.cpp
new file mode 100644
index 0000000000..42ec348cd3
--- /dev/null
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediasettings.cpp
@@ -0,0 +1,125 @@
+
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "s60mediasettings.h"
+
+S60MediaSettings::S60MediaSettings(QObject *parent)
+    : QObject(parent)
+    , m_volume(30)
+    , m_muted(false)
+    , m_playbackRate(0)
+    , m_mediaStatus(QMediaPlayer::NoMedia)
+    , m_audioEndpoint(QString("Default"))
+    , m_videoOutput(0)
+{
+
+}
+
+void S60MediaSettings::setVolume(int volume)
+{
+    m_volume = volume;
+}
+
+void S60MediaSettings::setMuted(bool muted)
+{
+    m_muted = muted;
+}
+
+void S60MediaSettings::setPlaybackRate(qreal rate)
+{
+    m_playbackRate = rate;
+}
+
+void S60MediaSettings::setMediaStatus(QMediaPlayer::MediaStatus status)
+{
+    m_mediaStatus = status;
+}
+
+void S60MediaSettings::setAudioEndpoint(const QString &audioEndpoint)
+{
+    m_audioEndpoint = audioEndpoint;
+}
+
+void S60MediaSettings::setMediaType(MediaType type)
+{
+    m_mediaType = type;
+}
+
+void S60MediaSettings::setVideoOutput(QObject *value)
+{
+    m_videoOutput = value;
+}
+
+int S60MediaSettings::volume() const
+{
+    return m_volume;
+}
+
+bool S60MediaSettings::isMuted() const
+{
+    return m_muted;
+}
+
+qreal S60MediaSettings::playbackRate() const
+{
+    return m_playbackRate;
+}
+
+QMediaPlayer::MediaStatus S60MediaSettings::mediaStatus() const
+{
+    return m_mediaStatus;
+}
+
+QString S60MediaSettings::audioEndpoint() const
+{
+    return m_audioEndpoint;
+}
+
+S60MediaSettings::MediaType S60MediaSettings::mediaType() const
+{
+    return m_mediaType;
+}
+
+QObject *S60MediaSettings::videoOutput() const
+{
+    return m_videoOutput;
+}
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediasettings.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediasettings.h
new file mode 100644
index 0000000000..0e2cc229e6
--- /dev/null
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediasettings.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef S60MEDIASETTINGS_H
+#define S60MEDIASETTINGS_H
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <qmediaplayer.h>
+
+class S60MediaSettings : public QObject
+{
+public:
+    S60MediaSettings(QObject *parent = 0);
+
+    enum MediaType {
+        Unknown,
+        Video,
+        Audio,
+        Data
+    };
+
+    void setVolume(int volume);
+    void setMuted(bool muted);
+    void setPlaybackRate(qreal rate);
+    void setMediaStatus(QMediaPlayer::MediaStatus status);
+    void setAudioEndpoint(const QString &audioEndpoint);
+    void setMediaType(MediaType type);
+    void setVideoOutput(QObject *value);
+
+    int volume() const;
+    bool isMuted() const;
+    qreal playbackRate() const;
+    QMediaPlayer::MediaStatus mediaStatus() const;
+    QString audioEndpoint() const;
+    MediaType mediaType() const;
+    QObject *videoOutput() const;
+
+private:
+    int m_volume;
+    bool m_muted;
+    qreal m_playbackRate;
+    QMediaPlayer::MediaStatus m_mediaStatus;
+    QString m_audioEndpoint;
+    MediaType m_mediaType;
+    QObject *m_videoOutput;
+};
+
+#endif // S60MEDIASETTINGS_H
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp
index 61a8e4109e..c9fba84460 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.cpp
@@ -43,40 +43,22 @@
 #include "s60mediaplayersession.h"
 #include "s60mediaplayercontrol.h"
 #include "s60mmtrace.h"
-#include <qmediastreamscontrol.h>
-
-#include <QtCore/qdir.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qdebug.h>
-
-/*!
-    Constructs a new media streams control with the given \a control.
-*/
 
 S60MediaStreamControl::S60MediaStreamControl(QObject *control, QObject *parent)
     : QMediaStreamsControl(parent)
-    , m_control(NULL)
+    , m_control(0)
     , m_mediaType(S60MediaSettings::Unknown)
 {
     TRACE("S60MediaStreamControl::S60MediaStreamControl" << qtThisPtr());
-
     m_control = qobject_cast<S60MediaPlayerControl*>(control);
     m_mediaType = m_control->mediaControlSettings().mediaType();
 }
 
-/*!
-    Destroys a media streams control.
-*/
-
 S60MediaStreamControl::~S60MediaStreamControl()
 {
     TRACE("S60MediaStreamControl::~S60MediaStreamControl" << qtThisPtr());
 }
 
-/*!
-    \return the number of media streams.
-*/
-
 int S60MediaStreamControl::streamCount()
 {
     int streamCount = 0;
@@ -87,34 +69,20 @@ int S60MediaStreamControl::streamCount()
     return streamCount;
 }
 
-/*!
-    \return the type of a media \a streamNumber.
-*/
-
 QMediaStreamsControl::StreamType S60MediaStreamControl::streamType(int streamNumber)
 {
     Q_UNUSED(streamNumber);
-
     QMediaStreamsControl::StreamType type = QMediaStreamsControl::UnknownStream;
-
     if (m_control->mediaControlSettings().mediaType() ==  S60MediaSettings::Video)
         type = QMediaStreamsControl::VideoStream;
     else
         type = QMediaStreamsControl::AudioStream;
-
     return type;
 }
 
-/*!
-    \return the meta-data value of \a key for a given \a streamNumber.
-
-    Useful metadata keya are QtMultimediaKit::Title, QtMultimediaKit::Description and QtMultimediaKit::Language.
-*/
-
 QVariant S60MediaStreamControl::metaData(int streamNumber, QtMultimediaKit::MetaData key)
 {
     Q_UNUSED(streamNumber);
-
     if (m_control->session()) {
         if (m_control->session()->isMetadataAvailable())
             return m_control->session()->metaData(key);
@@ -122,10 +90,6 @@ QVariant S60MediaStreamControl::metaData(int streamNumber, QtMultimediaKit::Meta
     return QVariant();
 }
 
-/*!
-    \return true if the media \a streamNumber is active else false.
-*/
-
 bool S60MediaStreamControl::isActive(int streamNumber)
 {
     if (m_control->mediaControlSettings().mediaType() ==  S60MediaSettings::Video) {
@@ -138,37 +102,20 @@ bool S60MediaStreamControl::isActive(int streamNumber)
             break;
         }
     }
-
     return m_control->isAudioAvailable();
 }
 
-/*!
-    Sets the active \a streamNumber of a media \a state.
-
-    Symbian MMF does not support enabling or disabling specific media streams.
-
-    Setting the active state of a media stream to true will activate it.  If any other stream
-    of the same type was previously active it will be deactivated. Setting the active state fo a
-    media stream to false will deactivate it.
-*/
-
 void S60MediaStreamControl::setActive(int streamNumber, bool state)
 {
     TRACE("S60MediaStreamControl::setActive" << qtThisPtr()
           << "streamNumber" << streamNumber << "state" << state);
-
     Q_UNUSED(streamNumber);
     Q_UNUSED(state);
     // Symbian MMF does not support enabling or disabling specific media streams
 }
 
-/*!
-     The signal is emitted when the available streams list is changed.
-*/
-
 void S60MediaStreamControl::handleStreamsChanged()
 {
     TRACE("S60MediaStreamControl::handleStreamsChanged" << qtThisPtr());
-
     emit streamsChanged();
 }
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.h
index 6df90c4b67..89a8b5a0e5 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60mediastreamcontrol.h
@@ -42,12 +42,11 @@
 #ifndef S60MEDIASTREAMCONTROL_H
 #define S60MEDIASTREAMCONTROL_H
 
-#include <QVariant>
-
-#include "s60mediaplayercontrol.h"
-
+#include <QtCore/QVariant>
 #include <qmediastreamscontrol.h>
 #include <qtmedianamespace.h>
+#include "s60mediaplayercontrol.h"
+#include "s60mediasettings.h"
 
 QT_USE_NAMESPACE
 
@@ -61,7 +60,7 @@ public:
     S60MediaStreamControl(QObject *session, QObject *parent = 0);
     ~S60MediaStreamControl();
 
-    // from QMediaStreamsControl
+    // QMediaStreamsControl
     int streamCount();
     QMediaStreamsControl::StreamType streamType(int streamNumber);
     QVariant metaData(int streamNumber, QtMultimediaKit::MetaData key);
@@ -73,7 +72,7 @@ public Q_SLOTS:
 
 private:
     S60MediaPlayerControl *m_control;
-    S60MediaSettings::TMediaType m_mediaType;
+    S60MediaSettings::MediaType m_mediaType;
 };
 
-#endif //S60MEDIASTREAMCONTROL_H
+#endif // S60MEDIASTREAMCONTROL_H
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
index 43d40553dd..e284f58e43 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
@@ -41,12 +41,18 @@
 
 #include "s60videoplayersession.h"
 #include "s60mediaplayerservice.h"
+#include "s60mediaplayerutils.h"
 #include "s60videowidgetcontrol.h"
 #include "s60videowidgetdisplay.h"
 #include "s60videowindowcontrol.h"
 #include "s60videowindowdisplay.h"
 #include "s60mmtrace.h"
 
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+#include "s60videoeglrenderercontrol.h"
+#include "s60nativewindow.h"
+#endif
+
 #include <QtCore/QTimer>
 #include <QtGui/QApplication>
 #include <QtGui/QDesktopWidget>
@@ -66,8 +72,10 @@
 
 const QString DefaultAudioEndpoint = QLatin1String("Default");
 const TUid KHelixUID = {0x101F8514};
+_LIT(KSeekable, "Seekable" );
+_LIT(KFalse, "0");
 
-//Hard-coding the command to support older versions.
+// Hard-coding the command to support older versions.
 const TInt KMMFROPControllerEnablePausedLoadingStatus = 7;
 
 TVideoRotation videoRotation(qreal angle)
@@ -149,18 +157,17 @@ bool S60VideoPlayerEventHandler::filterEvent(void *message, long *result)
     return ret;
 }
 
-/*!
-    Constructs the CVideoPlayerUtility2 object with given \a service and \a object.
-    And Registers for Video Loading Notifications.
-*/
 S60VideoPlayerSession::S60VideoPlayerSession(QMediaService *service, S60MediaNetworkAccessControl *object)
     : S60MediaPlayerSession(service)
     , m_accessPointId(0)
+    , m_networkAccessControl(object)
     , m_wsSession(&CCoeEnv::Static()->WsSession())
     , m_screenDevice(CCoeEnv::Static()->ScreenDevice())
     , m_service(service)
     , m_player(0)
-#ifndef VIDEOOUTPUT_GRAPHICS_SURFACES
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+    , m_nativeSurface(TSurfaceId::CreateNullId())
+#else
     , m_dsaActive(false)
     , m_dsaStopped(false)
 #endif
@@ -178,8 +185,6 @@ S60VideoPlayerSession::S60VideoPlayerSession(QMediaService *service, S60MediaNet
 #endif
 {
     TRACE("S60VideoPlayerSession::S60VideoPlayerSession" << qtThisPtr());
-
-    m_networkAccessControl = object;
 #ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
     QT_TRAP_THROWING(m_player = CVideoPlayerUtility2::NewL(
         *this,
@@ -187,6 +192,9 @@ S60VideoPlayerSession::S60VideoPlayerSession(QMediaService *service, S60MediaNet
         EMdaPriorityPreferenceNone
         ));
     m_player->RegisterForVideoLoadingNotification(*this);
+    m_dummyWindow = new S60NativeWindow(this);
+    connect(this, SIGNAL(nativeSurfaceChanged(TSurfaceId)),
+            m_dummyWindow, SLOT(setNativeSurface(TSurfaceId)));
 #else
     RWindow *window = 0;
     QRect extentRect;
@@ -217,12 +225,6 @@ S60VideoPlayerSession::S60VideoPlayerSession(QMediaService *service, S60MediaNet
     S60VideoPlayerEventHandler::instance()->addApplicationFocusObserver(this);
 }
 
-/*!
-   Destroys the CVideoPlayerUtility2 object.
-
-  And Unregister the observer.
-*/
-
 S60VideoPlayerSession::~S60VideoPlayerSession()
 {
     TRACE("S60VideoPlayerSession::~S60VideoPlayerSession" << qtThisPtr());
@@ -254,17 +256,12 @@ void S60VideoPlayerSession::applicationLostFocus()
     TRACE("S60VideoPlayerSession::applicationLostFocus" << qtThisPtr());
     if (QMediaPlayer::PlayingState == state()) {
         if (!m_isaudiostream) {
-        m_backendInitiatedPause = true;
-        pause();
+            m_backendInitiatedPause = true;
+            pause();
         }
     }
 }
 
-/*!
-
-   Opens the a file from \a path.
-*/
-
 void S60VideoPlayerSession::doLoadL(const TDesC &path)
 {
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
@@ -272,29 +269,18 @@ void S60VideoPlayerSession::doLoadL(const TDesC &path)
     if (m_audioOutput)
         m_audioOutput->UnregisterObserver(*this);
     delete m_audioOutput;
-    m_audioOutput = NULL;
+    m_audioOutput = 0;
 #endif
     m_player->OpenFileL(path, KHelixUID);
 }
 
-/*!
-    Sets the playbackRate with \a rate.
-*/
-
 void S60VideoPlayerSession::setPlaybackRate(qreal rate)
 {
-    /*
-     * setPlaybackRate is not supported in S60 3.1 and 3.2
-     * This flag will be defined for 3.1 and 3.2
-    */
 #ifdef PLAY_RATE_NOT_SUPPORTED
     TRACE("S60VideoPlayerSession::setPlaybackRate" << qtThisPtr()
           << "rate" << rate << "not supported");
 #else
     TRACE("S60VideoPlayerSession::setPlaybackRate" << qtThisPtr() << "rate" << rate);
-    //setPlayVelocity requires rate in the form of
-    //50 = 0.5x ;100 = 1.x ; 200 = 2.x ; 300 = 3.x
-    //so multiplying rate with 100
     TRAPD(err, m_player->SetPlayVelocityL((TInt)(rate*100)));
     if (KErrNone == err)
         emit playbackRateChanged(rate);
@@ -303,11 +289,6 @@ void S60VideoPlayerSession::setPlaybackRate(qreal rate)
 #endif
 }
 
-/*!
-
-   Opens the a Url from \a path for streaming the source.
-*/
-
 void S60VideoPlayerSession::doLoadUrlL(const TDesC &path)
 {
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
@@ -315,17 +296,12 @@ void S60VideoPlayerSession::doLoadUrlL(const TDesC &path)
     if (m_audioOutput)
         m_audioOutput->UnregisterObserver(*this);
     delete m_audioOutput;
-    m_audioOutput = NULL;
+    m_audioOutput = 0;
 #endif
     m_accessPointId = m_networkAccessControl->accessPointId();
     m_player->OpenUrlL(path, m_accessPointId, KNullDesC8, KHelixUID);
 }
 
-/*!
-
-    Returns the percentage of the video clip loaded.
-*/
-
 int S60VideoPlayerSession::doGetBufferStatusL() const
 {
     int progress = 0;
@@ -333,24 +309,20 @@ int S60VideoPlayerSession::doGetBufferStatusL() const
     return progress;
 }
 
-/*!
-  Returns the duration of the video sample in microseconds.
-*/
-
 qint64 S60VideoPlayerSession::doGetDurationL() const
 {
     return m_player->DurationL().Int64() / qint64(1000);
 }
 
-/*!
- * Sets the \a videooutput for video rendering.
-*/
-
 void S60VideoPlayerSession::setVideoRenderer(QObject *videoOutput)
 {
     TRACE("S60VideoPlayerSession::setVideoRenderer" << qtThisPtr()
           << "output" << videoOutput);
     if (videoOutput != m_videoOutputControl) {
+        if (m_videoOutputControl) {
+            disconnect(m_videoOutputControl);
+            m_videoOutputControl->disconnect(this);
+        }
         if (m_videoOutputDisplay) {
             m_videoOutputDisplay->setHasContent(false);
             disconnect(m_videoOutputDisplay);
@@ -358,10 +330,21 @@ void S60VideoPlayerSession::setVideoRenderer(QObject *videoOutput)
             m_videoOutputDisplay = 0;
         }
         if (videoOutput) {
+            TRACE("S60VideoPlayerSession::setVideoRenderer output" << videoOutput);
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+            if (S60VideoEglRendererControl *control = qobject_cast<S60VideoEglRendererControl *>(videoOutput)) {
+                control->setNativeSurface(m_nativeSurface);
+                control->setNativeSize(m_nativeSize);
+                connect(this, SIGNAL(nativeSurfaceChanged(TSurfaceId)), control, SLOT(setNativeSurface(TSurfaceId)));
+                connect(this, SIGNAL(nativeSizeChanged(QSize)), control, SLOT(setNativeSize(QSize)));
+            }
+            else
+#endif
             if (S60VideoWidgetControl *control = qobject_cast<S60VideoWidgetControl *>(videoOutput))
                 m_videoOutputDisplay = control->display();
             else if (S60VideoWindowControl *control = qobject_cast<S60VideoWindowControl *>(videoOutput))
                 m_videoOutputDisplay = control->display();
+            TRACE("S60VideoPlayerSession::setVideoRenderer display" << m_videoOutputDisplay);
             if (m_videoOutputDisplay) {
                 m_videoOutputDisplay->setHasContent(QMediaPlayer::PlayingState == state());
                 m_videoOutputDisplay->setNativeSize(m_nativeSize);
@@ -381,9 +364,6 @@ void S60VideoPlayerSession::setVideoRenderer(QObject *videoOutput)
     }
 }
 
-/*!
- * Apply the pending changes for window.
-*/
 void S60VideoPlayerSession::applyPendingChanges(bool force)
 {
     TRACE("S60VideoPlayerSession::applyPendingChanges" << qtThisPtr()
@@ -473,10 +453,6 @@ void S60VideoPlayerSession::applyPendingChanges(bool force)
     }
 }
 
-/*!
- * \return TRUE if video is available.
-*/
-
 bool S60VideoPlayerSession::isVideoAvailable()
 {
 #ifdef PRE_S60_50_PLATFORM
@@ -501,10 +477,6 @@ bool S60VideoPlayerSession::isVideoAvailable()
 
 }
 
-/*!
- * \return TRUE if Audio available.
-*/
-
 bool S60VideoPlayerSession::isAudioAvailable()
 {
     if ( mediaStatus() == QMediaPlayer::LoadingMedia
@@ -524,10 +496,6 @@ bool S60VideoPlayerSession::isAudioAvailable()
     }
 }
 
-/*!
-    Start or resume playing the current source.
-*/
-
 void S60VideoPlayerSession::doPlay()
 {
     m_player->Play();
@@ -535,91 +503,59 @@ void S60VideoPlayerSession::doPlay()
         m_videoOutputDisplay->setHasContent(true);
 }
 
-/*!
-    Pause playing the current source.
-*/
-
 void S60VideoPlayerSession::doPauseL()
 {
     m_player->PauseL();
 }
 
-/*!
-
-    Stop playing, and reset the play position to the beginning.
-*/
-
 void S60VideoPlayerSession::doStop()
 {
     if (m_stream)
         m_networkAccessControl->resetIndex();
-
     if (m_videoOutputDisplay)
         m_videoOutputDisplay->setHasContent(false);
-
     m_player->Stop();
 }
 
-/*!
-    Closes the current audio clip (allowing another clip to be opened)
-*/
-
 void S60VideoPlayerSession::doClose()
 {
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
     if (m_audioOutput) {
         m_audioOutput->UnregisterObserver(*this);
         delete m_audioOutput;
-        m_audioOutput = NULL;
+        m_audioOutput = 0;
     }
 #endif
-
     m_player->Close();
 
-// close will remove the window handle in media clint video.
-// So mark it in pending changes.
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+    m_nativeSurface = TSurfaceId::CreateNullId();
+#endif
+
+    // Close will remove the window handle from m_player, so mark
+    // it in pending changes.
     m_pendingChanges |= WindowHandle;
 }
 
-/*!
- *  Returns the current playback position in microseconds from the start of the clip.
-
-*/
-
 qint64 S60VideoPlayerSession::doGetPositionL() const
 {
     return m_player->PositionL().Int64() / qint64(1000);
 }
 
-/*!
-    Sets the current playback position to \a microSeconds from the start of the clip.
-*/
-
 void S60VideoPlayerSession::doSetPositionL(qint64 microSeconds)
 {
     m_player->SetPositionL(TTimeIntervalMicroSeconds(microSeconds));
 }
 
-/*!
-
-    Changes the current playback volume to specified \a value.
-*/
-
 void S60VideoPlayerSession::doSetVolumeL(int volume)
 {
     m_player->SetVolumeL(volume * m_player->MaxVolume() / 100);
 }
 
-/*!
- * Notification to the client that the opening of the video clip has completed.
- * If successful then an \a aError will be ZERO else system wide error.
-*/
-
 void S60VideoPlayerSession::MvpuoOpenComplete(TInt aError)
 {
     TRACE("S60VideoPlayerSession::MvpuoOpenComplete" << qtThisPtr()
           << "error" << aError);
-
     setError(aError);
 #ifdef HTTP_COOKIES_ENABLED
     if (KErrNone == aError) {
@@ -660,26 +596,19 @@ void S60VideoPlayerSession::MvpuoOpenComplete(TInt aError)
     if (KErrNone == aError)
         m_player->Prepare();
 #endif
-    const TMMFMessageDestinationPckg dest( KUidInterfaceMMFROPController );
+    const TMMFMessageDestinationPckg dest(KUidInterfaceMMFROPController);
     TRAP_IGNORE(m_player->CustomCommandSync(dest, KMMFROPControllerEnablePausedLoadingStatus, KNullDesC8, KNullDesC8));
 }
 
-/*!
- * Notification to the client that the opening of the video clip has been preapred.
- * If successful then an \a aError will be ZERO else system wide error.
-*/
-
 void S60VideoPlayerSession::MvpuoPrepareComplete(TInt aError)
 {
     TRACE("S60VideoPlayerSession::MvpuoPrepareComplete" << qtThisPtr()
           << "error" << aError);
-
-    if (KErrNone == aError && m_stream) {
+    if (KErrNone == aError && m_stream)
         emit accessPointChanged(m_accessPointId);
-        }
     if (KErrCouldNotConnect == aError && !(m_networkAccessControl->isLastAccessPoint())) {
         load(m_source);
-    return;
+        return;
     }
     TInt error = aError;
     if (KErrNone == error || KErrMMPartialPlayback == error) {
@@ -700,16 +629,32 @@ void S60VideoPlayerSession::MvpuoPrepareComplete(TInt aError)
 #endif
         }
         if (KErrNone == error) {
-        // changes made to play without pausing in case of audio streaming use case
             if (m_player->VideoFormatMimeType().Length() == 0) {
-            m_isaudiostream = true;
-            m_backendInitiatedPause = false;
-            play();
+                m_isaudiostream = true;
+                m_backendInitiatedPause = false;
+                play();
             } else {
-            m_isaudiostream = false;
+                m_isaudiostream = false;
             }
-            applyPendingChanges(true); // force apply even though state is not Loaded
-            if (KErrNone == this->error()) // applyPendingChanges() can call setError()
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+            // Register for callbacks via MMMFSurfaceEventHandler
+            TRAP(error, m_player->AddDisplayL(*m_wsSession,
+                                              m_screenDevice->GetScreenNumber(),
+                                              *this));
+            if (!error)
+                // When switching from the 'direct' video rendering path (which
+                // sets the video surface as the background of a native window)
+                // to the EGL rendering path (which uses EGL endpoint to extract
+                // video frames as EGL images), the native window is first removed,
+                // then the EGL endpoint is created.  In order to prevent the MMF
+                // from destroying the video surface when the window is removed,
+                // we must also provide a dummy, non-displayed window handle.
+                TRAP(error, m_player->AddDisplayWindowL(*m_wsSession, *m_screenDevice,
+                                                        *m_dummyWindow->windowHandle(),
+                                                        TRect(), TRect()));
+#endif
+                applyPendingChanges(true); // force apply even though state is not Loaded
+            if (KErrNone == error && KErrNone == this->error()) // applyPendingChanges() can call setError()
                 loaded();
         }
     } else {
@@ -717,30 +662,18 @@ void S60VideoPlayerSession::MvpuoPrepareComplete(TInt aError)
     }
 }
 
-/*!
- * Notification that frame requested by a call to GetFrameL is ready.
-*/
-
 void S60VideoPlayerSession::MvpuoFrameReady(CFbsBitmap &aFrame, TInt aError)
 {
     Q_UNUSED(aFrame);
     Q_UNUSED(aError);
 }
 
-/*!
- * Notification that video playback has completed.
- * If successful then \a aError will be ZERO else system wide error.
- * This not called if playback is explicitly stopped by calling stop.
-*/
-
 void S60VideoPlayerSession::MvpuoPlayComplete(TInt aError)
 {
     TRACE("S60VideoPlayerSession::MvpuoPlayComplete" << qtThisPtr()
           << "error" << aError);
-
     if (m_stream)
-    m_networkAccessControl->resetIndex();
-
+        m_networkAccessControl->resetIndex();
     if (aError != KErrNone) {
         setError(aError);
         doClose();
@@ -749,12 +682,6 @@ void S60VideoPlayerSession::MvpuoPlayComplete(TInt aError)
     }
 }
 
-
-/*!
- * General \a event notification from controller.
- * These events are specified by the supplier of the controller.
-*/
-
 void S60VideoPlayerSession::MvpuoEvent(const TMMFEvent &aEvent)
 {
     TRACE("S60VideoPlayerSession::MvpuoEvent" << qtThisPtr()
@@ -766,18 +693,46 @@ void S60VideoPlayerSession::MvpuoEvent(const TMMFEvent &aEvent)
     }
 }
 
-/*!
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+void S60VideoPlayerSession::MmsehSurfaceCreated(TInt aDisplayId, const TSurfaceId& aId,
+                                                const TRect& aCropRect,
+                                                TVideoAspectRatio aAspectRatio)
+{
+    TRACE("S60VideoPlayerSession::MmsehSurfaceCreated" << qtThisPtr() << "id" << (void*)aId.iInternal[3]);
+    Q_UNUSED(aCropRect)
+    Q_UNUSED(aAspectRatio)
+    Q_ASSERT(m_nativeSurface.IsNull());
+    m_nativeSurface = aId;
+    emit nativeSurfaceChanged(m_nativeSurface);
+}
 
-    Updates meta data entries in the current video clip.
-*/
+void S60VideoPlayerSession::MmsehSurfaceParametersChanged(const TSurfaceId& aId,
+                                                          const TRect& aCropRect,
+                                                          TVideoAspectRatio aAspectRatio)
+{
+    TRACE("S60VideoPlayerSession::MmsehSurfaceParametersChanged" << qtThisPtr() << "id" << (void*)aId.iInternal[3]);
+    Q_UNUSED(aId)
+    Q_UNUSED(aCropRect)
+    Q_UNUSED(aAspectRatio)
+}
+
+void S60VideoPlayerSession::MmsehRemoveSurface(const TSurfaceId& aId)
+{
+    TRACE("S60VideoPlayerSession::MmsehRemoveSurface" << qtThisPtr() << "id" << (void*)aId.iInternal[3]);
+    if (aId == m_nativeSurface) {
+        m_nativeSurface = TSurfaceId::CreateNullId();
+        emit nativeSurfaceChanged(m_nativeSurface);
+    }
+}
+#endif // VIDEOOUTPUT_GRAPHICS_SURFACES
 
 void S60VideoPlayerSession::updateMetaDataEntriesL()
 {
     metaDataEntries().clear();
     int numberOfMetaDataEntries = 0;
     numberOfMetaDataEntries = m_player->NumberOfMetaDataEntriesL();
-    for (int i = 0; i < numberOfMetaDataEntries; i++) {
-        CMMFMetaDataEntry *entry = NULL;
+    for (int i=0; i<numberOfMetaDataEntries; ++i) {
+        CMMFMetaDataEntry *entry = 0;
         entry = m_player->MetaDataEntryL(i);
         metaDataEntries().insert(TDesC2QString(entry->Name()), TDesC2QString(entry->Value()));
         delete entry;
@@ -785,38 +740,23 @@ void S60VideoPlayerSession::updateMetaDataEntriesL()
     emit metaDataChanged();
 }
 
-/*!
- * Apply the window changes when window handle changes.
-*/
-
 void S60VideoPlayerSession::windowHandleChanged()
 {
     TRACE("S60VideoPlayerSession::windowHandleChanged" << qtThisPtr());
-
     m_pendingChanges |= WindowHandle;
     applyPendingChanges();
 }
 
-/*!
- * Apply the window changes when display Rect changes.
-*/
-
 void S60VideoPlayerSession::displayRectChanged()
 {
     TRACE("S60VideoPlayerSession::displayRectChanged" << qtThisPtr());
-
     m_pendingChanges |= DisplayRect;
     applyPendingChanges();
 }
 
-/*!
- * Apply the window changes when aspect Ratio changes.
-*/
-
 void S60VideoPlayerSession::aspectRatioChanged()
 {
     TRACE("S60VideoPlayerSession::aspectRatioChanged" << qtThisPtr());
-
     m_pendingChanges |= ScaleFactors;
     applyPendingChanges();
 }
@@ -824,7 +764,6 @@ void S60VideoPlayerSession::aspectRatioChanged()
 void S60VideoPlayerSession::rotationChanged()
 {
     TRACE("S60VideoPlayerSession::rotationChanged" << qtThisPtr());
-
     m_pendingChanges |= ScaleFactors;
     m_pendingChanges |= Rotation;
     applyPendingChanges();
@@ -834,14 +773,12 @@ void S60VideoPlayerSession::rotationChanged()
 void S60VideoPlayerSession::suspendDirectScreenAccess()
 {
     TRACE("S60VideoPlayerSession::suspendDirectScreenAccess" << qtThisPtr());
-
     m_dsaStopped = stopDirectScreenAccess();
 }
 
 void S60VideoPlayerSession::resumeDirectScreenAccess()
 {
     TRACE("S60VideoPlayerSession::resumeDirectScreenAccess" << qtThisPtr());
-
     if (!m_dsaStopped)
         return;
     startDirectScreenAccess();
@@ -851,7 +788,6 @@ void S60VideoPlayerSession::resumeDirectScreenAccess()
 void S60VideoPlayerSession::startDirectScreenAccess()
 {
     TRACE("S60VideoPlayerSession::startDirectScreenAccess" << qtThisPtr());
-
     if (m_dsaActive)
         return;
     TRAPD(err, m_player->StartDirectScreenAccessL());
@@ -863,7 +799,6 @@ void S60VideoPlayerSession::startDirectScreenAccess()
 bool S60VideoPlayerSession::stopDirectScreenAccess()
 {
     TRACE("S60VideoPlayerSession::stopDirectScreenAccess" << qtThisPtr());
-
     if (!m_dsaActive)
         return false;
     TRAPD(err, m_player->StopDirectScreenAccessL());
@@ -874,44 +809,23 @@ bool S60VideoPlayerSession::stopDirectScreenAccess()
 }
 #endif
 
-/*!
- *  The percentage of the temporary buffer filling before playback begins.
-*/
-
 void S60VideoPlayerSession::MvloLoadingStarted()
 {
     TRACE("S60VideoPlayerSession::MvloLoadingStarted" << qtThisPtr());
-
     buffering();
 }
 
-/*!
- * Buffer is filled with data and to for continuing/start playback.
-*/
-
 void S60VideoPlayerSession::MvloLoadingComplete()
 {
     TRACE("S60VideoPlayerSession::MvloLoadingComplete" << qtThisPtr());
-
     buffered();
 }
 
-/*!
-    Defiens which Audio End point to use.
-
-    \a audioEndpoint audioEndpoint name.
-*/
-
 void S60VideoPlayerSession::doSetAudioEndpoint(const QString& audioEndpoint)
 {
     m_audioEndpoint = audioEndpoint;
 }
 
-/*!
-
-    Returns audioEndpoint name.
-*/
-
 QString S60VideoPlayerSession::activeEndpoint() const
 {
     QString outputName = m_audioEndpoint;
@@ -924,10 +838,6 @@ QString S60VideoPlayerSession::activeEndpoint() const
     return outputName;
 }
 
-/*!
- *  Returns default Audio End point in use.
-*/
-
 QString S60VideoPlayerSession::defaultEndpoint() const
 {
     QString outputName = DefaultAudioEndpoint;
@@ -940,14 +850,9 @@ QString S60VideoPlayerSession::defaultEndpoint() const
     return outputName;
 }
 
-/*!
-   Sets active end \a name as an Audio End point.
-*/
-
 void S60VideoPlayerSession::setActiveEndpoint(const QString& name)
 {
     TRACE("S60VideoPlayerSession::setActiveEndpoint" << qtThisPtr() << "name" << name);
-
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
     CAudioOutput::TAudioOutputPreference output = CAudioOutput::ENoPreference;
     if (name == DefaultAudioEndpoint)
@@ -967,30 +872,17 @@ void S60VideoPlayerSession::setActiveEndpoint(const QString& name)
 #endif
 }
 
-/*!
-    The default Audio output has been changed.
-
-    \a aAudioOutput Audio Output object.
-
-    \a aNewDefault is CAudioOutput::TAudioOutputPreference.
-*/
-
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
-void S60VideoPlayerSession::DefaultAudioOutputChanged( CAudioOutput& aAudioOutput,
-                                        CAudioOutput::TAudioOutputPreference aNewDefault)
+void S60VideoPlayerSession::DefaultAudioOutputChanged(CAudioOutput& aAudioOutput,
+                                                      CAudioOutput::TAudioOutputPreference aNewDefault)
 {
     TRACE("S60VideoPlayerSession::DefaultAudioOutputChanged" << qtThisPtr()
           << "newDefault" << aNewDefault);
-
     // Emit already implemented in setActiveEndpoint function
     Q_UNUSED(aAudioOutput)
     Q_UNUSED(aNewDefault)
 }
 
-/*!
- * \return  CAudioOutput::ENoOutput by converting it to QString.
-*/
-
 QString S60VideoPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::TAudioOutputPreference output) const
 {
     if (output == CAudioOutput::ENoPreference)
@@ -1007,32 +899,24 @@ QString S60VideoPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::T
 }
 #endif //HAS_AUDIOROUTING_IN_VIDEOPLAYER)
 
-/*!
- * \return TRUE if video is Seekable else FALSE.
-*/
-
 bool S60VideoPlayerSession::getIsSeekable() const
 {
     bool seekable = ETrue;
     int numberOfMetaDataEntries = 0;
-
     TRAPD(err, numberOfMetaDataEntries = m_player->NumberOfMetaDataEntriesL());
     if (err)
         return seekable;
-
-    for (int i = 0; i < numberOfMetaDataEntries; i++) {
-        CMMFMetaDataEntry *entry = NULL;
+    for (int i=0; i<numberOfMetaDataEntries; ++i) {
+        CMMFMetaDataEntry *entry = 0;
         TRAP(err, entry = m_player->MetaDataEntryL(i));
-
         if (err)
             return seekable;
-
         if (!entry->Name().Compare(KSeekable)) {
             if (!entry->Value().Compare(KFalse))
                 seekable = EFalse;
             break;
         }
     }
-
     return seekable;
 }
+
diff --git a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h
index 79df6aabd1..c9bb7154cc 100644
--- a/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h
+++ b/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h
@@ -49,21 +49,22 @@
 
 #ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
 #include <videoplayer2.h>
+#include <graphics/surface.h>
+#include <surfaceeventhandler.h>
 #else
 #include <videoplayer.h>
-#endif // VIDEOOUTPUT_GRAPHICS_SURFACES
+#endif
 
 #include <QtCore/QCoreApplication>
-#include <QtGui/qwidget.h>
-#include <qvideowidget.h>
 
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
 #include <AudioOutput.h>
 #include <MAudioOutputObserver.h>
-#endif // HAS_AUDIOROUTING_IN_VIDEOPLAYER
+#endif
 
 class QTimer;
 class S60MediaNetworkAccessControl;
+class S60NativeWindow;
 class S60VideoDisplay;
 
 // Helper classes to pass Symbian events from WServ to the S60VideoPlayerSession
@@ -81,8 +82,8 @@ class S60VideoPlayerEventHandler : public QObject
 public:
     static S60VideoPlayerEventHandler *instance();
     static bool filterEvent(void *message, long *result);
-    void addApplicationFocusObserver(ApplicationFocusObserver* observer);
-    void removeApplicationFocusObserver(ApplicationFocusObserver* observer);
+    void addApplicationFocusObserver(ApplicationFocusObserver *observer);
+    void removeApplicationFocusObserver(ApplicationFocusObserver *observer);
 private:
     S60VideoPlayerEventHandler();
     ~S60VideoPlayerEventHandler();
@@ -95,6 +96,9 @@ private:
 class S60VideoPlayerSession : public S60MediaPlayerSession
                             , public MVideoPlayerUtilityObserver
                             , public MVideoLoadingObserver
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+                            , public MMMFSurfaceEventHandler
+#endif
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
                             , public MAudioOutputObserver
 #endif // HAS_AUDIOROUTING_IN_VIDEOPLAYER
@@ -105,22 +109,22 @@ public:
     S60VideoPlayerSession(QMediaService *service, S60MediaNetworkAccessControl *object);
     ~S60VideoPlayerSession();
 
-    // From S60MediaPlayerSession
+    // S60MediaPlayerSession
     bool isVideoAvailable();
     bool isAudioAvailable();
     void setVideoRenderer(QObject *renderer);
 
-    // From MVideoLoadingObserver
+    // MVideoLoadingObserver
     void MvloLoadingStarted();
     void MvloLoadingComplete();
     void setPlaybackRate(qreal rate);
 #ifdef HAS_AUDIOROUTING_IN_VIDEOPLAYER
-    // From MAudioOutputObserver
+    // MAudioOutputObserver
     void DefaultAudioOutputChanged(CAudioOutput& aAudioOutput,
                                    CAudioOutput::TAudioOutputPreference aNewDefault);
 #endif
 
-    // From S60MediaPlayerAudioEndpointSelector
+    // S60MediaPlayerAudioEndpointSelector
     QString activeEndpoint() const;
     QString defaultEndpoint() const;
 
@@ -129,16 +133,19 @@ public:
     void applicationLostFocus();
 
 signals:
-    void nativeSizeChanged(QSize);
+    void nativeSizeChanged(QSize size);
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+    void nativeSurfaceChanged(TSurfaceId surface);
+#endif
 
 public Q_SLOTS:
-    void setActiveEndpoint(const QString& name);
+    void setActiveEndpoint(const QString &name);
 
 signals:
     void accessPointChanged(int);
 
 protected:
-    // From S60MediaPlayerSession
+    // S60MediaPlayerSession
     void doLoadL(const TDesC &path);
     void doLoadUrlL(const TDesC &path);
     void doPlay();
@@ -151,7 +158,7 @@ protected:
     void updateMetaDataEntriesL();
     int doGetBufferStatusL() const;
     qint64 doGetDurationL() const;
-    void doSetAudioEndpoint(const QString& audioEndpoint);
+    void doSetAudioEndpoint(const QString &audioEndpoint);
     bool getIsSeekable() const;
 
 private slots:
@@ -163,8 +170,8 @@ private slots:
     void suspendDirectScreenAccess();
     void resumeDirectScreenAccess();
 #endif
-    
-private: 
+
+private:
     void applyPendingChanges(bool force = false);
 #ifndef VIDEOOUTPUT_GRAPHICS_SURFACES
     void startDirectScreenAccess();
@@ -174,21 +181,34 @@ private:
     QString qStringFromTAudioOutputPreference(CAudioOutput::TAudioOutputPreference output) const;
 #endif
 
-    // From MVideoPlayerUtilityObserver
+    // MVideoPlayerUtilityObserver
     void MvpuoOpenComplete(TInt aError);
     void MvpuoPrepareComplete(TInt aError);
     void MvpuoFrameReady(CFbsBitmap &aFrame, TInt aError);
     void MvpuoPlayComplete(TInt aError);
     void MvpuoEvent(const TMMFEvent &aEvent);
 
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+    // MMMFSurfaceEventHandler
+    void MmsehSurfaceCreated(TInt aDisplayId, const TSurfaceId& aId,
+                             const TRect& aCropRect,
+                             TVideoAspectRatio aAspectRatio);
+    void MmsehSurfaceParametersChanged(const TSurfaceId& aId,
+                                       const TRect& aCropRect,
+                                       TVideoAspectRatio aAspectRatio);
+    void MmsehRemoveSurface(const TSurfaceId& aId);
+#endif
+
 private:
     int m_accessPointId;
-    S60MediaNetworkAccessControl* m_networkAccessControl;
+    S60MediaNetworkAccessControl *m_networkAccessControl;
     RWsSession *const m_wsSession;
     CWsScreenDevice *const m_screenDevice;
     QMediaService *const m_service;
 #ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
     CVideoPlayerUtility2 *m_player;
+    TSurfaceId m_nativeSurface;
+    S60NativeWindow *m_dummyWindow;
 #else
     CVideoPlayerUtility *m_player;
     bool m_dsaActive;
@@ -216,3 +236,4 @@ private:
 };
 
 #endif
+
diff --git a/plugins/multimedia/symbian/mmf/mmf.pro b/plugins/multimedia/symbian/mmf/mmf.pro
index 4b335c194f..8543d2d094 100644
--- a/plugins/multimedia/symbian/mmf/mmf.pro
+++ b/plugins/multimedia/symbian/mmf/mmf.pro
@@ -1,7 +1,9 @@
+include (../../../../features/utils.pri)
+
 TEMPLATE = lib
 
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmultimediakit_mmfengine)
+TARGET = $$mobilityPluginTarget(qtmultimediakit_mmfengine)
 PLUGIN_TYPE = mediaservice
 include (../../../../common.pri)
 qtAddLibrary(QtMultimediaKit)
@@ -42,7 +44,7 @@ contains(mmf_http_cookies_enabled, yes) {
 }
 load(data_caging_paths)
 TARGET.EPOCALLOWDLLDATA = 1
-TARGET.UID3=0x2002AC76
+TARGET.UID3 = $$mobilityUID(0x2002AC76)
 TARGET.CAPABILITY = ALL -TCB
 MMP_RULES += EXPORTUNFROZEN
 
@@ -51,8 +53,3 @@ pluginDep.sources = $${TARGET}.dll
 pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
 DEPLOYMENT += pluginDep
 
-#Media API spesific deployment
-QtMediaDeployment.sources = QtMultimediaKit.dll
-QtMediaDeployment.path = /sys/bin
-
-DEPLOYMENT += QtMediaDeployment
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp
index 595a8ba62c..972de3e923 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp
@@ -43,8 +43,6 @@
 #include "s60radiotunerservice.h"
 #include "s60mmtrace.h"
 
-#include <QFile>
-
 // from AudioPreference.h
 const TInt KAudioPriorityFMRadio = 79;
 const TUint KAudioPrefRadioAudioEvent = 0x03000001;
@@ -66,14 +64,12 @@ S60RadioTunerControl::S60RadioTunerControl(QObject *parent)
     , m_vol(50)
 {
     TRACE("S60RadioTunerControl::S60RadioTunerControl" << qtThisPtr());
-
     initRadio();
 }
 
 S60RadioTunerControl::~S60RadioTunerControl()
 {
     TRACE("S60RadioTunerControl::~S60RadioTunerControl" << qtThisPtr());
-
 	if (m_tunerUtility) {
 	    m_tunerUtility->Close();
 		m_tunerUtility->CancelNotifyChange();
@@ -81,9 +77,6 @@ S60RadioTunerControl::~S60RadioTunerControl()
 		m_tunerUtility->CancelNotifyStereoChange();
 		delete m_tunerUtility;
 	}
-	if (m_audioPlayerUtility) {
-		m_audioPlayerUtility = NULL;
-	}
 }
 
 bool S60RadioTunerControl::initRadio()
@@ -91,7 +84,7 @@ bool S60RadioTunerControl::initRadio()
 	m_available = false;
 
 	TRAPD(tunerError, m_tunerUtility = CMMTunerUtility::NewL(*this, CMMTunerUtility::ETunerBandFm, 1, 
-												CMMTunerUtility::ETunerAccessPriorityNormal));
+	  										                 CMMTunerUtility::ETunerAccessPriorityNormal));
 	if (tunerError != KErrNone) {
         m_radioError = QRadioTuner::OpenError;
         return m_available;
@@ -104,7 +97,7 @@ bool S60RadioTunerControl::initRadio()
 	}
 	
 	TRAPD(initializeError, m_audioPlayerUtility->InitializeL(KAudioPriorityFMRadio, 
-												TMdaPriorityPreference(KAudioPrefRadioAudioEvent)));
+												             TMdaPriorityPreference(KAudioPrefRadioAudioEvent)));
 	if (initializeError != KErrNone) {
 		m_radioError = QRadioTuner::OpenError;
 		return m_available;
@@ -125,14 +118,12 @@ bool S60RadioTunerControl::initRadio()
 void S60RadioTunerControl::start()
 {
     TRACE("S60RadioTunerControl::start" << qtThisPtr());
-
 	if (!m_audioInitializationComplete) {
 		TFrequency freq(m_currentFreq);
 		m_tunerUtility->Tune(freq);
 	} else {
 		m_audioPlayerUtility->Play();
 	}
-
 	m_apiTunerState = QRadioTuner::ActiveState;
 	emit stateChanged(m_apiTunerState);
 }
@@ -140,7 +131,6 @@ void S60RadioTunerControl::start()
 void S60RadioTunerControl::stop()
 {
     TRACE("S60RadioTunerControl::stop" << qtThisPtr());
-
     if (m_audioPlayerUtility) {
 		m_audioPlayerUtility->Stop();
 		m_apiTunerState = QRadioTuner::StoppedState;
@@ -190,7 +180,6 @@ int S60RadioTunerControl::frequency() const
 void S60RadioTunerControl::setFrequency(int frequency)
 {
     TRACE("S60RadioTunerControl::setFrequency" << qtThisPtr() << "frequency" << frequency);
-
     m_currentFreq = frequency;
     TFrequency freq(m_currentFreq);
     m_tunerUtility->Tune(freq);
@@ -199,7 +188,6 @@ void S60RadioTunerControl::setFrequency(int frequency)
 int S60RadioTunerControl::frequencyStep(QRadioTuner::Band b) const
 {
     int step = 0;
-
     if(b == QRadioTuner::FM)
         step = 100000; // 100kHz steps
     else if(b == QRadioTuner::LW)
@@ -208,7 +196,6 @@ int S60RadioTunerControl::frequencyStep(QRadioTuner::Band b) const
         step = 1000; // 1kHz steps
     else if(b == QRadioTuner::SW)
         step = 500; // 500Hz steps
-
     return step;
 }
 
@@ -217,14 +204,11 @@ QPair<int,int> S60RadioTunerControl::frequencyRange(QRadioTuner::Band band) cons
 	TFrequency bottomFreq;
 	TFrequency topFreq;
 	int bandError = KErrNone;
-   
 	if (m_tunerUtility){
 		bandError = m_tunerUtility->GetFrequencyBandRange(bottomFreq, topFreq);	   
-		if (!bandError) {
+		if (!bandError)
 			return qMakePair<int,int>(bottomFreq.iFrequency, topFreq.iFrequency);
-		}
     }
-
    return qMakePair<int,int>(0,0);
 }
 
@@ -254,7 +238,6 @@ QRadioTuner::StereoMode S60RadioTunerControl::stereoMode() const
 void S60RadioTunerControl::setStereoMode(QRadioTuner::StereoMode mode)
 {
     TRACE("S60RadioTunerControl::setStereoMode" << qtThisPtr() << "mode" << mode);
-
 	m_stereoMode = mode;
 	if (m_tunerUtility) {	    
 	    if (QRadioTuner::ForceMono == mode)
@@ -281,7 +264,6 @@ int S60RadioTunerControl::signalStrength() const
             }           
         }
     }
-
     return m_signal;
 }
 
@@ -293,7 +275,6 @@ int S60RadioTunerControl::volume() const
 void S60RadioTunerControl::setVolume(int volume)
 {
     TRACE("S60RadioTunerControl::setVolume" << qtThisPtr() << "volume" << volume);
-
     if (m_audioPlayerUtility) {
 		m_vol = volume;
 		TInt error = m_audioPlayerUtility->SetVolume(volume/10);
@@ -309,7 +290,6 @@ bool S60RadioTunerControl::isMuted() const
 void S60RadioTunerControl::setMuted(bool muted)
 {
     TRACE("S60RadioTunerControl::setMuted" << qtThisPtr() << "muted" << muted);
-
     if (m_audioPlayerUtility && m_audioInitializationComplete) {
         m_muted = muted;
         m_audioPlayerUtility->Mute(m_muted);
@@ -333,7 +313,6 @@ bool S60RadioTunerControl::isSearching() const
 void S60RadioTunerControl::cancelSearch()
 {
     TRACE("S60RadioTunerControl::cancelSearch" << qtThisPtr());
-
 	m_tunerUtility->CancelRetune();
 	m_scanning = false;
 	emit searchingChanged(false);
@@ -342,7 +321,6 @@ void S60RadioTunerControl::cancelSearch()
 void S60RadioTunerControl::searchForward()
 {
     TRACE("S60RadioTunerControl::searchForward" << qtThisPtr());
-
 	m_scanning = true;
 	setVolume(m_vol);
 	m_tunerUtility->StationSeek(CMMTunerUtility::ESearchDirectionUp);
@@ -352,7 +330,6 @@ void S60RadioTunerControl::searchForward()
 void S60RadioTunerControl::searchBackward()
 {
     TRACE("S60RadioTunerControl::searchBackward" << qtThisPtr());
-
 	m_scanning = true;
 	setVolume(m_vol);
 	m_tunerUtility->StationSeek(CMMTunerUtility::ESearchDirectionDown);
@@ -390,16 +367,14 @@ QString S60RadioTunerControl::errorString() const
 void S60RadioTunerControl::MToTuneComplete(TInt aError)
 {
     TRACE("S60RadioTunerControl::MToTuneComplete" << qtThisPtr() << "error" << error);
-
 	if (aError == KErrNone) {
 		m_scanning = false;
 		m_audioPlayerUtility->Play();
 		if (!m_audioInitializationComplete) {
 		TRAPD(initializeError, m_audioPlayerUtility->InitializeL(KAudioPriorityFMRadio, 
-                                                        TMdaPriorityPreference(KAudioPrefRadioAudioEvent)));
-			if (initializeError != KErrNone) {
-				m_radioError = QRadioTuner::OpenError;
-			}
+                                                                 TMdaPriorityPreference(KAudioPrefRadioAudioEvent)));
+        if (initializeError != KErrNone)
+            m_radioError = QRadioTuner::OpenError;
 		}
 	}
 }
@@ -408,7 +383,6 @@ void S60RadioTunerControl::MTcoFrequencyChanged(const TFrequency& aOldFrequency,
 {
     TRACE("S60RadioTunerControl::MTcoFrequencyChanged" << qtThisPtr()
           << "oldFreq" << aOldFrequency.iFrequency << "newFreq" << aNewFrequency.iFrequency);
-
 	m_currentFreq = aNewFrequency.iFrequency;
 	m_scanning = false;
 	emit frequencyChanged(m_currentFreq);
@@ -418,29 +392,23 @@ void S60RadioTunerControl::MTcoStateChanged(const TUint32& aOldState, const TUin
 {
     TRACE("S60RadioTunerControl::MTcoStateChanged" << qtThisPtr()
           << "oldState" << aOldState << "newState" << aNewState);
-
-	if (aNewState == CMMTunerUtility::ETunerStateActive) {
+	if (aNewState == CMMTunerUtility::ETunerStateActive)
 		m_apiTunerState = QRadioTuner::ActiveState;
-	}
-	if (aNewState == CMMTunerUtility::ETunerStatePlaying) {
+	if (aNewState == CMMTunerUtility::ETunerStatePlaying)
 		m_apiTunerState = QRadioTuner::ActiveState;
-	}	
-	if (aOldState != aNewState){
+	if (aOldState != aNewState)
 		emit stateChanged(m_apiTunerState);
-	}
 }
 
 void S60RadioTunerControl::MTcoAntennaDetached()
 {
     TRACE("S60RadioTunerControl::MTcoAntennaDetached" << qtThisPtr());
-
 	// no actions
 }
 
 void S60RadioTunerControl::MTcoAntennaAttached()
 {
     TRACE("S60RadioTunerControl::MTcoAntennaAttached" << qtThisPtr());
-
 	// no actions
 }
 
@@ -448,7 +416,6 @@ void S60RadioTunerControl::FlightModeChanged(TBool aFlightMode)
 {
     TRACE("S60RadioTunerControl::FlightModeChanged" << qtThisPtr()
           << "enabled" << aFlightMode);
-
 	// no actions
 }
 
@@ -464,16 +431,14 @@ void S60RadioTunerControl::MTsoForcedMonoChanged(TBool aForcedMono)
 {
     TRACE("S60RadioTunerControl::MTsoForcedMonoChanged" << qtThisPtr()
           << "forcedMono" << aForcedMono);
-	if (aForcedMono) {
+	if (aForcedMono)
 		m_stereoMode = QRadioTuner::ForceMono;
-	}
 }
 
 void S60RadioTunerControl::MssoSignalStrengthChanged(TInt aNewSignalStrength)
 {
     TRACE("S60RadioTunerControl::MssoSignalStrengthChanged" << qtThisPtr()
           << "signalStrength" << aNewSignalStrength);
-
 	m_signal = aNewSignalStrength;
 	emit signalStrengthChanged(m_signal);
 }
@@ -482,7 +447,6 @@ void S60RadioTunerControl::MTapoInitializeComplete(TInt aError)
 {
     TRACE("S60RadioTunerControl::MTapoInitializeComplete" << qtThisPtr()
           << "error" << aError);
-
 	if (aError == KErrNone) {
 		m_audioInitializationComplete = true;
 		m_available = true;
@@ -498,9 +462,5 @@ void S60RadioTunerControl::MTapoPlayEvent(TEventType aEvent, TInt aError, TAny*
 {
     TRACE("S60RadioTunerControl::MTapoPlayEvent" << qtThisPtr()
           << "event" << aEvent << "error" << aError);
-
 	// no actions
 }
-
-
-
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h
index 4a1a61f11c..c6f2a0f160 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h
@@ -42,7 +42,6 @@
 #ifndef S60RADIOTUNERCONTROL_H
 #define S60RADIOTUNERCONTROL_H
 
-#include <QtCore/qobject.h>
 #include <qradiotunercontrol.h>
 #include <qradiotuner.h>
 #include <tuner.h>
@@ -103,59 +102,52 @@ public:
     QRadioTuner::Error error() const;
     QString errorString() const;
     
-    //MMMTunerObserver
+    // MMMTunerObserver
     void MToTuneComplete(TInt aError);
     
-    //MMMTunerChangeObserver
+    // MMMTunerChangeObserver
     void MTcoFrequencyChanged(const TFrequency& aOldFrequency, const TFrequency& aNewFrequency);
     void MTcoStateChanged(const TUint32& aOldState, const TUint32& aNewState);
     void MTcoAntennaDetached();
     void MTcoAntennaAttached();
     void FlightModeChanged(TBool aFlightMode);
     
-    //MMMTunerStereoObserver
+    // MMMTunerStereoObserver
     void MTsoStereoReceptionChanged(TBool aStereo);
     void MTsoForcedMonoChanged(TBool aForcedMono);
     
-    //MMMSignalStrengthObserver
+    // MMMSignalStrengthObserver
     void MssoSignalStrengthChanged(TInt aNewSignalStrength);
     
-    //MMMTunerAudioPlayerObserver
+    // MMMTunerAudioPlayerObserver
     void MTapoInitializeComplete(TInt aError);
     void MTapoPlayEvent(TEventType aEvent, TInt aError, TAny* aAdditionalInfo);
 
-private slots:
-
-
 private:
     bool initRadio();
     CMMTunerUtility::TTunerBand getNativeBand(QRadioTuner::Band b) const;
 
+private:
     mutable int m_error;
     CMMTunerUtility *m_tunerUtility;
     CMMTunerAudioPlayerUtility *m_audioPlayerUtility;
-    
     bool m_audioInitializationComplete;
     bool m_muted;
     bool m_isStereo;
     bool m_available;
     int  m_step;
     int  m_vol;
-    mutable int  m_signal;
+    mutable int m_signal;
     bool m_scanning;
     bool forward;
     QRadioTuner::Band m_currentBand;
     qint64 m_currentFreq;
-    
     QRadioTuner::Error m_radioError;
     QRadioTuner::StereoMode m_stereoMode;
     QString m_errorString;
-    //caps meaning what the tuner can do.
     TTunerCapabilities m_currentTunerCapabilities;
     long m_tunerState; 
     QRadioTuner::State m_apiTunerState;
-    
 };
 
 #endif
-
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp
index 65381fd368..801e688a7c 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp
@@ -48,9 +48,9 @@
 S60RadioTunerControl::S60RadioTunerControl(QObject *parent)
     : QRadioTunerControl(parent)
     , m_error(0)
-    , m_radioUtility(NULL)
-    , m_fmTunerUtility(NULL)
-    , m_playerUtility(NULL)
+    , m_radioUtility(0)
+    , m_fmTunerUtility(0)
+    , m_playerUtility(0)
     , m_maxVolume(100)
     , m_audioInitializationComplete(false)
     , m_muted(false)
@@ -80,15 +80,10 @@ S60RadioTunerControl::S60RadioTunerControl(QObject *parent)
 S60RadioTunerControl::~S60RadioTunerControl()
 {
     TRACE("S60RadioTunerControl::~S60RadioTunerControl" << qtThisPtr());
-
-    if (m_fmTunerUtility) {
+    if (m_fmTunerUtility)
         m_fmTunerUtility->Close();
-    }
-
-    if (m_playerUtility) {
+    if (m_playerUtility)
         m_playerUtility->Close();
-    }
-
     delete m_radioUtility;
 }
 
@@ -119,15 +114,14 @@ bool S60RadioTunerControl::isBandSupported(QRadioTuner::Band b) const
 }
 
 void S60RadioTunerControl::changeSignalStrength()
-    {
-    
+{
     int currentSignal = signalStrength();
-    if (currentSignal != m_previousSignal)
-        {
+    if (currentSignal != m_previousSignal) {
         m_previousSignal = currentSignal;
         emit signalStrengthChanged(currentSignal);
-        }
     }
+}
+
 void S60RadioTunerControl::setBand(QRadioTuner::Band b)
 {
     TRACE("S60RadioTunerControl::setBand" << qtThisPtr() << "band" << b);
@@ -136,29 +130,27 @@ void S60RadioTunerControl::setBand(QRadioTuner::Band b)
         if (isBandSupported(tempBand)){
             m_currentBand = b;  
             emit bandChanged(m_currentBand);
-        }
-        else {
-            switch(tempBand)
-                {
-                case QRadioTuner::FM :
-                    m_errorString = QString(tr("Band FM not Supported"));
-                    break;
-                case QRadioTuner::AM :
-                    m_errorString = QString(tr("Band AM not Supported"));
-                    break;
-                case QRadioTuner::SW :
-                    m_errorString = QString(tr("Band SW not Supported"));
-                    break;
-                case QRadioTuner::LW :
-                    m_errorString = QString(tr("Band LW not Supported"));
-                    break;
-                case QRadioTuner::FM2 :
-                    m_errorString = QString(tr("Band FM2 not Supported"));
-                    break;
-                default :
-                    m_errorString = QString("Band %1 not Supported").arg(tempBand);
-                    break;
-                }
+        } else {
+            switch(tempBand) {
+            case QRadioTuner::FM :
+                m_errorString = QString(tr("Band FM not Supported"));
+                break;
+            case QRadioTuner::AM :
+                m_errorString = QString(tr("Band AM not Supported"));
+                break;
+            case QRadioTuner::SW :
+                m_errorString = QString(tr("Band SW not Supported"));
+                break;
+            case QRadioTuner::LW :
+                m_errorString = QString(tr("Band LW not Supported"));
+                break;
+            case QRadioTuner::FM2 :
+                m_errorString = QString(tr("Band FM2 not Supported"));
+                break;
+            default :
+                m_errorString = QString("Band %1 not Supported").arg(tempBand);
+                break;
+            }
             emit error(QRadioTuner::OutOfRangeError);
         }
     }
@@ -172,10 +164,10 @@ int S60RadioTunerControl::frequency() const
 void S60RadioTunerControl::setFrequency(int frequency)
 {
     TRACE("S60RadioTunerControl::setFrequency" << qtThisPtr() << "frequency" << frequency);
-
     m_currentFreq = frequency;
     m_fmTunerUtility->SetFrequency(m_currentFreq);
 }
+
 int S60RadioTunerControl::frequencyStep(QRadioTuner::Band b) const
 {
     int step = 0;
@@ -194,17 +186,12 @@ QPair<int,int> S60RadioTunerControl::frequencyRange(QRadioTuner::Band band) cons
 {
     int bottomFreq;
     int topFreq;
-
     int bandError = KErrNone;
     TFmRadioFrequencyRange range;
-
-    if (m_fmTunerUtility) {
+    if (m_fmTunerUtility)
         bandError = m_fmTunerUtility->GetFrequencyRange(range, bottomFreq, topFreq);
-    }
-    if (!bandError) {
+    if (!bandError)
         return qMakePair<int,int>(bottomFreq, topFreq);
-    }
-
     return qMakePair<int,int>(0,0);
 }
 
@@ -221,7 +208,6 @@ QRadioTuner::StereoMode S60RadioTunerControl::stereoMode() const
 void S60RadioTunerControl::setStereoMode(QRadioTuner::StereoMode mode)
 {
     TRACE("S60RadioTunerControl::setStereoMode" << qtThisPtr() << "mode" << mode);
-
     if (m_fmTunerUtility) {
         if (QRadioTuner::ForceMono == mode) {
             m_fmTunerUtility->ForceMonoReception(true);
@@ -242,18 +228,15 @@ int S60RadioTunerControl::signalStrength() const
         TInt maxSignalStrength;
         TInt currentSignalStrength;
         m_error = m_fmTunerUtility->GetMaxSignalStrength(maxSignalStrength);
-
         if (m_error == KErrNone) {
             m_error = m_fmTunerUtility->GetSignalStrength(currentSignalStrength);
             if (m_error == KErrNone) {
-                if (currentSignalStrength == 0 || maxSignalStrength == 0) {
+                if (currentSignalStrength == 0 || maxSignalStrength == 0)
                     return currentSignalStrength;
-                }
                 m_signal = ((TInt64)currentSignalStrength) * 100 / maxSignalStrength;
             }
         }
     }
-
     return m_signal;
 }
 
@@ -265,20 +248,16 @@ int S60RadioTunerControl::volume() const
 void S60RadioTunerControl::setVolume(int volume)
 {
     TRACE("S60RadioTunerControl::setVolume" << qtThisPtr() << "volume" << volume);
-
     int boundVolume = qBound(0, volume, 100);
-
     if (m_vol == boundVolume )
         return;
-
     if (!m_muted && m_playerUtility) {
         m_vol = boundVolume;
         // Don't set volume until State is in Active State.
         if (state() == QRadioTuner::ActiveState ) {
             m_playerUtility->SetVolume(m_vol*m_volMultiplier);
-
         } else {
-            m_volChangeRequired = TRUE;
+            m_volChangeRequired = true;
             emit volumeChanged(boundVolume);
         }
     }
@@ -306,7 +285,6 @@ bool S60RadioTunerControl::isSearching() const
 void S60RadioTunerControl::cancelSearch()
 {
     TRACE("S60RadioTunerControl::cancelSearch" << qtThisPtr());
-
     m_fmTunerUtility->CancelStationSeek();
     m_scanning = false;
     emit searchingChanged(false);
@@ -351,9 +329,7 @@ bool S60RadioTunerControl::initRadio()
         m_radioError = QRadioTuner::ResourceError;
         return m_available;
     }
-
     m_tunerControl = false;
-
     m_available = true;
     return m_available;
 }
@@ -374,20 +350,18 @@ QtMultimediaKit::AvailabilityError S60RadioTunerControl::availabilityError() con
 void S60RadioTunerControl::start()
 {
     TRACE("S60RadioTunerControl::start" << qtThisPtr());
-    if (!m_tunerControl) {
+    if (!m_tunerControl)
         m_fmTunerUtility->RequestTunerControl();
-    } else {
+    else
         m_playerUtility->Play();
-    }
     m_signalStrengthTimer->start(3000);
 }
 
 void S60RadioTunerControl::stop()
 {
     TRACE("S60RadioTunerControl::stop" << qtThisPtr());
-    if (m_playerUtility) {
+    if (m_playerUtility)
         m_playerUtility->Stop();
-    }
     m_signalStrengthTimer->stop();
 }
 
@@ -410,10 +384,8 @@ void S60RadioTunerControl::MrpoStateChange(TPlayerState aState, TInt aError)
             m_apiTunerState = QRadioTuner::StoppedState;
         } else if (aState == ERadioPlayerPlaying) {
             m_apiTunerState = QRadioTuner::ActiveState;
-            //Apply pending volume changes.
-            if(m_volChangeRequired){
+            if (m_volChangeRequired)
                 setVolume(m_vol);
-                }
         }
     } else {
         m_apiTunerState = QRadioTuner::StoppedState;
@@ -426,12 +398,10 @@ void S60RadioTunerControl::MrpoVolumeChange(TInt aVolume)
     TRACE("S60RadioTunerControl::MrpoVolumeChange" << qtThisPtr()
           << "volume" << aVolume);
     m_vol = (aVolume/m_volMultiplier);
-    if (!m_volChangeRequired) {
+    if (!m_volChangeRequired)
         emit volumeChanged(m_vol);
-
-    } else {
+    else
         m_volChangeRequired = false;
-    }
 }
 
 void S60RadioTunerControl::MrpoMuteChange(TBool aMute)
@@ -446,7 +416,6 @@ void S60RadioTunerControl::MrpoBalanceChange(TInt aLeftPercentage, TInt aRightPe
 {
     TRACE("S60RadioTunerControl::MrpoBalanceChange" << qtThisPtr()
           << "left" << aLeftPercentage << "right" << aRightPercentage);
-
     // no actions
 }
 
@@ -467,7 +436,6 @@ void S60RadioTunerControl::MrftoRequestTunerControlComplete(TInt aError)
             emit signalStrengthChanged(signal);
             m_signal = signal;
         }
-
     } else if (aError == KFmRadioErrAntennaNotConnected) {
         m_radioError = QRadioTuner::OpenError;
         m_errorString = QString(tr("Antenna Not Connected"));
@@ -480,7 +448,7 @@ void S60RadioTunerControl::MrftoRequestTunerControlComplete(TInt aError)
         m_radioError = QRadioTuner::OutOfRangeError;
         m_errorString = QString(tr("Frequency out of band range"));
         emit error(m_radioError);
-    }else{
+    } else {
         m_radioError = QRadioTuner::OpenError;
         m_errorString = QString(tr("Unknown Error."));
         emit error(m_radioError);
@@ -540,7 +508,6 @@ void S60RadioTunerControl::MrftoFmTransmitterStatusChange(TBool aActive)
 {
     TRACE("S60RadioTunerControl::MrftoFmTransmitterStatusChange" << qtThisPtr()
           << "active" << aActive);
-
     //no actions
 }
 
@@ -548,37 +515,30 @@ void S60RadioTunerControl::MrftoAntennaStatusChange(TBool aAttached)
 {
     TRACE("S60RadioTunerControl::MrftoAntennaStatusChange" << qtThisPtr()
           << "attached" << aAttached);
-
-    if (aAttached && m_tunerControl) {
+    if (aAttached && m_tunerControl)
         m_playerUtility->Play();
-    }
 }
 
 void S60RadioTunerControl::MrftoOfflineModeStatusChange(TBool aOfflineMode)
 {
     TRACE("S60RadioTunerControl::MrftoOfflineModeStatusChange" << qtThisPtr()
           << "mode" << aOfflineMode);
-
 }
 
 void S60RadioTunerControl::MrftoFrequencyRangeChange(TFmRadioFrequencyRange aBand /*, TInt aMinFreq, TInt aMaxFreq*/)
 {
     TRACE("S60RadioTunerControl::MrftoFrequencyRangeChange" << qtThisPtr()
           << "band" << aBand);
-
-    if (aBand == EFmRangeEuroAmerica) {
+    if (aBand == EFmRangeEuroAmerica)
         setBand(QRadioTuner::FM);
-    }
 }
 
 void S60RadioTunerControl::MrftoFrequencyChange(TInt aNewFrequency)
 {
     TRACE("S60RadioTunerControl::MrftoFrequencyChange" << qtThisPtr()
           << "frequency" << aNewFrequency);
-
     m_currentFreq = aNewFrequency;
     emit frequencyChanged(m_currentFreq);
-
     int signal = signalStrength();
     if (m_signal != signal) {
         emit signalStrengthChanged(signal);
@@ -590,12 +550,10 @@ void S60RadioTunerControl::MrftoForcedMonoChange(TBool aForcedMono)
 {
     TRACE("S60RadioTunerControl::MrftoForcedMonoChange" << qtThisPtr()
           << "forcedMono" << aForcedMono);
-
-    if (aForcedMono) {
+    if (aForcedMono)
         m_stereoMode = QRadioTuner::ForceMono;
-    } else {
+    else
         m_stereoMode = QRadioTuner::ForceStereo;
-    }
     emit stereoStatusChanged(!aForcedMono);
 }
 
@@ -603,6 +561,5 @@ void S60RadioTunerControl::MrftoSquelchChange(TBool aSquelch)
 {
     TRACE("S60RadioTunerControl::MrftoSquelchChange" << qtThisPtr()
           << "squelch" << aSquelch);
-
     // no actions
 }
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h
index 7081e5718b..9e331aa5a4 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h
@@ -255,17 +255,22 @@ public:
 	 */
 	void MrftoSquelchChange(TBool aSquelch);
 
+Q_SIGNALS:
+     void error(QRadioTuner::Error) const;
+
+protected slots:
+    void changeSignalStrength();
+
 private:
     bool initRadio();
 
+private:
     mutable int m_error;
-
     CRadioUtility* m_radioUtility;   
     CRadioFmTunerUtility* m_fmTunerUtility;
     CRadioPlayerUtility* m_playerUtility;
     TInt m_maxVolume;
     TReal m_volMultiplier;
-
 	bool m_tunerControl;
     bool m_audioInitializationComplete;
     bool m_muted;
@@ -278,18 +283,11 @@ private:
     bool m_scanning;
     QRadioTuner::Band m_currentBand;
     qint64 m_currentFreq;
-    
     QRadioTuner::Error m_radioError;
     QRadioTuner::StereoMode m_stereoMode;
     QString m_errorString;
     QRadioTuner::State m_apiTunerState;
     QTimer *m_signalStrengthTimer;
-    
-Q_SIGNALS:
-     void error(QRadioTuner::Error) const;
-     
-protected slots:
-    void changeSignalStrength();
 };
 
 #endif
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp
index 87859b8f22..43e11010af 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp
@@ -42,19 +42,16 @@
 #include "s60radiotunerservice.h"
 #include "s60mmtrace.h"
 
-
 S60RadioTunerService::S60RadioTunerService(QObject *parent)
     : QMediaService(parent)
 {
     TRACE("S60RadioTunerService::S60RadioTunerService" << qtThisPtr());
-
 	m_playerControl = new S60RadioTunerControl(this);
 }
 
 S60RadioTunerService::~S60RadioTunerService()
 {
     TRACE("S60RadioTunerService::~S60RadioTunerService" << qtThisPtr());
-
 	delete m_playerControl;
 }
 
@@ -72,6 +69,5 @@ void S60RadioTunerService::releaseControl(QMediaControl *control)
 {
     TRACE("S60RadioTunerService::releaseControl" << qtThisPtr()
           << "control" << control);
-
 	Q_UNUSED(control);
 }
diff --git a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h
index bdc3e82749..331fb05e8c 100644
--- a/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h
+++ b/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h
@@ -42,8 +42,6 @@
 #ifndef S60RADIOTUNERSERVICE_H
 #define S60RADIOTUNERSERVICE_H
 
-#include <QtCore/qobject.h>
-
 #include <qmediaservice.h>
 
 #ifdef TUNERLIBUSED
diff --git a/plugins/multimedia/symbian/mmf/s60formatsupported.cpp b/plugins/multimedia/symbian/mmf/s60formatsupported.cpp
index 5287649f81..f36746fd63 100644
--- a/plugins/multimedia/symbian/mmf/s60formatsupported.cpp
+++ b/plugins/multimedia/symbian/mmf/s60formatsupported.cpp
@@ -39,66 +39,45 @@
 **
 ****************************************************************************/
 
-
 #include "s60formatsupported.h"
 
-
-
 S60FormatSupported::S60FormatSupported()
-{}
+{
+
+}
 
 S60FormatSupported::~S60FormatSupported()
 {
-    if (m_controllerparam) {
-        delete m_controllerparam;
-        m_controllerparam = NULL;
-    }
+    delete m_controllerparam;
 }
 
 QStringList S60FormatSupported::supportedPlayMimeTypesL()
 {
-
     RArray<TUid> mediaIds; //search for both audio and video
-
     RMMFControllerImplInfoArray iControllers;
-
     m_controllerparam = CMMFControllerPluginSelectionParameters::NewL();
-
     m_playformatparam = CMMFFormatSelectionParameters::NewL();
-
     mediaIds.Append(KUidMediaTypeAudio);
-
     mediaIds.Append(KUidMediaTypeVideo);
-
     m_controllerparam->SetMediaIdsL(mediaIds, CMMFPluginSelectionParameters::EAllowOtherMediaIds);
-
     m_controllerparam->SetRequiredPlayFormatSupportL(*m_playformatparam);
-
     m_controllerparam->ListImplementationsL(iControllers);
-
     CDesC8ArrayFlat* controllerArray = new (ELeave) CDesC8ArrayFlat(1);
-
     for (TInt i = 0; i < iControllers.Count(); i++) {
         for (TInt j = 0; j < (iControllers[i]->PlayFormats()).Count(); j++) {
             const CDesC8Array& iarr = (iControllers[i]->PlayFormats()[j]->SupportedMimeTypes());
-
             TInt count = iarr.Count();
-
             for (TInt k = 0; k < count; k++) {
                 TPtrC8 ptr = iarr.MdcaPoint(k);
-
                 HBufC8* n = HBufC8::NewL(ptr.Length());
-
                 TPtr8 ptr1 = n->Des();
-
                 ptr1.Copy((TUint8*) ptr.Ptr(), ptr.Length());
-
                 controllerArray->AppendL(ptr1);
             }
         }
     }
 
-// converting CDesC8Array to QStringList
+    // converting CDesC8Array to QStringList
     for (TInt x = 0; x < controllerArray->Count(); x++) {
         m_supportedplaymime.append(QString::fromUtf8(
                 (const char*) (controllerArray->MdcaPoint(x).Ptr()),
@@ -110,12 +89,9 @@ QStringList S60FormatSupported::supportedPlayMimeTypesL()
     QStringList tempvideo = m_supportedplaymime.filter(QString("video"));
 
     m_supportedplaymime.clear();
-
     m_supportedplaymime = tempaudio + tempvideo;
-
     mediaIds.Close();
     delete controllerArray;
     iControllers.ResetAndDestroy();
-
     return m_supportedplaymime;
 }
diff --git a/plugins/multimedia/symbian/mmf/s60formatsupported.h b/plugins/multimedia/symbian/mmf/s60formatsupported.h
index 89aa8639b0..4e1f588606 100644
--- a/plugins/multimedia/symbian/mmf/s60formatsupported.h
+++ b/plugins/multimedia/symbian/mmf/s60formatsupported.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef S60FORMATSUPPORTED_H_
-#define S60FORMATSUPPORTED_H_
+#ifndef S60FORMATSUPPORTED_H
+#define S60FORMATSUPPORTED_H
 
 #include <mmf/common/mmfcontrollerpluginresolver.h>
 #include <mmf/server/mmfdatasourcesink.hrh>
@@ -57,9 +57,9 @@ public:
     QStringList supportedPlayMimeTypesL();
 
 private:
-
     CMMFFormatSelectionParameters* m_playformatparam;
     CMMFControllerPluginSelectionParameters* m_controllerparam;
     QStringList m_supportedplaymime;
 };
-#endif /* S60FORMATSUPPORTED_H_ */
+
+#endif // S60FORMATSUPPORTED_H
diff --git a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp
index 6074a6e5f0..21d084f22e 100644
--- a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp
+++ b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp
@@ -51,7 +51,7 @@
 #endif
 #ifdef AUDIOSOURCEUSED
 #include "s60audiocaptureservice.h"
-#endif /* AUDIOSOURCEUSED */
+#endif
 
 QStringList S60MediaServicePlugin::keys() const
 {
@@ -65,7 +65,7 @@ QStringList S60MediaServicePlugin::keys() const
 #endif
 #ifdef AUDIOSOURCEUSED
     list << QLatin1String(Q_MEDIASERVICE_AUDIOSOURCE);
-#endif /* AUDIOSOURCEUSED */
+#endif
     return list;
 }
 
@@ -78,12 +78,11 @@ QMediaService* S60MediaServicePlugin::create(QString const& key)
 #ifdef AUDIOSOURCEUSED
     if (key == QLatin1String(Q_MEDIASERVICE_AUDIOSOURCE))
         return new S60AudioCaptureService;
-#endif /* AUDIOSOURCEUSED */
+#endif
 #if defined(TUNERLIBUSED) || defined(RADIOUTILITYLIBUSED) 
     if (key == QLatin1String(Q_MEDIASERVICE_RADIO)) 
         return new S60RadioTunerService;
 #endif
-    
     return 0;
 }
 
diff --git a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h
index d0f203a7dc..b58fe29fdf 100644
--- a/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h
+++ b/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h
@@ -39,11 +39,9 @@
 **
 ****************************************************************************/
 
-
 #ifndef S60SERVICEPLUGIN_H
 #define S60SERVICEPLUGIN_H
 
-#include <QtCore/qobject.h>
 #include <qmediaservice.h>
 #include <qmediaserviceproviderplugin.h>
 #include "s60formatsupported.h"
@@ -62,6 +60,7 @@ public:
 
     QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeType, const QStringList& codecs) const;
     QStringList supportedMimeTypes() const;
+
 private:
     mutable QStringList m_supportedmimetypes;
 };
diff --git a/plugins/multimedia/symbian/openmaxal/openmaxal.pro b/plugins/multimedia/symbian/openmaxal/openmaxal.pro
index 0565536a4e..9986ff1a9c 100644
--- a/plugins/multimedia/symbian/openmaxal/openmaxal.pro
+++ b/plugins/multimedia/symbian/openmaxal/openmaxal.pro
@@ -1,7 +1,9 @@
+include (../../../../features/utils.pri)
+
 TEMPLATE = lib
 
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtmultimediakit_openmaxalengine)
+TARGET = $$mobilityPluginTarget(qtmultimediakit_openmaxalengine)
 PLUGIN_TYPE = mediaservice
 include (../../../../common.pri)
 qtAddLibrary(QtMultimediaKit)
@@ -26,7 +28,7 @@ SYMBIAN_PLATFORMS = DEFAULT
 # Input parameters for the generated mmp file
 # -------------------------------------------
 load(data_caging_paths)
-TARGET.UID3 = 0x10207CA1
+TARGET.UID3 = $$mobilityUID(0x10207CA1)
 TARGET.CAPABILITY = ALL -TCB
 TARGET.EPOCALLOWDLLDATA = 1
 MMP_RULES += EXPORTUNFROZEN
diff --git a/plugins/multimedia/symbian/videooutput/s60eglendpoint.cpp b/plugins/multimedia/symbian/videooutput/s60eglendpoint.cpp
new file mode 100644
index 0000000000..7a5f010f53
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60eglendpoint.cpp
@@ -0,0 +1,250 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "s60eglendpoint.h"
+#include "s60eglextensions.h"
+#include "s60mmtrace.h"
+#include <e32base.h>
+#include <egl/egl.h>
+#include <graphics/surface.h>
+#include <QtCore/QDebug>
+#include <QtCore/QTime>
+
+//-----------------------------------------------------------------------------
+// S60EglEndpointEventHandler
+//-----------------------------------------------------------------------------
+
+class S60EglEndpointEventHandler : public CActive
+{
+public:
+    static S60EglEndpointEventHandler *NewL(S60EglEndpoint *parent);
+    ~S60EglEndpointEventHandler();
+    void request();
+
+private:
+    S60EglEndpointEventHandler(S60EglEndpoint *parent);
+    void RunL();
+    void DoCancel();
+
+private:
+    S60EglEndpoint *const m_parent;
+};
+
+S60EglEndpointEventHandler *S60EglEndpointEventHandler::NewL(S60EglEndpoint *parent)
+{
+    S60EglEndpointEventHandler *self = new (ELeave) S60EglEndpointEventHandler(parent);
+    CActiveScheduler::Add(self);
+    return self;
+}
+
+S60EglEndpointEventHandler::S60EglEndpointEventHandler(S60EglEndpoint *parent)
+    : CActive(EPriorityStandard)
+    , m_parent(parent)
+{
+
+}
+
+S60EglEndpointEventHandler::~S60EglEndpointEventHandler()
+{
+    Cancel();
+}
+
+void S60EglEndpointEventHandler::request()
+{
+    TRACE("S60EglEndpointEventHandler::request" << qtThisPtr());
+    Q_ASSERT(!IsActive());
+    iStatus = KRequestPending;
+    EGLTRequestStatusNOK eglStatus = reinterpret_cast<EGLTRequestStatusNOK>(&iStatus);
+    const EGLBoolean ret = m_parent->m_extensions->endpointRequestNotification(m_parent->m_display,
+                                                                               m_parent->m_endpoint,
+                                                                               eglStatus);
+    if (ret) {
+        VERBOSE_TRACE("S60EglEndpointEventHandler::request" << qtThisPtr() << "endpointRequestNotification OK");
+        SetActive();
+    } else {
+        qWarning() << "S60EglEndpointEventHandler::request" << qtThisPtr() << "endpointRequestNotification failed";
+    }
+}
+
+void S60EglEndpointEventHandler::RunL()
+{
+    VERBOSE_TRACE("S60EglEndpointEventHandler::RunL" << qtThisPtr());
+    m_parent->endpointEvent();
+}
+
+void S60EglEndpointEventHandler::DoCancel()
+{
+    TRACE("S60EglEndpointEventHandler::DoCancel" << qtThisPtr());
+    m_parent->m_extensions->endpointCancelNotification(m_parent->m_display,
+                                                       m_parent->m_endpoint);
+}
+
+//-----------------------------------------------------------------------------
+// S60EglEndpoint
+//-----------------------------------------------------------------------------
+
+S60EglEndpoint::S60EglEndpoint(const TSurfaceId &surface,
+                               S60EglExtensions *extensions,
+                               QObject *parent)
+    : QObject(parent)
+    , m_extensions(extensions)
+    , m_context(eglGetCurrentContext())
+    , m_api(0)
+    , m_display(eglGetCurrentDisplay())
+    , m_endpoint(EGL_NO_ENDPOINT_NOK)
+    , m_state(Null)
+{
+    TRACE("S60EglEndpoint::S60EglEndpoint" << qtThisPtr()
+          << "surface" << (void*)surface.iInternal[3]
+          << "context" << m_context << "display" << m_display);
+    Q_ASSERT(m_extensions);
+    bool ok = false;
+    if (m_context) {
+        m_api = eglQueryAPI();
+        if (m_api) {
+            m_display = eglGetCurrentDisplay();
+            if (EGL_NO_DISPLAY != m_display) {
+                ok = true;
+            } else {
+                qWarning() << "S60EglEndpoint::S60EglEndpoint" << qtThisPtr() << "failed to get valid EGL display";
+            }
+        } else {
+            qWarning() << "S60EglEndpoint::S60EglEndpoint" << qtThisPtr() << "failed to get valid rendering API";
+        }
+    } else {
+        qWarning() << "S60EglEndpoint::S60EglEndpoint" << qtThisPtr() << "failed to get valid EGL context";
+    }
+    if (ok) {
+        static const EGLenum type = EGL_ENDPOINT_TYPE_CONSUMER_NOK;
+        static const EGLenum sourceType = EGL_TSURFACEID_NOK;
+        TSurfaceId localSurface = surface;
+        EGLEndpointSourceNOK source = reinterpret_cast<EGLEndpointSourceNOK>(&localSurface);
+        static const EGLint *attributes = 0;
+        m_endpoint = m_extensions->createEndpoint(m_display, type, sourceType, source, attributes);
+        const EGLint error = eglGetError();
+        if (EGL_SUCCESS == error) {
+            TRACE("S60EglEndpoint::S60EglEndpoint" << qtThisPtr()
+                  << "endpoint" << m_endpoint);
+            if (EGL_NO_ENDPOINT_NOK == m_endpoint) {
+                qWarning() << "S60EglEndpoint::S60EglEndpoint" << qtThisPtr() << "failed to create EGL endpoint";
+            } else {
+                TRAPD(err, m_eventHandler.reset(S60EglEndpointEventHandler::NewL(this)));
+                if (err) {
+                    qWarning() << "S60EglEndpoint::S60EglEndpoint" << qtThisPtr() << "failed to create EGL endpoint event handler: error" << err;
+                } else {
+                    m_state = Created;
+                    EGLBoolean ready = m_extensions->getEndpointAttrib(m_display, m_endpoint, EGL_ENDPOINT_READY_NOK);
+                    TRACE("S60EglEndpoint::S60EglEndpoint" << qtThisPtr() << "ready" << ready);
+                    if (ready) {
+                        // Producer has already submitted content to the source surface
+                        m_state = Active;
+                        m_eventHandler->request();
+                    } else {
+                        // Request notification when producer has submitted content
+                        m_eventHandler->request();
+                    }
+                }
+            }
+        } else {
+            qWarning() << "S60EglEndpoint::S60EglEndpoint" << qtThisPtr() << "failed to create EGL endpoint: error" << error;
+        }
+    }
+}
+
+S60EglEndpoint::~S60EglEndpoint()
+{
+    TRACE("S60EglEndpoint::~S60EglEndpoint" << qtThisPtr());
+    if (EGL_NO_ENDPOINT_NOK != m_endpoint)
+        m_extensions->destroyEndpoint(m_display, m_endpoint);
+}
+
+void S60EglEndpoint::endpointEvent()
+{
+    const EGLBoolean ready = m_extensions->getEndpointAttrib(m_display, m_endpoint, EGL_ENDPOINT_READY_NOK);
+    VERBOSE_TRACE("S60EglEndpoint::endpointEvent" << qtThisPtr() << "state" << m_state << "ready" << ready);
+    switch (m_state) {
+    case Created:
+        m_state = Active;
+    case Active:
+        emit imageAvailable();
+        break;
+    case Null:
+    default:
+        Q_ASSERT(false);
+        break;
+    }
+}
+
+bool S60EglEndpoint::isValid() const
+{
+    return (m_state != Null);
+}
+
+void S60EglEndpoint::setDelay(qint64 delay)
+{
+    VERBOSE_TRACE("S60EglEndpoint::setDelay" << qtThisPtr() << "delay" << delay);
+    m_extensions->setEndpointAttrib(m_display, m_endpoint, EGL_DELAY_NOK, delay);
+}
+
+EGLImageKHR S60EglEndpoint::acquireImage()
+{
+    Q_ASSERT(EGL_NO_IMAGE_KHR == m_image);
+    m_image = m_extensions->acquireImage(m_display, m_endpoint);
+    VERBOSE_TRACE("S60EglEndpoint::acquireImage" << qtThisPtr() << "image" << m_image);
+    if (EGL_NO_IMAGE_KHR == m_image) {
+        qWarning() << "S60EglEndpoint::endpointEvent" << qtThisPtr() << "null image";
+        if (!m_eventHandler->IsActive())
+            m_eventHandler->request();
+    }
+    return m_image;
+}
+
+void S60EglEndpoint::releaseImage()
+{
+    if (EGL_NO_IMAGE_KHR != m_image) {
+        VERBOSE_TRACE("S60EglEndpoint::releaseImage" << qtThisPtr() << "image" << m_image);
+        m_extensions->releaseImage(m_display, m_endpoint, m_image, m_api);
+        m_image = EGL_NO_IMAGE_KHR;
+        if (!m_eventHandler->IsActive())
+            m_eventHandler->request();
+    }
+}
+
diff --git a/plugins/multimedia/symbian/videooutput/s60eglendpoint.h b/plugins/multimedia/symbian/videooutput/s60eglendpoint.h
new file mode 100644
index 0000000000..39faa8a84d
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60eglendpoint.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef S60EGLENDPOINT_H
+#define S60EGLENDPOINT_H
+
+#include <QtCore/QObject>
+#include <egl/eglext.h>
+
+QT_USE_NAMESPACE
+
+class QTime;
+class S60EglEndpointEventHandler;
+class S60EglExtensions;
+class TSurfaceId;
+
+class S60EglEndpoint : public QObject
+{
+    Q_OBJECT
+
+public:
+    S60EglEndpoint(const TSurfaceId &surface, S60EglExtensions *extensions,
+                   QObject *parent);
+    ~S60EglEndpoint();
+
+    bool isValid() const;
+    void setDelay(qint64 delay);
+    EGLImageKHR acquireImage();
+    void releaseImage();
+
+signals:
+    void imageAvailable();
+
+private:
+    void requestImage();
+    void endpointEvent();
+
+private:
+    friend class S60EglEndpointEventHandler;
+    S60EglExtensions *m_extensions;
+    EGLContext m_context;
+    EGLenum m_api;
+    EGLDisplay m_display;
+    EGLEndpointNOK m_endpoint;
+    QScopedPointer<S60EglEndpointEventHandler> m_eventHandler;
+    enum State {
+        Null,
+        Created,
+        Active
+    } m_state;
+    EGLImageKHR m_image;
+};
+
+#endif // S60EGLENDPOINT_H
+
diff --git a/plugins/multimedia/symbian/videooutput/s60eglextensions.cpp b/plugins/multimedia/symbian/videooutput/s60eglextensions.cpp
new file mode 100644
index 0000000000..bf60957d33
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60eglextensions.cpp
@@ -0,0 +1,188 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "s60eglextensions.h"
+#include "s60mmtrace.h"
+#include <e32base.h>
+#include <egl/egl.h>
+#include <graphics/surface.h>
+#include <QtCore/QDebug>
+#include <QtCore/QTime>
+
+S60EglExtensions *S60EglExtensions::create(QObject *parent)
+{
+    S60EglExtensions *self = new S60EglExtensions(parent);
+    if (!self->initialize()) {
+        delete self;
+        self = 0;
+    }
+    return self;
+}
+
+S60EglExtensions::S60EglExtensions(QObject *parent)
+    : QObject(parent)
+    , m_eglCreateEndpointNOK(0)
+    , m_eglDestroyEndpointNOK(0)
+    , m_eglGetEndpointAttribNOK(0)
+    , m_eglSetEndpointAttribNOK(0)
+    , m_eglAcquireImageNOK(0)
+    , m_eglReleaseImageNOK(0)
+    , m_eglGetEndpointDirtyAreaNOK(0)
+    , m_eglEndpointRequestNotificationNOK(0)
+    , m_eglEndpointCancelNotificationNOK(0)
+    , m_eglDestroyImageKHR(0)
+#ifndef QT_NO_OPENGL
+    , m_glEGLImageTargetTexture2DOES(0)
+#endif
+#ifndef QT_NO_OPENVG
+    , m_vgCreateEGLImageTargetKHR(0)
+#endif
+{
+
+}
+
+S60EglExtensions::~S60EglExtensions()
+{
+
+}
+
+bool S60EglExtensions::initialize()
+{
+    const bool endpoint =
+                getProcAddress("eglCreateEndpointNOK", m_eglCreateEndpointNOK)
+             && getProcAddress("eglDestroyEndpointNOK", m_eglDestroyEndpointNOK)
+             && getProcAddress("eglGetEndpointAttribNOK", m_eglGetEndpointAttribNOK)
+             && getProcAddress("eglSetEndpointAttribNOK", m_eglSetEndpointAttribNOK)
+             && getProcAddress("eglAcquireImageNOK", m_eglAcquireImageNOK)
+             && getProcAddress("eglReleaseImageNOK", m_eglReleaseImageNOK)
+             && getProcAddress("eglGetEndpointDirtyAreaNOK", m_eglGetEndpointDirtyAreaNOK)
+             && getProcAddress("eglEndpointRequestNotificationNOK", m_eglEndpointRequestNotificationNOK)
+             && getProcAddress("eglEndpointCancelNotificationNOK", m_eglEndpointCancelNotificationNOK)
+             && getProcAddress("eglDestroyImageKHR", m_eglDestroyImageKHR);
+
+    bool gl = true;
+#ifndef QT_NO_OPENGL
+    gl = getProcAddress("glEGLImageTargetTexture2DOES", m_glEGLImageTargetTexture2DOES);
+#endif
+
+    bool vg = true;
+#ifndef QT_NO_OPENVG
+    vg = getProcAddress("vgCreateEGLImageTargetKHR", m_vgCreateEGLImageTargetKHR);
+#endif
+
+    return (endpoint && gl && vg);
+}
+
+template <typename FuncPtr>
+bool S60EglExtensions::getProcAddress(const char *procName, FuncPtr &funcPtr)
+{
+    funcPtr = reinterpret_cast<FuncPtr>(eglGetProcAddress(procName));
+    if (!funcPtr)
+        qWarning() << "S60EglEndpointFunctions::getProcAddress" << procName << "not found";
+    return (funcPtr != 0);
+}
+
+EGLEndpointNOK S60EglExtensions::createEndpoint(EGLDisplay dpy, EGLenum type, EGLenum source_type,
+                                                       EGLEndpointSourceNOK source, const EGLint *attrib_list) const
+{
+    return m_eglCreateEndpointNOK(dpy, type, source_type, source, attrib_list);
+}
+
+EGLBoolean S60EglExtensions::destroyEndpoint(EGLDisplay dpy, EGLEndpointNOK endpoint) const
+{
+    return m_eglDestroyEndpointNOK(dpy, endpoint);
+}
+
+EGLint S60EglExtensions::getEndpointAttrib(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLint attrib) const
+{
+    return m_eglGetEndpointAttribNOK(dpy, endpoint, attrib);
+}
+
+EGLBoolean S60EglExtensions::setEndpointAttrib(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLint attrib, EGLint value) const
+{
+    return m_eglSetEndpointAttribNOK(dpy, endpoint, attrib, value);
+}
+
+EGLImageKHR S60EglExtensions::acquireImage(EGLDisplay dpy, EGLEndpointNOK endpoint) const
+{
+    return m_eglAcquireImageNOK(dpy, endpoint);
+}
+
+EGLBoolean S60EglExtensions::releaseImage(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLImageKHR image, EGLenum api) const
+{
+    return m_eglReleaseImageNOK(dpy, endpoint, image, api);
+}
+
+EGLint S60EglExtensions::getEndpointDirtyArea(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLint* rects,
+                                              EGLint start_rect, EGLint max_rects, EGLBoolean collapse) const
+{
+    return m_eglGetEndpointDirtyAreaNOK(dpy, endpoint, rects, start_rect, max_rects, collapse);
+}
+
+EGLBoolean S60EglExtensions::endpointRequestNotification(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLTRequestStatusNOK sync) const
+{
+    return m_eglEndpointRequestNotificationNOK(dpy, endpoint, sync);
+}
+
+EGLBoolean S60EglExtensions::endpointCancelNotification(EGLDisplay dpy, EGLEndpointNOK endpoint) const
+{
+    return m_eglEndpointCancelNotificationNOK(dpy, endpoint);
+}
+
+EGLBoolean S60EglExtensions::destroyImage(EGLDisplay dpy, EGLImageKHR image) const
+{
+    return m_eglDestroyImageKHR(dpy, image);
+}
+
+#ifndef QT_NO_OPENGL
+void S60EglExtensions::glEglImageTargetTexture(GLenum target, GLeglImageOES image)
+{
+    return m_glEGLImageTargetTexture2DOES(target, image);
+}
+#endif
+
+#ifndef QT_NO_OPENVG
+VGImage S60EglExtensions::vgCreateEglImageTarget(EGLImageKHR image)
+{
+    return m_vgCreateEGLImageTargetKHR(image);
+}
+#endif // !QT_NO_OPENVG
+
diff --git a/plugins/multimedia/symbian/videooutput/s60eglextensions.h b/plugins/multimedia/symbian/videooutput/s60eglextensions.h
new file mode 100644
index 0000000000..85dd8db92b
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60eglextensions.h
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef S60EGLEXTENSIONS_H
+#define S60EGLEXTENSIONS_H
+
+#include <QtCore/QObject>
+#include <egl/eglext.h>
+
+#ifndef QT_NO_OPENGL
+#include <QtOpenGL/qgl.h>
+#include <GLES/glext.h>
+#endif
+
+#ifndef QT_NO_OPENVG
+#include <QtOpenVG/qvg.h>
+#endif
+
+QT_USE_NAMESPACE
+
+class S60EglExtensions : public QObject
+    {
+public:
+    static S60EglExtensions *create(QObject *parent = 0);
+    ~S60EglExtensions();
+
+    // EGL_NOK_image_endpoint
+    EGLEndpointNOK createEndpoint(EGLDisplay dpy, EGLenum type, EGLenum source_type, EGLEndpointSourceNOK source, const EGLint *attrib_list) const;
+    EGLBoolean destroyEndpoint(EGLDisplay dpy, EGLEndpointNOK endpoint) const;
+    EGLint getEndpointAttrib(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLint attrib) const;
+    EGLBoolean setEndpointAttrib(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLint attrib, EGLint value) const;
+    EGLImageKHR acquireImage(EGLDisplay dpy, EGLEndpointNOK endpoint) const;
+    EGLBoolean releaseImage(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLImageKHR image, EGLenum api) const;
+    EGLint getEndpointDirtyArea(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLint *rects, EGLint start_rect, EGLint max_rects, EGLBoolean collapse) const;
+    EGLBoolean endpointRequestNotification(EGLDisplay dpy, EGLEndpointNOK endpoint, EGLTRequestStatusNOK sync) const;
+    EGLBoolean endpointCancelNotification(EGLDisplay dpy, EGLEndpointNOK endpoint) const;
+    EGLBoolean destroyImage(EGLDisplay dpy, EGLImageKHR image) const;
+
+#ifndef QT_NO_OPENGL
+    // EGL_KHR_gl_texture_2D_image
+    void glEglImageTargetTexture(GLenum target, GLeglImageOES image);
+#endif // !QT_NO_OPENGL
+
+#ifndef QT_NO_OPENVG
+    // EGL_KHR_vg_parent_image
+    VGImage vgCreateEglImageTarget(EGLImageKHR image);
+#endif // !QT_NO_OPENVG
+
+private:
+    S60EglExtensions(QObject *parent = 0);
+    bool initialize();
+    template <typename FuncPtr> static bool getProcAddress(const char *procName, FuncPtr &funcPtr);
+
+private:
+    // EGL_NOK_image_endpoint
+    PFNEGLCREATEENDPOINTNOKPROC m_eglCreateEndpointNOK;
+    PFNEGLDESTROYENDPOINTNOKPROC m_eglDestroyEndpointNOK;
+    PFNEGLGETENDPOINTATTRIBNOKPROC m_eglGetEndpointAttribNOK;
+    PFNEGLSETENDPOINTATTRIBNOKPROC m_eglSetEndpointAttribNOK;
+    PFNEGLACQUIREIMAGENOKPROC m_eglAcquireImageNOK;
+    PFNEGLRELEASEIMAGENOKPROC m_eglReleaseImageNOK;
+    PFNEGLGETENDPOINTDIRTYAREANOKPROC m_eglGetEndpointDirtyAreaNOK;
+    PFNEGLENDPOINTREQUESTNOTIFICATIONNOKPROC m_eglEndpointRequestNotificationNOK;
+    PFNEGLENDPOINTCANCELNOTIFICATIONNOKPROC m_eglEndpointCancelNotificationNOK;
+    PFNEGLDESTROYIMAGEKHRPROC m_eglDestroyImageKHR;
+
+#ifndef QT_NO_OPENGL
+    // EGL_KHR_gl_texture_2D_image
+    PFNGLEGLIMAGETARGETTEXTURE2DOESPROC m_glEGLImageTargetTexture2DOES;
+#endif // !QT_NO_OPENGL
+
+#ifndef QT_NO_OPENVG
+    // EGL_KHR_vg_parent_image
+    typedef VGImage (*PFNCREATEEGLIMAGETARGETKHRPROC)(EGLImageKHR);
+    PFNCREATEEGLIMAGETARGETKHRPROC m_vgCreateEGLImageTargetKHR;
+#endif // !QT_NO_OPENVG
+    };
+
+#endif // S60EGLEXTENSIONS_H
+
diff --git a/plugins/multimedia/symbian/videooutput/s60nativewindow.cpp b/plugins/multimedia/symbian/videooutput/s60nativewindow.cpp
new file mode 100644
index 0000000000..d1aeb22ffa
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60nativewindow.cpp
@@ -0,0 +1,115 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "s60mmtrace.h"
+#include "s60nativewindow.h"
+#include <coemain.h>
+#include <w32std.h>
+#include <graphics/surfaceconfiguration.h>
+
+static const int WindowWidth = 320;
+static const int WindowHeight = 240;
+
+S60NativeWindow::S60NativeWindow(QObject *parent)
+    : QObject(parent)
+    , m_window(0)
+    , m_surface(TSurfaceId::CreateNullId())
+{
+    TRACE("S60NativeWindow::S60NativeWindow" << qtThisPtr());
+    RWsSession &session = CCoeEnv::Static()->WsSession();
+    RWindowGroup &windowGroup = CCoeEnv::Static()->RootWin();
+    m_window = q_check_ptr(new RWindow(session));
+    const int err = m_window->Construct(windowGroup, reinterpret_cast<quint32>(this));
+    if (err) {
+        delete m_window;
+        m_window = 0;
+    } else {
+        m_window->SetExtent(TPoint(0, 0), TSize(WindowWidth, WindowHeight));
+    }
+}
+
+S60NativeWindow::~S60NativeWindow()
+{
+    TRACE("S60NativeWindow::~S60NativeWindow" << qtThisPtr());
+    if (m_window)
+        m_window->Close();
+    delete m_window;
+}
+
+RWindow *S60NativeWindow::windowHandle() const
+{
+    return m_window;
+}
+
+void S60NativeWindow::setNativeSurface(const TSurfaceId &surface)
+{
+    getSurface();
+    if (surface != m_surface) {
+        TRACE("S60NativeWindow::setNativeSurface" << (void*)surface.iInternal[3]);
+        if (RWindow *const window = windowHandle())
+            window->SetBackgroundSurface(surface);
+    }
+}
+
+TSurfaceId S60NativeWindow::nativeSurface()
+{
+    getSurface();
+    return m_surface;
+}
+
+void S60NativeWindow::getSurface()
+{
+    TSurfaceId surface = TSurfaceId::CreateNullId();
+    int err = 0;
+    RWindow *const window = windowHandle();
+    if (window) {
+        TSurfaceConfiguration config;
+        err = window->GetBackgroundSurface(config);
+        if (!err)
+            config.GetSurfaceId(surface);
+    }
+    if (!err) {
+        m_surface = surface;
+        if (!m_surface.IsNull())
+            window->RemoveBackgroundSurface(ETrue);
+    }
+}
+
diff --git a/plugins/multimedia/symbian/videooutput/s60nativewindow.h b/plugins/multimedia/symbian/videooutput/s60nativewindow.h
new file mode 100644
index 0000000000..7a359ad5e6
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60nativewindow.h
@@ -0,0 +1,73 @@
+/**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef S60NATIVEWINDOW_H
+#define S60NATIVEWINDOW_H
+
+#include <QtCore/QObject>
+#include <graphics/surface.h>
+
+class RWindow;
+class RWindowGroup;
+
+QT_USE_NAMESPACE
+
+class S60NativeWindow : public QObject
+{
+    Q_OBJECT
+public:
+    S60NativeWindow(QObject *parent);
+    ~S60NativeWindow();
+
+    RWindow *windowHandle() const;
+    TSurfaceId nativeSurface();
+
+public slots:
+    void setNativeSurface(const TSurfaceId &surface);
+
+private:
+    void getSurface();
+
+private:
+    RWindow *m_window;
+    TSurfaceId m_surface;
+};
+
+#endif // S60NATIVEWINDOW_H
diff --git a/plugins/multimedia/symbian/videooutput/s60videobuffer.cpp b/plugins/multimedia/symbian/videooutput/s60videobuffer.cpp
new file mode 100644
index 0000000000..45611ec793
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60videobuffer.cpp
@@ -0,0 +1,253 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "s60eglextensions.h"
+#include "s60mmtrace.h"
+#include "s60videoeglrenderercontrol.h"
+#include "s60videobuffer.h"
+#include <QtCore/QElapsedTimer>
+#include <QtCore/QVariant>
+
+#ifndef QT_NO_OPENGL
+#include <GLES/glext.h>
+#endif
+
+// TODO: get rid of these magic numbers
+const QAbstractVideoBuffer::HandleType EGLImageTextureHandle =
+      QAbstractVideoBuffer::HandleType(QAbstractVideoBuffer::UserHandle + 128);
+#ifndef QT_NO_OPENVG
+const QAbstractVideoBuffer::HandleType VGImageTextureHandle =
+      QAbstractVideoBuffer::HandleType(QAbstractVideoBuffer::UserHandle + 129);
+#endif // !QT_NO_OPENVG
+
+// Dummy pointer returned by map() - see comments below
+static uchar* const DummyMapReturnValue = reinterpret_cast<uchar *>(1);
+
+//-----------------------------------------------------------------------------
+// S60EglImageVideoBuffer
+//-----------------------------------------------------------------------------
+
+S60EglImageVideoBuffer::S60EglImageVideoBuffer(S60VideoEglRendererControl *control,
+                                               S60EglEndpoint *endpoint)
+    : QAbstractVideoBuffer(EGLImageTextureHandle)
+    , m_timer(new QElapsedTimer)
+    , m_control(control)
+    , m_endpoint(endpoint)
+    , m_delay(0)
+{
+    VERBOSE_TRACE("S60EglImageVideoBuffer::S60EglImageVideoBuffer" << qtThisPtr());
+}
+
+S60EglImageVideoBuffer::S60EglImageVideoBuffer(S60VideoEglRendererControl *control,
+                                               S60EglEndpoint *endpoint,
+                                               QAbstractVideoBuffer::HandleType type)
+    : QAbstractVideoBuffer(type)
+    , m_timer(new QElapsedTimer)
+    , m_control(control)
+    , m_endpoint(endpoint)
+    , m_delay(0)
+{
+
+}
+
+S60EglImageVideoBuffer::~S60EglImageVideoBuffer()
+{
+    VERBOSE_TRACE("S60EglImageVideoBuffer::~S60EglImageVideoBuffer" << qtThisPtr());
+    unmap();
+}
+
+QAbstractVideoBuffer::MapMode S60EglImageVideoBuffer::mapMode() const
+{
+    return NotMapped;
+}
+
+// Note: the use of map/unmap to indicate when the frame has been displayed
+// by QGraphicsVideoItem is something of a hack, but in QtMobility 1.2,
+// there is no suitable QVideoFrame API, so we must do it this way.
+
+uchar *S60EglImageVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine)
+{
+    Q_UNUSED(mode);
+    Q_UNUSED(numBytes);
+    Q_UNUSED(bytesPerLine);
+    VERBOSE_TRACE("S60EglImageVideoBuffer::map" << qtThisPtr());
+    acquireEglImage();
+    return DummyMapReturnValue;
+}
+
+void S60EglImageVideoBuffer::unmap()
+{
+    VERBOSE_TRACE("S60EglImageVideoBuffer::unmap" << qtThisPtr());
+    releaseEglImage();
+}
+
+QVariant S60EglImageVideoBuffer::handle() const
+{
+    return m_eglImage;
+}
+
+void S60EglImageVideoBuffer::acquireEglImage()
+{
+    Q_ASSERT(EGL_NO_IMAGE_KHR == m_eglImage);
+    m_timer->start();
+    m_eglImage = m_control->acquireEglImage(m_endpoint);
+}
+
+void S60EglImageVideoBuffer::releaseEglImage()
+{
+    if (EGL_NO_IMAGE_KHR != m_eglImage) {
+        VERBOSE_TRACE("S60EglImageVideoBuffer::releaseEglImage" << qtThisPtr());
+        // Here we need to calculate the time interval between acquiring an image
+        // from the endpoint, and that image being rendered.  This is passed back
+        // to the producer, which may use it to correct AV sync.
+        // We assume that unmap() was called by the client shortly after rendering
+        // the image.
+        m_delay = 1000 * m_timer->elapsed();
+        m_control->releaseEglImage(m_endpoint, m_delay);
+        m_eglImage = EGL_NO_IMAGE_KHR;
+    }
+}
+
+
+//-----------------------------------------------------------------------------
+// S60GlTextureVideoBuffer
+//-----------------------------------------------------------------------------
+
+#ifndef QT_NO_OPENGL
+
+S60GlTextureVideoBuffer::S60GlTextureVideoBuffer(S60VideoEglRendererControl *control,
+                                                 S60EglEndpoint *endpoint,
+                                                 S60EglExtensions *extensions)
+    : S60EglImageVideoBuffer(control, endpoint, QAbstractVideoBuffer::GLTextureHandle)
+    , m_extensions(extensions)
+    , m_texture(0)
+{
+
+}
+
+S60GlTextureVideoBuffer::~S60GlTextureVideoBuffer()
+{
+    VERBOSE_TRACE("S60GlTextureVideoBuffer::~S60GlTextureVideoBuffer" << qtThisPtr());
+    unmap();
+}
+
+uchar *S60GlTextureVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine)
+{
+    Q_UNUSED(mode);
+    Q_UNUSED(numBytes);
+    Q_UNUSED(bytesPerLine);
+    VERBOSE_TRACE("S60GlTextureVideoBuffer::map" << qtThisPtr());
+    acquireEglImage();
+    glGenTextures(1, &m_texture);
+    glBindTexture(GL_TEXTURE_2D, m_texture);
+    const GLeglImageOES glImage = reinterpret_cast<GLeglImageOES>(m_eglImage);
+    m_extensions->glEglImageTargetTexture(GL_TEXTURE_2D, glImage);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glBindTexture(GL_TEXTURE_2D, 0);
+    return DummyMapReturnValue;
+}
+
+void S60GlTextureVideoBuffer::unmap()
+{
+    VERBOSE_TRACE("S60GlTextureVideoBuffer::unmap" << qtThisPtr());
+    if (m_texture)
+        glDeleteTextures(1, &m_texture);
+    releaseEglImage();
+}
+
+QVariant S60GlTextureVideoBuffer::handle() const
+{
+    return m_texture;
+}
+
+#endif // !QT_NO_OPENGL
+
+
+//-----------------------------------------------------------------------------
+// S60VGImageVideoBuffer
+//-----------------------------------------------------------------------------
+
+#ifndef QT_NO_OPENVG
+
+S60VgImageVideoBuffer::S60VgImageVideoBuffer(S60VideoEglRendererControl *control,
+                                             S60EglEndpoint *endpoint,
+                                             S60EglExtensions *extensions)
+    : S60EglImageVideoBuffer(control, endpoint, VGImageTextureHandle)
+    , m_extensions(extensions)
+{
+    VERBOSE_TRACE("S60VgImageVideoBuffer::S60VgImageVideoBuffer" << qtThisPtr());
+}
+
+S60VgImageVideoBuffer::~S60VgImageVideoBuffer()
+{
+    VERBOSE_TRACE("S60VgImageVideoBuffer::~S60VgImageVideoBuffer" << qtThisPtr());
+    unmap();
+}
+
+uchar *S60VgImageVideoBuffer::map(MapMode mode, int *numBytes, int *bytesPerLine)
+{
+    Q_UNUSED(mode);
+    Q_UNUSED(numBytes);
+    Q_UNUSED(bytesPerLine);
+    VERBOSE_TRACE("S60GlTextureVideoBuffer::map" << qtThisPtr());
+    acquireEglImage();
+    m_vgImage = m_extensions->vgCreateEglImageTarget(m_eglImage);
+    return DummyMapReturnValue;
+}
+
+void S60VgImageVideoBuffer::unmap()
+{
+    VERBOSE_TRACE("S60VgImageVideoBuffer::unmap" << qtThisPtr());
+    if (VG_INVALID_HANDLE != m_vgImage)
+        vgDestroyImage(m_vgImage);
+    releaseEglImage();
+}
+
+QVariant S60VgImageVideoBuffer::handle() const
+{
+    return static_cast<quint32>(m_vgImage);
+}
+
+#endif // !QT_NO_OPENVG
+
diff --git a/plugins/multimedia/symbian/videooutput/s60videobuffer.h b/plugins/multimedia/symbian/videooutput/s60videobuffer.h
new file mode 100644
index 0000000000..032809b419
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60videobuffer.h
@@ -0,0 +1,134 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef S60VIDEOBUFFER_H
+#define S60VIDEOBUFFER_H
+
+#include <QtMultimediaKit/QAbstractVideoBuffer>
+#include <egl/eglext.h>
+
+#ifndef QT_NO_OPENGL
+#include <QtOpenGL/qgl.h>
+#endif
+
+#ifndef QT_NO_OPENVG
+#include <QtOpenVG/qvg.h>
+#endif
+
+QT_USE_NAMESPACE
+
+class QElapsedTimer;
+class S60EglEndpoint;
+class S60EglExtensions;
+class S60VideoEglRendererControl;
+
+class S60EglImageVideoBuffer : public QAbstractVideoBuffer
+{
+public:
+    S60EglImageVideoBuffer(S60VideoEglRendererControl *control,
+                           S60EglEndpoint *endpoint);
+    ~S60EglImageVideoBuffer();
+
+    // QAbstractVideoBuffer
+    MapMode mapMode() const;
+    uchar *map(MapMode mode, int *numBytes, int *bytesPerLine);
+    void unmap();
+    QVariant handle() const;
+
+protected:
+    S60EglImageVideoBuffer(S60VideoEglRendererControl *control,
+                           S60EglEndpoint *endpoint,
+                           QAbstractVideoBuffer::HandleType type);
+    void acquireEglImage();
+    void releaseEglImage();
+
+protected:
+    EGLImageKHR m_eglImage;
+
+private:
+    QScopedPointer<QElapsedTimer> m_timer;
+    S60VideoEglRendererControl *m_control;
+    S60EglEndpoint *m_endpoint;
+    qint64 m_delay;
+};
+
+#ifndef QT_NO_OPENGL
+class S60GlTextureVideoBuffer : public S60EglImageVideoBuffer
+{
+public:
+    S60GlTextureVideoBuffer(S60VideoEglRendererControl *control,
+                            S60EglEndpoint *endpoint,
+                            S60EglExtensions *extensions);
+    ~S60GlTextureVideoBuffer();
+
+    // QAbstractVideoBuffer
+    uchar *map(MapMode mode, int *numBytes, int *bytesPerLine);
+    void unmap();
+    QVariant handle() const;
+
+private:
+    S60EglExtensions *m_extensions;
+    GLuint m_texture;
+};
+#endif // !QT_NO_OPENGL
+
+#ifndef QT_NO_OPENVG
+class S60VgImageVideoBuffer : public S60EglImageVideoBuffer
+{
+public:
+    S60VgImageVideoBuffer(S60VideoEglRendererControl *control,
+                          S60EglEndpoint *endpoint,
+                          S60EglExtensions *extensions);
+    ~S60VgImageVideoBuffer();
+
+    // QAbstractVideoBuffer
+    uchar *map(MapMode mode, int *numBytes, int *bytesPerLine);
+    void unmap();
+    QVariant handle() const;
+
+private:
+    S60EglExtensions *m_extensions;
+    VGImage m_vgImage;
+};
+#endif // !QT_NO_OPENVG
+
+#endif // S60VIDEOBUFFER_H
+
diff --git a/plugins/multimedia/symbian/videooutput/s60videodisplay.cpp b/plugins/multimedia/symbian/videooutput/s60videodisplay.cpp
index f3a2197f72..8c54c267fb 100644
--- a/plugins/multimedia/symbian/videooutput/s60videodisplay.cpp
+++ b/plugins/multimedia/symbian/videooutput/s60videodisplay.cpp
@@ -46,13 +46,13 @@
 #include <w32std.h>
 
 S60VideoDisplay::S60VideoDisplay(QObject *parent)
-:   QObject(parent)
-,   m_fullScreen(false)
-,   m_visible(true)
-,   m_aspectRatioMode(Qt::KeepAspectRatio)
-,   m_paintingEnabled(false)
-,   m_rotation(0.0f)
-,   m_hasContent(false)
+    : QObject(parent)
+    , m_fullScreen(false)
+    , m_visible(true)
+    , m_aspectRatioMode(Qt::KeepAspectRatio)
+    , m_paintingEnabled(false)
+    , m_rotation(0.0f)
+    , m_hasContent(false)
 {
     connect(this, SIGNAL(displayRectChanged(QRect, QRect)),
             this, SLOT(updateContentRect()));
diff --git a/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.cpp b/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.cpp
new file mode 100644
index 0000000000..29f3ef39c2
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.cpp
@@ -0,0 +1,223 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "s60eglendpoint.h"
+#include "s60mmtrace.h"
+#include "s60videobuffer.h"
+#include "s60videoeglrenderercontrol.h"
+#include <EGL/egl.h>
+#include <QtMultimediaKit/QAbstractVideoSurface>
+#include <QtMultimediaKit/QVideoFrame>
+#include <QtMultimediaKit/QVideoSurfaceFormat>
+
+#ifdef VIDEOOUTPUT_MEASURE_FRAMERATE
+#include "s60videoframerate.h"
+#endif
+
+S60VideoEglRendererControl::S60VideoEglRendererControl(S60EglExtensions *extensions, QObject *parent)
+    : QVideoRendererControl(parent)
+    , m_nativeSurface(TSurfaceId::CreateNullId())
+    , m_doesProduceEglImages(false)
+    , m_surface(0)
+    , m_eglExtensions(extensions)
+    , m_eglEndpoint(0)
+    , m_buffer(0)
+    , m_frameRate(0)
+{
+    TRACE("S60VideoEglRendererControl::S60VideoEglRendererControl" << qtThisPtr());
+    Q_ASSERT(m_eglExtensions);
+#ifdef VIDEOOUTPUT_MEASURE_FRAMERATE
+    m_frameRate = new S60VideoFrameRate(this);
+#endif
+}
+
+S60VideoEglRendererControl::~S60VideoEglRendererControl()
+{
+    TRACE("S60VideoEglRendererControl::~S60VideoEglRendererControl" << qtThisPtr());
+}
+
+QAbstractVideoSurface *S60VideoEglRendererControl::surface() const
+{
+    return m_surface;
+}
+
+void S60VideoEglRendererControl::setSurface(QAbstractVideoSurface *surface)
+{
+    if (surface != m_surface) {
+        TRACE("S60VideoEglRendererControl::setSurface" << qtThisPtr()
+              << "surface" << surface);
+        m_surface = surface;
+        if (!m_surface)
+            destroyEndpoint();
+        else if (!m_nativeSurface.IsNull())
+            createEndpoint();
+        emit surfaceChanged();
+    }
+}
+
+void S60VideoEglRendererControl::setNativeSurface(TSurfaceId surface)
+{
+    if (surface != m_nativeSurface) {
+        TRACE("S60VideoEglRendererControl::setNativeSurface" << qtThisPtr()
+              << "surface" << (void*)surface.iInternal[3]);
+        m_nativeSurface = surface;
+        if (m_nativeSurface.IsNull())
+            destroyEndpoint();
+        else if (m_surface)
+            createEndpoint();
+    }
+}
+
+const QSize &S60VideoEglRendererControl::nativeSize() const
+{
+    return m_nativeSize;
+}
+
+bool S60VideoEglRendererControl::doesProduceEglImages() const
+{
+    return m_doesProduceEglImages;
+}
+
+void S60VideoEglRendererControl::setNativeSize(QSize size)
+{
+    if (size != m_nativeSize) {
+        TRACE("S60VideoEglRendererControl::setNativeSize" << qtThisPtr()
+              << "size" << size);
+        m_nativeSize = size;
+        emit nativeSizeChanged();
+    }
+}
+
+void S60VideoEglRendererControl::setDoesProduceEglImages(bool enabled)
+{
+    if (enabled != m_doesProduceEglImages) {
+        TRACE("S60VideoEglRendererControl::setDoesProduceEglImages" << qtThisPtr()
+              << "enabled" << enabled);
+        m_doesProduceEglImages = enabled;
+    }
+}
+
+// Helper function
+EGLenum currentEglApi()
+{
+    EGLenum api = 0;
+    if (EGL_NO_CONTEXT != eglGetCurrentContext())
+        api = eglQueryAPI();
+    return api;
+}
+
+void S60VideoEglRendererControl::imageAvailable()
+{
+    const EGLenum api = currentEglApi();
+    VERBOSE_TRACE("S60VideoEglRendererControl::imageAvailable" << qtThisPtr()
+                  << "api" << api);
+    Q_ASSERT(!m_buffer);
+    if (m_doesProduceEglImages) {
+        m_buffer = new S60EglImageVideoBuffer(this, m_eglEndpoint);
+    } else {
+        switch (api) {
+#ifndef QT_NO_OPENGL
+        case EGL_OPENGL_ES_API:
+            m_buffer = new S60GlTextureVideoBuffer(this, m_eglEndpoint, m_eglExtensions);
+            break;
+#endif
+#ifndef QT_NO_OPENVG
+        case EGL_OPENVG_API:
+            m_buffer = new S60VgImageVideoBuffer(this, m_eglEndpoint, m_eglExtensions);
+            break;
+#endif
+        }
+    }
+    Q_ASSERT(m_buffer);
+    QVideoSurfaceFormat format(m_nativeSize,
+                               QVideoFrame::Format_RGB32,
+                               m_buffer->handleType());
+    format.setScanLineDirection(QVideoSurfaceFormat::BottomToTop);
+    if (!m_surface->isActive())
+        m_surface->start(format);
+    const QVideoFrame frame(m_buffer, format.frameSize(), format.pixelFormat());
+    m_surface->present(frame);
+#ifdef VIDEOOUTPUT_MEASURE_FRAMERATE
+    m_frameRate->notify();
+#endif
+}
+
+EGLImageKHR S60VideoEglRendererControl::acquireEglImage(S60EglEndpoint *endpoint) const
+{
+    VERBOSE_TRACE("S60VideoEglRendererControl::acquireEglImage" << qtThisPtr());
+    EGLImageKHR image = EGL_NO_IMAGE_KHR;
+    if (m_eglEndpoint == endpoint)
+        image = m_eglEndpoint->acquireImage();
+    return image;
+}
+
+void S60VideoEglRendererControl::releaseEglImage(S60EglEndpoint *endpoint, qint64 delay)
+{
+    VERBOSE_TRACE("S60VideoEglRendererControl::releaseEglImage" << qtThisPtr()
+                  << "delay" << delay);
+    if (m_eglEndpoint == endpoint) {
+        if (delay)
+            m_eglEndpoint->setDelay(delay);
+        m_eglEndpoint->releaseImage();
+    }
+    m_buffer = 0;
+}
+
+void S60VideoEglRendererControl::destroyEndpoint()
+{
+    if (m_eglEndpoint) {
+        delete m_eglEndpoint;
+        m_eglEndpoint = 0;
+    }
+}
+
+void S60VideoEglRendererControl::createEndpoint()
+{
+    Q_ASSERT(m_surface);
+    Q_ASSERT(!m_nativeSurface.IsNull());
+    Q_ASSERT(!m_eglEndpoint);
+    m_eglEndpoint = new S60EglEndpoint(m_nativeSurface, m_eglExtensions, this);
+    if (m_eglEndpoint->isValid())
+        connect(m_eglEndpoint, SIGNAL(imageAvailable()),
+                this, SLOT(imageAvailable()));
+    else
+        emit error();
+}
diff --git a/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.h b/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.h
new file mode 100644
index 0000000000..3cfc20414a
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60videoeglrenderercontrol.h
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef S60VIDEOEGLRENDERERCONTROL_H
+#define S60VIDEOEGLRENDERERCONTROL_H
+
+#include <QtCore/QSize>
+#include <QtMultimediaKit/QVideoRendererControl>
+#include <egl/eglext.h>
+#include <graphics/surface.h>
+
+QT_USE_NAMESPACE
+
+class QTime;
+class QVideoFrame;
+class S60EglEndpoint;
+class S60EglExtensions;
+class S60EglImageVideoBuffer;
+class S60VideoFrameRate;
+
+class S60VideoEglRendererControl : public QVideoRendererControl
+{
+    Q_OBJECT
+    Q_PROPERTY(QSize nativeSize READ nativeSize WRITE setNativeSize NOTIFY nativeSizeChanged)
+
+    /**
+     * If set, the returned QVideoFrame handle type is EGLImageKHR.
+     * If not set, the returned handle type depends on the current EGL rendering
+     * API:
+     *     for OpenGLES, GL texture handles
+     *     for OpenVG, VG image handles
+     * The default value is false.
+     */
+    Q_PROPERTY(bool doesProduceEglImages READ doesProduceEglImages WRITE setDoesProduceEglImages)
+
+public:
+    S60VideoEglRendererControl(S60EglExtensions *extensions, QObject *parent);
+    ~S60VideoEglRendererControl();
+
+public:
+    // QVideoRendererControl
+    QAbstractVideoSurface *surface() const;
+    void setSurface(QAbstractVideoSurface *surface);
+
+    const QSize &nativeSize() const;
+    bool doesProduceEglImages() const;
+
+public slots:
+    void setNativeSurface(TSurfaceId surface);
+    void setNativeSize(QSize size);
+    void setDoesProduceEglImages(bool enabled);
+
+signals:
+    void surfaceChanged();
+    void nativeSizeChanged();
+    void error();
+
+private slots:
+    void imageAvailable();
+
+private:
+    void destroyEndpoint();
+    void createEndpoint();
+
+private:
+    // Called by S60EglImageVideoBuffer
+    EGLImageKHR acquireEglImage(S60EglEndpoint *endpoint) const;
+    void releaseEglImage(S60EglEndpoint *endpoint, qint64 delay);
+
+private:
+    friend class S60EglImageVideoBuffer;
+    TSurfaceId m_nativeSurface;
+    QSize m_nativeSize;
+    bool m_doesProduceEglImages;
+    QAbstractVideoSurface *m_surface;
+    S60EglExtensions *m_eglExtensions;
+    S60EglEndpoint *m_eglEndpoint;
+    S60EglImageVideoBuffer *m_buffer;
+    S60VideoFrameRate *m_frameRate;
+};
+
+#endif // S60VIDEOEGLRENDERERCONTROL_H
+
diff --git a/plugins/multimedia/symbian/videooutput/s60videoframerate.cpp b/plugins/multimedia/symbian/videooutput/s60videoframerate.cpp
new file mode 100644
index 0000000000..936052bf0f
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60videoframerate.cpp
@@ -0,0 +1,101 @@
+/**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "s60videoframerate.h"
+#include <QtCore/QDebug>
+#include <QtCore/QTimer>
+
+static const int HistoryLength = 5;
+static const int SamplingInterval = 100;
+static const int TraceInterval = 2000;
+
+S60VideoFrameRate::S60VideoFrameRate(QObject *parent)
+    : QObject(parent)
+    , m_sampleTimer(new QTimer(this))
+    , m_traceTimer(new QTimer(this))
+    , m_elapsedTimer(new QElapsedTimer)
+    , m_count(0)
+    , m_history(HistoryLength, 0.0)
+    , m_historyIndex(0)
+    , m_historyCount(0)
+    , m_frequency(0.0)
+    , m_frequencySum(0.0)
+{
+    connect(m_sampleTimer, SIGNAL(timeout()), this, SLOT(sample()));
+    m_sampleTimer->start(SamplingInterval);
+    connect(m_traceTimer, SIGNAL(timeout()), this, SLOT(trace()));
+    m_traceTimer->start(TraceInterval);
+    m_elapsedTimer->start();
+}
+
+S60VideoFrameRate::~S60VideoFrameRate()
+{
+
+}
+
+qreal S60VideoFrameRate::frequency() const
+{
+    return m_frequency;
+}
+
+void S60VideoFrameRate::notify()
+{
+    ++m_count;
+}
+
+void S60VideoFrameRate::sample()
+{
+    const int ms = m_elapsedTimer->restart();
+    const qreal freq = qreal(m_count * 1000) / ms;
+    m_frequencySum -= m_history[m_historyIndex];
+    m_frequencySum += freq;
+    m_history[m_historyIndex] = freq;
+    m_historyIndex = (m_historyIndex + 1) % m_history.count();
+    if (m_historyCount < m_history.count())
+        ++m_historyCount;
+    m_frequency = m_frequencySum / m_historyCount;
+    emit frequencyChanged(m_frequency);
+    m_count = 0;
+}
+
+void S60VideoFrameRate::trace()
+{
+    qDebug() << "S60VideoFrameRate" << m_frequency << "fps";
+}
diff --git a/plugins/multimedia/symbian/videooutput/s60videoframerate.h b/plugins/multimedia/symbian/videooutput/s60videoframerate.h
new file mode 100644
index 0000000000..e501483ce5
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60videoframerate.h
@@ -0,0 +1,89 @@
+/**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef S60VIDEOFRAMERATE_H
+#define S60VIDEOFRAMERATE_H
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+#include <QtCore/QVector>
+
+class QElapsedTimer;
+class QTimer;
+
+/**
+ * Class for measuring video frame rate
+ *
+ * Delivery of a new video frame is notified by the client via the notify() slot.
+ * This class performs regular sampling of the event frequency and calculates a
+ * rolling average which is published via the frequency property.
+ */
+class S60VideoFrameRate : public QObject
+{
+    Q_OBJECT
+
+public:
+    S60VideoFrameRate(QObject *parent = 0);
+    ~S60VideoFrameRate();
+    qreal frequency() const;
+
+signals:
+    void frequencyChanged(qreal freq) const;
+
+public slots:
+    void notify();
+
+private slots:
+    void sample();
+    void trace();
+
+private:
+    QTimer *m_sampleTimer;
+    QTimer *m_traceTimer;
+    QScopedPointer<QElapsedTimer> m_elapsedTimer;
+    int m_count;
+    QVector<qreal> m_history;
+    int m_historyIndex;
+    int m_historyCount;
+    qreal m_frequencySum;
+    qreal m_frequency;
+};
+
+#endif // S60VIDEOFRAMERATE_H
diff --git a/plugins/multimedia/symbian/videooutput/s60videooutputfactory.cpp b/plugins/multimedia/symbian/videooutput/s60videooutputfactory.cpp
new file mode 100644
index 0000000000..cf77ade0cf
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60videooutputfactory.cpp
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "s60mmtrace.h"
+#include "s60videooutputfactory.h"
+#include "s60videowidgetcontrol.h"
+#include "s60videowindowcontrol.h"
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+#include "s60eglextensions.h"
+#include "s60videoeglrenderercontrol.h"
+#endif
+#include <QtCore/QVariant>
+
+S60VideoOutputFactory::S60VideoOutputFactory(QObject *parent)
+    : QObject(parent)
+    , m_eglExtensions(0)
+{
+    TRACE("S60VideoOutputFactory::S60VideoOutputFactory" << qtThisPtr());
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+    m_eglExtensions = S60EglExtensions::create(this);
+#endif
+}
+
+S60VideoOutputFactory::~S60VideoOutputFactory()
+{
+    TRACE("S60VideoOutputFactory::~S60VideoOutputFactory" << qtThisPtr());
+    foreach (ControlData d, m_data)
+        delete d.control;
+}
+
+QMediaControl *S60VideoOutputFactory::requestControl(const char *name)
+{
+    TRACE("S60VideoOutputFactory::requestControl" << qtThisPtr() << "name" << name);
+    QMediaControl *control = 0;
+    for (int i=0; i<m_data.count(); ++i) {
+        ControlData &d = m_data[i];
+        if (d.name == name) {
+            control = d.control;
+            // TODO: protect against multithreaded usage, if QMediaService is
+            // required to be thread-safe
+            ++d.refCount;
+        }
+    }
+    if (!control) {
+#ifdef VIDEOOUTPUT_GRAPHICS_SURFACES
+        if (qstrcmp(name, QVideoRendererControl_iid) == 0) {
+            if (m_eglExtensions)
+                control = new S60VideoEglRendererControl(m_eglExtensions, this);
+        } else
+#endif
+        if (qstrcmp(name, QVideoWidgetControl_iid) == 0) {
+            control = new S60VideoWidgetControl(this);
+        } else if (qstrcmp(name, QVideoWindowControl_iid) == 0) {
+            control = new S60VideoWindowControl(this);
+        }
+        if (control) {
+            ControlData d;
+            d.control = control;
+            d.name = name;
+            d.refCount = 1;
+            m_data += d;
+        }
+    }
+    return control;
+}
+
+void S60VideoOutputFactory::releaseControl(QMediaControl *control)
+{
+    TRACE("S60VideoOutputFactory::requestControl" << qtThisPtr() << "control" << control);
+    int index = -1;
+    for (int i=0; index == -1 && i<m_data.count(); ++i)
+        if (m_data.at(i).control == control)
+            index = i;
+    if (index != -1 && --m_data[index].refCount == 0) {
+        delete control;
+        m_data.remove(index);
+    }
+}
diff --git a/plugins/multimedia/symbian/videooutput/s60videooutputfactory.h b/plugins/multimedia/symbian/videooutput/s60videooutputfactory.h
new file mode 100644
index 0000000000..2d0a5681ea
--- /dev/null
+++ b/plugins/multimedia/symbian/videooutput/s60videooutputfactory.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef S60VIDEOOUTPUTFACTORY_H
+#define S60VIDEOOUTPUTFACTORY_H
+
+#include <qmediacontrol.h>
+#include <QtCore/QVector>
+
+QT_USE_NAMESPACE
+
+class S60EglExtensions;
+
+class S60VideoOutputFactory : public QObject
+{
+public:
+    S60VideoOutputFactory(QObject *parent = 0);
+    ~S60VideoOutputFactory();
+
+    QMediaControl *requestControl(const char *name);
+    void releaseControl(QMediaControl *control);
+
+private:
+    struct ControlData
+    {
+        QString name;
+        QMediaControl *control;
+        int refCount;
+    };
+    QVector<ControlData> m_data;
+    S60EglExtensions *m_eglExtensions;
+};
+
+#endif // S60VIDEOOUTPUTFACTORY_H
+
diff --git a/plugins/multimedia/symbian/videooutput/s60videooutpututils.cpp b/plugins/multimedia/symbian/videooutput/s60videooutpututils.cpp
index 2604b1091f..09cff69100 100644
--- a/plugins/multimedia/symbian/videooutput/s60videooutpututils.cpp
+++ b/plugins/multimedia/symbian/videooutput/s60videooutpututils.cpp
@@ -40,32 +40,76 @@
 ****************************************************************************/
 
 #include "s60videooutpututils.h"
+#include <QtCore/QDebug>
 
-#ifdef PRIVATE_QTGUI_HEADERS_AVAILABLE
-#if QT_VERSION >= 0x040601 && !defined(__WINSCW__)
-#include <QtGui/private/qt_s60_p.h>
-#include <QtGui/private/qwidget_p.h>
-#define USE_PRIVATE_QTGUI_APIS
-#endif // QT_VERSION >= 0x040601 && !defined(__WINSCW__)
-#endif // PRIVATE_QTGUI_HEADERS_AVAILABLE
+#ifdef QSYMBIANGRAPHICSSYSTEMHELPER_AVAILABLE
+#   include <QtGui/qgraphicssystemhelper_symbian.h>
+#else
+#   ifdef PRIVATE_QTGUI_HEADERS_AVAILABLE
+#       if QT_VERSION >= 0x040601 && !defined(__WINSCW__)
+#           include <QtGui/private/qt_s60_p.h>
+#           include <QtGui/private/qwidget_p.h>
+#           define USE_PRIVATE_QTGUI_APIS
+#       endif
+#   else
+#       define QTGUI_SUPPORT_UNAVAILABLE
+#   endif
+#endif
 
 namespace S60VideoOutputUtils
 {
 
+// Helper function
+void warnQtGuiSupportUnavailable()
+{
+    qWarning() << "QtMobility was compiled against Qt which lacked some extension functions";
+    qWarning() << "Video and viewfinder may not render correctly";
+}
+
+#ifdef QSYMBIANGRAPHICSSYSTEMHELPER_AVAILABLE
+QSymbianGraphicsSystemHelper::NativePaintMode helperNativePaintMode(NativePaintMode mode)
+{
+    QSymbianGraphicsSystemHelper::NativePaintMode result =
+        QSymbianGraphicsSystemHelper::NativePaintModeDefault;
+    switch (mode) {
+    case Default:
+        break;
+    case ZeroFill:
+        result = QSymbianGraphicsSystemHelper::NativePaintModeZeroFill;
+        break;
+    case BlitWriteAlpha:
+        result = QSymbianGraphicsSystemHelper::NativePaintModeWriteAlpha;
+        break;
+    case Disable:
+        result = QSymbianGraphicsSystemHelper::NativePaintModeDisable;
+        break;
+    }
+    return result;
+}
+#endif
+
 void setIgnoreFocusChanged(QWidget *widget)
 {
+#ifdef QSYMBIANGRAPHICSSYSTEMHELPER_AVAILABLE
+    QSymbianGraphicsSystemHelper::setIgnoreFocusChanged(widget, true);
+#endif
 #ifdef USE_PRIVATE_QTGUI_APIS
     // Warning: if this flag is not set, the application may crash due to
     // CGraphicsContext being called from within the context of
     // QGraphicsVideoItem::paint(), when the video widget is shown.
     static_cast<QSymbianControl *>(widget->winId())->setIgnoreFocusChanged(true);
-#else
+#endif
+#ifdef QTGUI_SUPPORT_UNAVAILABLE
     Q_UNUSED(widget)
+    warnQtGuiSupportUnavailable();
 #endif
 }
 
 void setNativePaintMode(QWidget *widget, NativePaintMode mode)
 {
+#ifdef QSYMBIANGRAPHICSSYSTEMHELPER_AVAILABLE
+    QSymbianGraphicsSystemHelper::setNativePaintMode(widget, helperNativePaintMode(mode));
+#endif
 #ifdef USE_PRIVATE_QTGUI_APIS
     QWidgetPrivate *widgetPrivate = qt_widget_private(widget->window());
     widgetPrivate->createExtra();
@@ -77,41 +121,53 @@ void setNativePaintMode(QWidget *widget, NativePaintMode mode)
         widgetMode = QWExtra::ZeroFill;
         break;
     case BlitWriteAlpha:
-#if QT_VERSION >= 0x040704
+#   if QT_VERSION >= 0x040704
         widgetMode = QWExtra::BlitWriteAlpha;
-#endif
+#   endif
         break;
     case Disable:
         widgetMode = QWExtra::Disable;
         break;
     }
     widgetPrivate->extraData()->nativePaintMode = widgetMode;
-#else
+#endif
+#ifdef QTGUI_SUPPORT_UNAVAILABLE
     Q_UNUSED(widget)
     Q_UNUSED(mode)
+    warnQtGuiSupportUnavailable();
 #endif
 }
 
 void setNativePaintMode(WId wid, NativePaintMode mode)
 {
+#ifdef QSYMBIANGRAPHICSSYSTEMHELPER_AVAILABLE
+    QSymbianGraphicsSystemHelper::setNativePaintMode(wid, helperNativePaintMode(mode));
+#endif
 #ifdef USE_PRIVATE_QTGUI_APIS
     QWidget *window = static_cast<QSymbianControl *>(wid)->widget()->window();
     setNativePaintMode(window, mode);
-#else
+#endif
+#ifdef QTGUI_SUPPORT_UNAVAILABLE
     Q_UNUSED(wid)
     Q_UNUSED(mode)
+    warnQtGuiSupportUnavailable();
 #endif
 }
 
 void setReceiveNativePaintEvents(QWidget *widget, bool enabled)
 {
+#ifdef QSYMBIANGRAPHICSSYSTEMHELPER_AVAILABLE
+    QSymbianGraphicsSystemHelper::setReceiveNativePaintEvents(widget, enabled);
+#endif
 #ifdef USE_PRIVATE_QTGUI_APIS
     QWidgetPrivate *widgetPrivate = qt_widget_private(widget);
     widgetPrivate->createExtra();
     widgetPrivate->extraData()->receiveNativePaintEvents = enabled;
-#else
+#endif
+#ifdef QTGUI_SUPPORT_UNAVAILABLE
     Q_UNUSED(widget)
     Q_UNUSED(enabled)
+    warnQtGuiSupportUnavailable();
 #endif
 }
 
diff --git a/plugins/multimedia/symbian/videooutput/s60videooutpututils.h b/plugins/multimedia/symbian/videooutput/s60videooutpututils.h
index 0eeb714017..8a0cec71e3 100644
--- a/plugins/multimedia/symbian/videooutput/s60videooutpututils.h
+++ b/plugins/multimedia/symbian/videooutput/s60videooutpututils.h
@@ -52,6 +52,8 @@ QT_FORWARD_DECLARE_CLASS(QWidget)
 namespace S60VideoOutputUtils
 {
 
+void setIgnoreFocusChanged(QWidget *widget);
+
 enum NativePaintMode
 {
     Default,
@@ -60,7 +62,6 @@ enum NativePaintMode
     Disable
 };
 
-void setIgnoreFocusChanged(QWidget *widget);
 void setNativePaintMode(QWidget *widget, NativePaintMode mode);
 void setNativePaintMode(WId wid, NativePaintMode mode);
 void setReceiveNativePaintEvents(QWidget *widget, bool enabled);
diff --git a/plugins/multimedia/symbian/videooutput/s60videowidget.cpp b/plugins/multimedia/symbian/videooutput/s60videowidget.cpp
index 3804204e2c..a824a4594b 100644
--- a/plugins/multimedia/symbian/videooutput/s60videowidget.cpp
+++ b/plugins/multimedia/symbian/videooutput/s60videowidget.cpp
@@ -56,11 +56,11 @@ using namespace S60VideoOutputUtils;
 const int NullOrdinalPosition = -1;
 
 S60VideoWidget::S60VideoWidget(QWidget *parent)
-:   QWidget(parent)
-,   m_pixmap(NULL)
-,   m_paintingEnabled(false)
-,   m_topWinId(0)
-,   m_ordinalPosition(NullOrdinalPosition)
+    : QWidget(parent)
+    , m_pixmap(0)
+    , m_paintingEnabled(false)
+    , m_topWinId(0)
+    , m_ordinalPosition(NullOrdinalPosition)
 {
     setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     setPalette(QPalette(Qt::black));
diff --git a/plugins/multimedia/symbian/videooutput/s60videowidgetcontrol.cpp b/plugins/multimedia/symbian/videooutput/s60videowidgetcontrol.cpp
index 37c35b773a..d5d045f667 100644
--- a/plugins/multimedia/symbian/videooutput/s60videowidgetcontrol.cpp
+++ b/plugins/multimedia/symbian/videooutput/s60videowidgetcontrol.cpp
@@ -43,8 +43,8 @@
 #include "s60videowidgetdisplay.h"
 
 S60VideoWidgetControl::S60VideoWidgetControl(QObject *parent)
-:   QVideoWidgetControl(parent)
-,   m_display(new S60VideoWidgetDisplay(this))
+    : QVideoWidgetControl(parent)
+    , m_display(new S60VideoWidgetDisplay(this))
 {
     connect(m_display, SIGNAL(nativeSizeChanged(QSize)),
             this, SIGNAL(nativeSizeChanged()));
diff --git a/plugins/multimedia/symbian/videooutput/s60videowidgetdisplay.cpp b/plugins/multimedia/symbian/videooutput/s60videowidgetdisplay.cpp
index 0208d546b7..dacdde9498 100644
--- a/plugins/multimedia/symbian/videooutput/s60videowidgetdisplay.cpp
+++ b/plugins/multimedia/symbian/videooutput/s60videowidgetdisplay.cpp
@@ -47,8 +47,8 @@
 #include <w32std.h>
 
 S60VideoWidgetDisplay::S60VideoWidgetDisplay(QObject *parent)
-:   S60VideoDisplay(parent)
-,   m_widget(new S60VideoWidget)
+    : S60VideoDisplay(parent)
+    , m_widget(new S60VideoWidget)
 {
     connect(this, SIGNAL(paintingEnabledChanged(bool)), m_widget, SLOT(setPaintingEnabled(bool)));
     connect(this, SIGNAL(fullScreenChanged(bool)), m_widget, SLOT(setFullScreen(bool)));
diff --git a/plugins/multimedia/symbian/videooutput/s60videowindowcontrol.cpp b/plugins/multimedia/symbian/videooutput/s60videowindowcontrol.cpp
index 0cc6e8ac4b..afd4366e41 100644
--- a/plugins/multimedia/symbian/videooutput/s60videowindowcontrol.cpp
+++ b/plugins/multimedia/symbian/videooutput/s60videowindowcontrol.cpp
@@ -43,8 +43,8 @@
 #include "s60videowindowdisplay.h"
 
 S60VideoWindowControl::S60VideoWindowControl(QObject *parent)
-:   QVideoWindowControl(parent)
-,   m_display(new S60VideoWindowDisplay(this))
+    : QVideoWindowControl(parent)
+    , m_display(new S60VideoWindowDisplay(this))
 {
     connect(m_display, SIGNAL(nativeSizeChanged(QSize)),
             this, SIGNAL(nativeSizeChanged()));
diff --git a/plugins/multimedia/symbian/videooutput/s60videowindowdisplay.cpp b/plugins/multimedia/symbian/videooutput/s60videowindowdisplay.cpp
index ccdc8c1d34..c6feddce5f 100644
--- a/plugins/multimedia/symbian/videooutput/s60videowindowdisplay.cpp
+++ b/plugins/multimedia/symbian/videooutput/s60videowindowdisplay.cpp
@@ -48,9 +48,9 @@
 using namespace S60VideoOutputUtils;
 
 S60VideoWindowDisplay::S60VideoWindowDisplay(QObject *parent)
-:   S60VideoDisplay(parent)
-,   m_winId(0)
-,   m_bitmap(0)
+    : S60VideoDisplay(parent)
+    , m_winId(0)
+    , m_bitmap(0)
 {
     parent->setProperty("colorKey", Qt::transparent);
 }
diff --git a/plugins/multimedia/symbian/videooutput/videooutput.pri b/plugins/multimedia/symbian/videooutput/videooutput.pri
index 13aa7a0fc7..17792935e5 100644
--- a/plugins/multimedia/symbian/videooutput/videooutput.pri
+++ b/plugins/multimedia/symbian/videooutput/videooutput.pri
@@ -1,37 +1,74 @@
 INCLUDEPATH += $$PWD
 
-message("VideoOutput: using common implementation")
+include(../trace/trace.pri)
+
+HEADERS += $$PWD/s60videodisplay.h           \
+           $$PWD/s60videooutpututils.h       \
+           $$PWD/s60videooutputfactory.h     \
+           $$PWD/s60videowidget.h            \
+           $$PWD/s60videowidgetcontrol.h     \
+           $$PWD/s60videowidgetdisplay.h     \
+           $$PWD/s60videowindowcontrol.h     \
+           $$PWD/s60videowindowdisplay.h
+
+SOURCES += $$PWD/s60videodisplay.cpp         \
+           $$PWD/s60videooutpututils.cpp     \
+           $$PWD/s60videooutputfactory.cpp   \
+           $$PWD/s60videowidget.cpp          \
+           $$PWD/s60videowidgetcontrol.cpp   \
+           $$PWD/s60videowidgetdisplay.cpp   \
+           $$PWD/s60videowindowcontrol.cpp   \
+           $$PWD/s60videowindowdisplay.cpp
+
+LIBS *= -lcone
+LIBS *= -lws32
+
+# Uncomment this to enable frame rate measurement
+#videooutput_measure_framerate = yes
 
 contains(surfaces_s60_enabled, yes) {
     message("VideoOutput: graphics surface rendering supported")
     DEFINES += VIDEOOUTPUT_GRAPHICS_SURFACES
+    HEADERS += $$PWD/s60eglendpoint.h               \
+               $$PWD/s60eglextensions.h             \
+               $$PWD/s60nativewindow.h              \
+               $$PWD/s60videobuffer.h               \
+               $$PWD/s60videoeglrenderercontrol.h
+    SOURCES += $$PWD/s60eglendpoint.cpp             \
+               $$PWD/s60eglextensions.cpp           \
+               $$PWD/s60nativewindow.cpp            \
+               $$PWD/s60videobuffer.cpp             \
+               $$PWD/s60videoeglrenderercontrol.cpp
+    DEFINES += VIDEOOUTPUT_EGL_RENDERER
+    LIBS += -llibegl
+    contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
+        QT += opengl
+    } else {
+        DEFINES += QT_NO_OPENGL
+    }
+    contains(QT_CONFIG, openvg) {
+        LIBS += -llibopenvg
+    } else {
+        DEFINES += QT_NO_OPENVG
+    }
+    contains(videooutput_measure_framerate, yes) {
+        HEADERS += $$PWD/s60videoframerate.h
+        SOURCES += $$PWD/s60videoframerate.cpp
+        DEFINES += VIDEOOUTPUT_MEASURE_FRAMERATE
+    }
 } else {
     message("VideoOutput: no graphics surface rendering support - DSA only")
 }
 
-exists($$[QT_INSTALL_HEADERS]/QtGui/private/qwidget_p.h) {
-    DEFINES += PRIVATE_QTGUI_HEADERS_AVAILABLE
-    message("VideoOutput: private QtGui headers are available")
+exists($$[QT_INSTALL_HEADERS]/QtGui/qgraphicssystemhelper_symbian.h) {
+    message("VideoOutput: QSymbianGraphicsSystemHelper is available")
+    DEFINES += QSYMBIANGRAPHICSSYSTEMHELPER_AVAILABLE
 } else {
-    message("VideoOutput: private QtGui headers not available - video and viewfinder may not be rendered correctly")
+    exists($$[QT_INSTALL_HEADERS]/QtGui/private/qwidget_p.h) {
+        DEFINES += PRIVATE_QTGUI_HEADERS_AVAILABLE
+        message("VideoOutput: private QtGui headers are available")
+    } else {
+        message("VideoOutput: neither QSymbianGraphicsSystemHelper nor private QtGui headers not available - video and viewfinder may not be rendered correctly")
+    }
 }
 
-HEADERS += $$PWD/s60videodisplay.h         \
-           $$PWD/s60videooutpututils.h     \
-           $$PWD/s60videowidget.h          \
-           $$PWD/s60videowidgetcontrol.h   \
-           $$PWD/s60videowidgetdisplay.h   \
-           $$PWD/s60videowindowcontrol.h   \
-           $$PWD/s60videowindowdisplay.h
-
-SOURCES += $$PWD/s60videodisplay.cpp       \
-           $$PWD/s60videooutpututils.cpp   \
-           $$PWD/s60videowidget.cpp        \
-           $$PWD/s60videowidgetcontrol.cpp \
-           $$PWD/s60videowidgetdisplay.cpp \
-           $$PWD/s60videowindowcontrol.cpp \
-           $$PWD/s60videowindowdisplay.cpp
-
-LIBS *= -lcone
-LIBS *= -lws32
-
diff --git a/plugins/organizer/symbian/symbian.pro b/plugins/organizer/symbian/symbian.pro
index eceee11de2..4edae26e9f 100644
--- a/plugins/organizer/symbian/symbian.pro
+++ b/plugins/organizer/symbian/symbian.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtorganizer_symbian)
+TARGET = $$mobilityPluginTarget(qtorganizer_symbian)
 PLUGIN_TYPE=organizer
 
 # support for S^4-specific types
@@ -24,7 +26,7 @@ symbian: {
 
     TARGET.CAPABILITY = ALL -TCB
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002BFC9
+    TARGET.UID3 = $$mobilityUID(0x2002BFC9)
   
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
     INCLUDEPATH += $$MW_LAYER_SYSTEMINCLUDE
diff --git a/plugins/sensors/generic/generic.pro b/plugins/sensors/generic/generic.pro
index d4745e6858..5ebac60bcb 100644
--- a/plugins/sensors/generic/generic.pro
+++ b/plugins/sensors/generic/generic.pro
@@ -1,17 +1,19 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH+=../../../src/sensors
 
 PLUGIN_TYPE = sensors
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtsensors_generic)
+TARGET = $$mobilityPluginTarget(qtsensors_generic)
 
 include(generic.pri)
 include(../../../common.pri)
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002BFC3
+    TARGET.UID3 = $$mobilityUID(0x2002BFC3)
     TARGET.CAPABILITY = ALL -TCB
 
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/sensors/s60_sensor_api/s60_sensor_api.pro b/plugins/sensors/s60_sensor_api/s60_sensor_api.pro
index 06b94377c7..d7788fd161 100644
--- a/plugins/sensors/s60_sensor_api/s60_sensor_api.pro
+++ b/plugins/sensors/s60_sensor_api/s60_sensor_api.pro
@@ -10,7 +10,7 @@ include(s60_sensor_api.pri)
 
 TARGET = $$qtLibraryTarget(qtsensors_sym)
 TARGET.EPOCALLOWDLLDATA = 1
-TARGET.UID3 = 0x2002BFC1
+TARGET.UID3 = $$mobilityUID(0x2002BFC1)
 TARGET.CAPABILITY = ALL -TCB
 
 QT=core
diff --git a/plugins/sensors/symbian/symbian.pro b/plugins/sensors/symbian/symbian.pro
index b4a8da6322..2300dfb45d 100644
--- a/plugins/sensors/symbian/symbian.pro
+++ b/plugins/sensors/symbian/symbian.pro
@@ -1,10 +1,12 @@
+include(../../../features/utils.pri)
+
 INCLUDEPATH+=$$(EPOCROOT)epoc32/include/osextensions
 
 PLUGIN_TYPE = sensors
 
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtsensors_sym)
+TARGET = $$mobilityPluginTarget(qtsensors_sym)
 
 include(../../../common.pri)
 
@@ -44,7 +46,7 @@ MOBILITY+=sensors
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2002BFC8
+    TARGET.UID3 = $$mobilityUID(0x2002BFC8)
     TARGET.CAPABILITY = ALL -TCB
     LIBS += -lsensrvclient
     LIBS += -lsensrvutil
diff --git a/plugins/versit/backuphandler/backuphandler.pro b/plugins/versit/backuphandler/backuphandler.pro
index 7e7e067444..270016cd76 100644
--- a/plugins/versit/backuphandler/backuphandler.pro
+++ b/plugins/versit/backuphandler/backuphandler.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtversit_backuphandler)
+TARGET = $$mobilityPluginTarget(qtversit_backuphandler)
 PLUGIN_TYPE=versit
 
 include(../../../common.pri)
@@ -20,7 +22,7 @@ MOBILITY = versit contacts
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -Tcb
-    TARGET.UID3 = 0x20031600
+    TARGET.UID3 = $$mobilityUID(0x20031600)
 
     target.path = /sys/bin
     INSTALLS += target
diff --git a/plugins/versit/symbian/versitplugins/cntversitfavoriteplugin/cntversitfavoriteplugin.pro b/plugins/versit/symbian/versitplugins/cntversitfavoriteplugin/cntversitfavoriteplugin.pro
index 665e9be52e..c65390900c 100644
--- a/plugins/versit/symbian/versitplugins/cntversitfavoriteplugin/cntversitfavoriteplugin.pro
+++ b/plugins/versit/symbian/versitplugins/cntversitfavoriteplugin/cntversitfavoriteplugin.pro
@@ -1,6 +1,8 @@
+include(../../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(cntversitfavoriteplugin)
+TARGET = $$mobilityPluginTarget(cntversitfavoriteplugin)
 PLUGIN_TYPE = versit
 
 include(../../../../../common.pri)
@@ -25,7 +27,7 @@ MOBILITY = versit contacts
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x20034590
+    TARGET.UID3 = $$mobilityUID(0x20034590)
     TARGET.CAPABILITY = ALL -TCB
 
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/versit/symbian/versitplugins/cntversitlandlineplugin/cntversitlandlineplugin.pro b/plugins/versit/symbian/versitplugins/cntversitlandlineplugin/cntversitlandlineplugin.pro
index 29bfa69153..573515b7dd 100644
--- a/plugins/versit/symbian/versitplugins/cntversitlandlineplugin/cntversitlandlineplugin.pro
+++ b/plugins/versit/symbian/versitplugins/cntversitlandlineplugin/cntversitlandlineplugin.pro
@@ -1,6 +1,8 @@
+include(../../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(cntversitlandlineplugin)
+TARGET = $$mobilityPluginTarget(cntversitlandlineplugin)
 PLUGIN_TYPE = versit
 
 include(../../../../../common.pri)
@@ -27,7 +29,7 @@ MOBILITY = versit \
 
 symbian { 
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2003458F
+    TARGET.UID3 = $$mobilityUID(0x2003458F)
     TARGET.CAPABILITY = ALL -TCB
     
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/versit/symbian/versitplugins/cntversitmycardplugin/cntversitmycardplugin.pro b/plugins/versit/symbian/versitplugins/cntversitmycardplugin/cntversitmycardplugin.pro
index c616446997..50152ab7bd 100644
--- a/plugins/versit/symbian/versitplugins/cntversitmycardplugin/cntversitmycardplugin.pro
+++ b/plugins/versit/symbian/versitplugins/cntversitmycardplugin/cntversitmycardplugin.pro
@@ -1,6 +1,8 @@
+include(../../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(cntversitmycardplugin)
+TARGET = $$mobilityPluginTarget(cntversitmycardplugin)
 PLUGIN_TYPE = versit
 
 include(../../../../../common.pri)
@@ -28,7 +30,7 @@ MOBILITY = versit \
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x20034591
+    TARGET.UID3 = $$mobilityUID(0x20034591)
     TARGET.CAPABILITY = ALL -TCB
 
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/versit/symbian/versitplugins/cntversitprefplugin/cntversitprefplugin.pro b/plugins/versit/symbian/versitplugins/cntversitprefplugin/cntversitprefplugin.pro
index e9f006c123..8f377c53fd 100644
--- a/plugins/versit/symbian/versitplugins/cntversitprefplugin/cntversitprefplugin.pro
+++ b/plugins/versit/symbian/versitplugins/cntversitprefplugin/cntversitprefplugin.pro
@@ -1,6 +1,8 @@
+include(../../../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(cntversitprefplugin)
+TARGET = $$mobilityPluginTarget(cntversitprefplugin)
 PLUGIN_TYPE = versit
 
 include(../../../../../common.pri)
@@ -26,7 +28,7 @@ MOBILITY = versit contacts
 
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3 = 0x2003458E
+    TARGET.UID3 = $$mobilityUID(0x2003458E)
     TARGET.CAPABILITY = ALL -TCB
     
     pluginDep.sources = $${TARGET}.dll
diff --git a/plugins/versit/vcardpreserver/vcardpreserver.pro b/plugins/versit/vcardpreserver/vcardpreserver.pro
index 41e7efea68..023d4aa52e 100644
--- a/plugins/versit/vcardpreserver/vcardpreserver.pro
+++ b/plugins/versit/vcardpreserver/vcardpreserver.pro
@@ -1,6 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = lib
 CONFIG += plugin
-TARGET = $$qtLibraryTarget(qtversit_vcardpreserver)
+TARGET = $$mobilityPluginTarget(qtversit_vcardpreserver)
 PLUGIN_TYPE=versit
 
 include(../../../common.pri)
@@ -20,7 +22,7 @@ MOBILITY = versit contacts
 symbian {
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -Tcb
-    TARGET.UID3 = 0x20031602
+    TARGET.UID3 = $$mobilityUID(0x20031602)
 
     target.path = /sys/bin
     INSTALLS += target
diff --git a/src/bearer/bearer.pri b/src/bearer/bearer.pri
index 88dca8dc2e..c581623954 100644
--- a/src/bearer/bearer.pri
+++ b/src/bearer/bearer.pri
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
 DEFINES += QT_BUILD_BEARER_LIB QT_MAKEDLL
 
 #DEFINES += BEARER_MANAGEMENT_DEBUG
@@ -17,9 +19,8 @@ HEADERS += qnetworksession.h \
 symbian: {
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x2002AC81
-
-    QtBearerManagement.sources = QtBearer.dll
+    TARGET.UID3 = $$mobilityUID(0x2002AC81)
+    QtBearerManagement.sources = QtBearer$${QT_LIBINFIX}.dll
     QtBearerManagement.path = /sys/bin
     QtBearerManagement.pkg_prerules += $${LITERAL_HASH}{\"QtBearer\"},(0x2002AC81),1,2,1,TYPE=SA,RU
     DEPLOYMENT += QtBearerManagement
diff --git a/src/connectivity/connectivity.pro b/src/connectivity/connectivity.pro
index 2d569664e3..e93245f4af 100644
--- a/src/connectivity/connectivity.pro
+++ b/src/connectivity/connectivity.pro
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
 # Qt connectivity library
 TEMPLATE = lib
 TARGET   = QtConnectivity
@@ -16,11 +18,11 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 symbian {
     load(data_caging_paths)
     TARGET.EPOCALLOWDLLDATA = 1
-    TARGET.UID3=0x2002BFD1
+    TARGET.UID3 = $$mobilityUID(0x2002BFD1)
     TARGET.CAPABILITY = All -TCB
 }
 symbian: {
-    QtConnectivityDeployment.sources = QtConnectivity.dll
+    QtConnectivityDeployment.sources = QtConnectivity$${QT_LIBINFIX}.dll
     QtConnectivityDeployment.path = /sys/bin
     DEPLOYMENT += QtConnectivityDeployment
 }
diff --git a/src/contacts/contacts.pro b/src/contacts/contacts.pro
index 72bee8e5cb..feb8e298b9 100644
--- a/src/contacts/contacts.pro
+++ b/src/contacts/contacts.pro
@@ -1,6 +1,9 @@
 # #####################################################################
 # Contacts Mobility API
 # #####################################################################
+
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 
 # Target gets fixed up in common.pri
@@ -104,13 +107,13 @@ symbian {
 
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x2002AC7A
+    TARGET.UID3 = $$mobilityUID(0x2002AC7A)
 
     LIBS += -lefsrv
 
     ### Contacts
     # Main library
-    CONTACTS_DEPLOYMENT.sources = QtContacts.dll
+    CONTACTS_DEPLOYMENT.sources = QtContacts$${QT_LIBINFIX}.dll
     CONTACTS_DEPLOYMENT.path = /sys/bin
     DEPLOYMENT += CONTACTS_DEPLOYMENT
 }
diff --git a/src/contacts/qcontact.cpp b/src/contacts/qcontact.cpp
index d35d6c13be..725df56215 100644
--- a/src/contacts/qcontact.cpp
+++ b/src/contacts/qcontact.cpp
@@ -176,7 +176,7 @@ bool QContact::isEmpty() const
 
 /*!
  * Removes all details of the contact.
- * This function does not modify the id or type of the contact.
+ * This function does not modify the id of the contact.
  * Calling isEmpty() after calling this function will return true.
  * \since 1.0
  */
@@ -979,7 +979,12 @@ QMap<QString, QContactDetail> QContact::preferredDetails() const
     QMap<QString, QContactDetail> ret;
     QMap<QString, int>::const_iterator it = d->m_preferences.constBegin();
     while (it != d->m_preferences.constEnd()) {
-        ret.insert(it.key(), d->m_details.at(it.value()));
+        foreach(QContactDetail detail, d->m_details) {
+            if (detail.d->m_id == it.value()) {
+                ret.insert(it.key(), detail);
+                break;
+            }
+        }
         ++it;
     }
 
diff --git a/src/contacts/qcontactdetail.cpp b/src/contacts/qcontactdetail.cpp
index b5afdedf65..e858101a38 100644
--- a/src/contacts/qcontactdetail.cpp
+++ b/src/contacts/qcontactdetail.cpp
@@ -101,15 +101,17 @@ Q_DESTRUCTOR_FUNCTION(qClearAllocatedStringHash)
   One field which is common to all details is the context field.  This field is intended to store one or
   more contexts that this detail is associated with.  Commonly this will be something like
   "Home" and/or "Work", although no limitations are placed on which values may be stored in this field
-  in the default schema.
+  in the default schema. Note that context field might not be set by default to all details in
+  the default schema.
 
-  There are two other, related fields which are common to all details.  The first is
+  There are two other, related fields which are available for all details.  The first is
   \a QContactDetail::FieldDetailUri, which stores the unique URI of the detail if one exists.
   The field is not mandatory, and backends are not required to verify that the given URI is indeed
   unique within the contact.  The second field is \a QContactDetail::LinkedDetailUris, which stores
   a list of detail URIs to which this detail is linked.  The link is one-way, and can be used to show
   how or where a detail was derived.  This is useful for things like presence information and avatars,
   which are linked to a particular online account detail of the contact.
+  Note that these fields might not be set by default to details in default schema.
 
   When a QContactDetail has been retrieved in a QContact from a QContactManager, it may have certain
   access constraints provided with it, like \l ReadOnly or \l Irremovable.  This might mean that the
diff --git a/src/contacts/qcontactfetchhint.cpp b/src/contacts/qcontactfetchhint.cpp
index c2b04061d7..dbecff96c5 100644
--- a/src/contacts/qcontactfetchhint.cpp
+++ b/src/contacts/qcontactfetchhint.cpp
@@ -194,6 +194,7 @@ void QContactFetchHint::setRelationshipTypesHint(const QStringList& relationship
 
   The caller should be prepared for images of any dimensions,
   in any case.
+  \since 1.1
  */
 QSize QContactFetchHint::preferredImageSize() const
 {
@@ -211,6 +212,7 @@ QSize QContactFetchHint::preferredImageSize() const
 
   The caller should be prepared for images of any dimensions,
   in any case.
+  \since 1.1
  */
 void QContactFetchHint::setPreferredImageSize(const QSize& size)
 {
@@ -259,6 +261,7 @@ void QContactFetchHint::setOptimizationHints(OptimizationHints hints)
 
   A negative value for count denotes that the client wishes to
   retrieve all results.  The default value is -1.
+  \since 1.2
  */
 int QContactFetchHint::maxCountHint() const
 {
diff --git a/src/contacts/qcontactmanagerengine.cpp b/src/contacts/qcontactmanagerengine.cpp
index 6796361db7..562148b0ef 100644
--- a/src/contacts/qcontactmanagerengine.cpp
+++ b/src/contacts/qcontactmanagerengine.cpp
@@ -2487,7 +2487,7 @@ bool QContactManagerEngine::cancelRequest(QContactAbstractRequest* req)
 /*!
   Blocks until the manager engine has completed the given request \a req
   which was previously started, or until \a msecs milliseconds have passed.
-  Returns true if the request was completed, and false if the request was not in the
+  Returns true if the request was cancelled or completed, and false if the request was not in the
   \c QContactAbstractRequest::Active state or no progress could be reported.
 
   \sa startRequest()
diff --git a/src/feedback/feedback.pro b/src/feedback/feedback.pro
index 0728184caa..50d362310b 100644
--- a/src/feedback/feedback.pro
+++ b/src/feedback/feedback.pro
@@ -1,6 +1,9 @@
 # #####################################################################
 # Feedback Mobility API
 # #####################################################################
+
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 
 QT = core
@@ -29,12 +32,12 @@ symbian {
         -TCB
 
     # UID
-    TARGET.UID3 = 0x2002BFCE
+    TARGET.UID3 = $$mobilityUID(0x2002BFCE)
 
     LIBS += -lefsrv
 
     # Main library
-    FEEDBACK_DEPLOYMENT.sources = QtFeedback.dll
+    FEEDBACK_DEPLOYMENT.sources = QtFeedback$${QT_LIBINFIX}.dll
     FEEDBACK_DEPLOYMENT.path = /sys/bin
     DEPLOYMENT += FEEDBACK_DEPLOYMENT
     deploy.path = $$EPOCROOT
diff --git a/src/gallery/gallery.pro b/src/gallery/gallery.pro
index bff690ff40..12e0dc1b3f 100644
--- a/src/gallery/gallery.pro
+++ b/src/gallery/gallery.pro
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 
 TARGET = QtGallery
@@ -67,10 +69,10 @@ HEADERS = $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 
 symbian {
     load(data_caging_paths)
-    QtGalleryDeployment.sources = QtGallery.dll
+    QtGalleryDeployment.sources = QtGallery$${QT_LIBINFIX}.dll
     QtGalleryDeployment.path = /sys/bin
     DEPLOYMENT += QtGalleryDeployment
-    TARGET.UID3=0x2002BFCB
+    TARGET.UID3 = $$mobilityUID(0x2002BFCB)
     TARGET.CAPABILITY = ALL -TCB
 }
 
diff --git a/src/gallery/symbian/qgallerymdsutility.cpp b/src/gallery/symbian/qgallerymdsutility.cpp
index fe832a81f3..69cc5727ca 100644
--- a/src/gallery/symbian/qgallerymdsutility.cpp
+++ b/src/gallery/symbian/qgallerymdsutility.cpp
@@ -1657,7 +1657,11 @@ CMdEPropertyDef *QDocumentGalleryMDSUtility::GetMDSPropertyDefL( const QString &
 CMdEPropertyDef *QDocumentGalleryMDSUtility::GetMDSPropertyDefForMDS25L( const QString &property,
     CMdENamespaceDef& defaultNameSpace )
 {
-    if (property == QDocumentGallery::fileSize.name()) {
+    if (property == QDocumentGallery::artist.name()) {
+        CMdEObjectDef& def = defaultNameSpace.GetObjectDefL( MdeConstants::MediaObject::KMediaObject );
+        CMdEPropertyDef& propDef = def.GetPropertyDefL( MdeConstants::MediaObject::KArtistProperty );
+        return &propDef;
+    } else if (property == QDocumentGallery::fileSize.name()) {
         CMdEObjectDef& def = defaultNameSpace.GetObjectDefL( MdeConstants::Object::KBaseObject );
         CMdEPropertyDef& propDef = def.GetPropertyDefL( MdeConstants::Object::KSizeProperty );
         return &propDef;
diff --git a/src/location/location.pro b/src/location/location.pro
index 5274bbc46f..22421fd053 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -1,6 +1,8 @@
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 TARGET = QtLocation
-QT = core gui network sql
+QT = core gui network sql declarative
 
 include(../../common.pri)
 
@@ -19,10 +21,13 @@ contains(proj_enabled, yes) {
   include($$PWD/../3rdparty/proj.pri)
 }
 
+location_fix_enabled = no
+
 contains(location_fix_enabled, yes) {
-    DEFINES += LOCATION_FIX_QTM_1550
+	DEFINES += LOCATION_FIX_QTM_1550
 }
 
+
 PUBLIC_HEADERS += \
                     qgeoaddress.h \
                     qgeoareamonitor.h \
@@ -74,6 +79,7 @@ symbian {
                        qgeopositioninfosource_symbian_p.h
     }
 
+
     SOURCES += qgeopositioninfosource_s60.cpp \
                qgeosatelliteinfosource_s60.cpp \
                qmlbackendao_s60.cpp
@@ -96,6 +102,7 @@ symbian {
     }
 }
 
+
 wince* {
     PRIVATE_HEADERS += qgeopositioninfosource_wince_p.h \
                        qgeosatelliteinfosource_wince_p.h \
@@ -179,25 +186,28 @@ SOURCES += \
             qnmeapositioninfosource.cpp \
             qgeoareamonitor_polling.cpp \
             projwrapper_p.cpp \
-            qgeopositioninfosourcefactory.cpp
+            qgeopositioninfosourcefactory.cpp \
+            qlocationnetworkaccessmanagerfactory.cpp
 
 symbian {
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x2002AC83
+    TARGET.UID3 = $$mobilityUID(0x2002AC83)
 
     INCLUDEPATH += $${EPOCROOT}epoc32/include/osextensions \
                    $${EPOCROOT}epoc32/include/lbtheaders \
                    $${EPOCROOT}epoc32/include/platform
     LIBS += -llbs
     LIBS += -lefsrv
-    contains(location_fix_enabled, yes) {
-        LIBS += -leposmodset
-    }
+    
+   contains(location_fix_enabled, yes) {
+    LIBS += -leposmodset
+   }
+
     contains(lbt_enabled, yes) {
         LIBS += -llbt
     }
 
-    QtLocationDeployment.sources = QtLocation.dll
+    QtLocationDeployment.sources = QtLocation$${QT_LIBINFIX}.dll
     QtLocationDeployment.path = /sys/bin
     DEPLOYMENT += QtLocationDeployment
 }
diff --git a/src/location/maps/qgraphicsgeomap.cpp b/src/location/maps/qgraphicsgeomap.cpp
index 2452317fec..d86c760089 100644
--- a/src/location/maps/qgraphicsgeomap.cpp
+++ b/src/location/maps/qgraphicsgeomap.cpp
@@ -256,8 +256,13 @@ QPainterPath QGraphicsGeoMap::shape() const
 */
 void QGraphicsGeoMap::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *)
 {
-    if (d_ptr->mapData)
+    if (d_ptr->mapData) {
+        painter->save();
+        painter->setViewport(pos().x(), pos().y(), size().width(), size().height());
+        painter->setWindow(pos().x(), pos().y(), size().width(), size().height());
         d_ptr->mapData->paint(painter, option);
+        painter->restore();
+    }
 }
 
 void QGraphicsGeoMap::updateMapDisplay(const QRectF &target)
diff --git a/src/location/maps/tiled/qgeotiledmapdata.cpp b/src/location/maps/tiled/qgeotiledmapdata.cpp
index b892b47e0c..ae3b637aa3 100644
--- a/src/location/maps/tiled/qgeotiledmapdata.cpp
+++ b/src/location/maps/tiled/qgeotiledmapdata.cpp
@@ -158,9 +158,13 @@ QGeoTiledMapData::~QGeoTiledMapData()
 
 QPointF QGeoTiledMapDataPrivate::coordinateToScreenPosition(double lon, double lat) const
 {
+    Q_Q(const QGeoTiledMapData);
     QPointF offset = windowOffset();
 
-    QPoint pos(coordinateToWorldReferencePosition(lon, lat));
+    QGeoCoordinate coordinate;
+    coordinate.setLatitude(lat);
+    coordinate.setLongitude(lon);
+    QPoint pos(q->coordinateToWorldReferencePosition(coordinate));
 
     const int x = pos.x() - worldReferenceViewportRect.left();
 //    if (x < 0)
diff --git a/src/location/qgeopositioninfosource_s60.cpp b/src/location/qgeopositioninfosource_s60.cpp
index ce0fdb6093..d0360754c4 100644
--- a/src/location/qgeopositioninfosource_s60.cpp
+++ b/src/location/qgeopositioninfosource_s60.cpp
@@ -68,26 +68,34 @@ CQGeoPositionInfoSourceS60::CQGeoPositionInfoSourceS60(QObject* aParent) : QGeoP
         mModuleFlags(0)
 {
     memset(mList, 0 , MAX_SIZE * sizeof(CPosMethodInfo));
+#if !defined QT_NO_DEBUG
+    qDebug() << "CQGeoPositionInfoSourceS60::CQGeoPositionInfoSourceS60\n" ;
+#endif
 }
 
 // destructor
 CQGeoPositionInfoSourceS60::~CQGeoPositionInfoSourceS60()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::~CQGeoPositionInfoSourceS60\n" ;
+#endif
+
     if (mReqUpdateAO)
         delete mReqUpdateAO;
-
+    	
     if (mRegUpdateAO)
         delete mRegUpdateAO;
 
     if (mDevStatusUpdateAO)
         delete mDevStatusUpdateAO;
-
-
 }
 
 // static function NewLC
 CQGeoPositionInfoSourceS60* CQGeoPositionInfoSourceS60::NewLC(QObject* aParent)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::NewLC\n" ;
+#endif
     CQGeoPositionInfoSourceS60* self =
         new(ELeave) CQGeoPositionInfoSourceS60(aParent);
     CleanupStack::PushL(self);
@@ -98,6 +106,9 @@ CQGeoPositionInfoSourceS60* CQGeoPositionInfoSourceS60::NewLC(QObject* aParent)
 // static function NewL
 CQGeoPositionInfoSourceS60* CQGeoPositionInfoSourceS60::NewL(QObject * aParent)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::NewL\n" ;
+#endif
     RProcess thisProcess;
     if (!thisProcess.HasCapability(ECapabilityLocation)) {
         qWarning() << "QGeoPositionInfoSource::createDefaultSource() requires the Symbian Location capability to succeed on the Symbian platform.";
@@ -121,40 +132,34 @@ CQGeoPositionInfoSourceS60* CQGeoPositionInfoSourceS60::NewL(QObject * aParent)
 // 2nd phase constructor
 void CQGeoPositionInfoSourceS60::ConstructL()
 {
-    TInt error = mPositionServer.Connect();
-
-    if (error == KErrNone) {
-        CleanupClosePushL(mPositionServer);
-
-        mDevStatusUpdateAO = CQMLBackendAO::NewL(this, DeviceStatus);
-
-        if (mDevStatusUpdateAO == NULL) {
-            CleanupStack::Pop(1);
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfobuffSourceS60::ConstructL\n" ;
+#endif
+    User::LeaveIfError(mPositionServer.Connect());
+    CleanupClosePushL(mPositionServer);
 
-            return;
-        }
+    mDevStatusUpdateAO = CQMLBackendAO::NewL(this, DeviceStatus);
+    CleanupStack::Pop(&mPositionServer);  // mDevStatusUpdateAO will close handle
 
-        //update the list array with the available method initially
-        updateDeviceStatus();
+    //update the list array with the available method initially
+    updateDeviceStatus();
 
-        // Set the PreferredPositioningMethods based on Supported methods
-        QGeoPositionInfoSource::setPreferredPositioningMethods(mSupportedMethods);
+    // Set the PreferredPositioningMethods based on Supported methods
+    QGeoPositionInfoSource::setPreferredPositioningMethods(mSupportedMethods);
 
-        //devStatusUpdateAO->NotifyDeviceStatus(mStatusEvent);
+    if (mCurrentModuleId != TUid::Null()) {
+        qDebug() << "CQGeoPositionInfoSourceS60::ConstructL";
 
-        CleanupStack::PushL(mDevStatusUpdateAO);
-
-        if (mCurrentModuleId != TUid::Null()) {
-            mRegUpdateAO = CQMLBackendAO::NewL(this, RegularUpdate, mCurrentModuleId);
-            mRegUpdateAO->setUpdateInterval(updateInterval());
-        }
-        CleanupStack::Pop(2);
+        mRegUpdateAO = CQMLBackendAO::NewL(this, RegularUpdate, mCurrentModuleId);
+        mRegUpdateAO->setUpdateInterval(updateInterval());
     }
-
 }
 
 QGeoPositionInfo CQGeoPositionInfoSourceS60::lastKnownPosition(bool aFromSatellitePositioningMethodsOnly) const
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::lastKnownPosition\n" ;
+#endif
 
     QGeoPositionInfo posUpdate;
     TPosition pos;
@@ -222,6 +227,10 @@ QGeoPositionInfo CQGeoPositionInfoSourceS60::lastKnownPosition(bool aFromSatelli
 //
 int CQGeoPositionInfoSourceS60::minimumUpdateInterval() const
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::minimumUpdateInterval\n" ;
+#endif
+	
     if (mCurrentModuleId == TUid::Null())
         return 0;
 
@@ -233,8 +242,12 @@ int CQGeoPositionInfoSourceS60::minimumUpdateInterval() const
 //private function : to derive the supported positioning methods
 void CQGeoPositionInfoSourceS60::updateAvailableTypes()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::updateAvailableTypes\n" ;
+#endif
     PositioningMethods types;
 
+
     for (TInt i = 0; i < mListSize ; i++) {
         //check only for the available module without any device errors
         if (mList[i].mIsAvailable &&
@@ -256,6 +269,9 @@ void CQGeoPositionInfoSourceS60::updateAvailableTypes()
 //private function : to retrieve the index of the supplied module id from the mList array
 TInt CQGeoPositionInfoSourceS60::checkModule(TPositionModuleId aId)//const
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::checkModule\n" ;
+#endif
 
     TInt i;
     for (i = 0; i < mListSize; i++)
@@ -270,6 +286,10 @@ TInt CQGeoPositionInfoSourceS60::checkModule(TPositionModuleId aId)//const
 //available,else returns the index of the default module
 TInt CQGeoPositionInfoSourceS60::getIndexPositionModule(TUint8 aBits, PositioningMethods aPosMethods) const
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::getIndexPositionModule\n" ;
+#endif
+	
     TInt index, error;
 
     TPositionModuleId modID;
@@ -308,6 +328,10 @@ TInt CQGeoPositionInfoSourceS60::getIndexPositionModule(TUint8 aBits, Positionin
 //lesser than timeout
 TInt CQGeoPositionInfoSourceS60::getMoreAccurateMethod(TInt aTimeout, TUint8 aBits)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::getMoreAccurateMethod\n" ;
+#endif
+	
     TInt index = -1;
     double temp = -1.0;
     PositioningMethods posMethods;
@@ -331,6 +355,9 @@ TInt CQGeoPositionInfoSourceS60::getMoreAccurateMethod(TInt aTimeout, TUint8 aBi
             }
         }
     }
+#if !defined QT_NO_DEBUG
+    qDebug() << index ;
+#endif
 
     if (index != -1) {
         return index;
@@ -352,13 +379,19 @@ TInt CQGeoPositionInfoSourceS60::getMoreAccurateMethod(TInt aTimeout, TUint8 aBi
             }
         }
     }
-
+#if !defined QT_NO_DEBUG
+		qDebug() << "getMoreAccurateMethod time to first fix\n" ;
+		qDebug() << index ;
+#endif
     return index;
 }
 
 //private function : to update the mList array
 void CQGeoPositionInfoSourceS60::updateStatus(TPositionModuleInfo &aModInfo, TInt aStatus)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::updateStatus\n" ;
+#endif
 
     TInt i, index;
     TPositionModuleId id;
@@ -465,6 +498,10 @@ void CQGeoPositionInfoSourceS60::updateStatus(TPositionModuleInfo &aModInfo, TIn
                 (aStatus != TPositionModuleStatus::EDeviceUnknown) &&
                 (aStatus != TPositionModuleStatus::EDeviceError)) {
             TInt interval;
+            
+#if !defined QT_NO_DEBUG
+            qDebug() << "CQGeoPositionInfoSourceS60::updateStatus" ;
+#endif
 
             interval = QGeoPositionInfoSource::updateInterval();
 
@@ -536,7 +573,9 @@ void CQGeoPositionInfoSourceS60::updateStatus(TPositionModuleInfo &aModInfo, TIn
                         bits = bits & (0XFF ^(1 << index));
                     }
                 } while (index >= 0);
-
+#if !defined QT_NO_DEBUG
+                qDebug() << "CQGeoPositionInfoSourceS60::updateStatus regular/rqst changed"  ;
+#endif
 
                 if (temp != NULL) {
                     //successful in creating the subsession for the required
@@ -598,9 +637,17 @@ void CQGeoPositionInfoSourceS60::updateStatus(TPositionModuleInfo &aModInfo, TIn
 // Notification methods from active object. Notifies device status changes
 void CQGeoPositionInfoSourceS60::updateDeviceStatus(void)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::updateDeviceStatus\n" ;
+#endif
+
     TPositionModuleStatus moduleStatus;
     TPositionModuleInfo moduleInfo;
     TInt error;
+ 
+#if !defined QT_NO_DEBUG   
+    qDebug() << "CQGeoPositionInfoSourceS60::updateDeviceStatus";
+#endif
 
     //mListSize = 0 : called updateDeviceStatus() first time to initialise the array
     if (mListSize == 0) {
@@ -613,7 +660,7 @@ void CQGeoPositionInfoSourceS60::updateDeviceStatus(void)
         error = mPositionServer.GetDefaultModuleId(mCurrentModuleId);
 
         if (error != KErrNone)
-            mCurrentModuleId = TUid::Null();
+            mCurrentModuleId = TUid::Null();            	 
 
         for (TUint i = 0; i < modCount; i++) {
             //get module information
@@ -628,8 +675,9 @@ void CQGeoPositionInfoSourceS60::updateDeviceStatus(void)
             mModuleFlags |= (1 << i);
         }
     } else {
+    	   		
         //UpdateDeviceStatus() called after registering for NotifyModuleStatusEvent
-
+				
         //get the module id from the status event
         TPositionModuleId id = mStatusEvent.ModuleId();
 
@@ -641,8 +689,7 @@ void CQGeoPositionInfoSourceS60::updateDeviceStatus(void)
 
         //update the properties of the module in the mList array
         updateStatus(moduleInfo, moduleStatus.DeviceStatus());
-
-
+        
     }
 
     //register for next NotifyModuleStatusEvent
@@ -657,6 +704,10 @@ void CQGeoPositionInfoSourceS60::TPositionInfo2QGeoPositionInfo(
     TPosition pos;
     QGeoCoordinate  coord;
     float val;
+ 
+#if !defined QT_NO_DEBUG   
+    qDebug() << "CQGeoPositionInfoSourceS60::TPositionInfo2QGeoPositionInfo\n" ;
+#endif
 
     aPosInfo1->GetPosition(pos);
 
@@ -711,34 +762,57 @@ void CQGeoPositionInfoSourceS60::TPositionInfo2QGeoPositionInfo(
 void CQGeoPositionInfoSourceS60::updatePosition(HPositionGenericInfo *aPosInfo, int aError)
 {
     QGeoPositionInfo  posInfo;
-
+  
+#if !defined QT_NO_DEBUG  
+    qDebug() << "CQGeoPositionInfoSourceS60::updatePosition\n" ;
+#endif
+    
     if (aError == KErrNone && aPosInfo) {
         //fill posUpdate
         TPositionInfo2QGeoPositionInfo(aPosInfo, posInfo);
 
-        mRegularUpdateTimedOut = false;
+        mRegularUpdateTimedOut = false;    
 
         //emit posUpdate
         emit positionUpdated(posInfo);
+#if !defined QT_NO_DEBUG
+        qDebug() << "CQGeoPositionInfoSourceS60::updatePosition position updated\n" ;
+#endif
+                
     } else if (aError == KErrTimedOut) {
-        //request has timed out
-        if (mStartUpdates) {
-            if (!mRegularUpdateTimedOut) {
-                mRegularUpdateTimedOut = true;
-                emit updateTimeout();
-            }
-        } else {
-            emit updateTimeout();
-        }
-    } else {
+    	
+	        //request has timed out
+	        if (mStartUpdates) {
+	            if (!mRegularUpdateTimedOut) {
+	                mRegularUpdateTimedOut = true;
+	                emit updateTimeout();
+	            }
+	        } else {
+	            emit updateTimeout();
+	        }
+
+#if !defined QT_NO_DEBUG
+	        qDebug() << "CQGeoPositionInfoSourceS60::updatePosition position timeout\n" ;
+#endif
+	        
+    } else {    	
         //posiitoning module is unable to return any position information
-        emit updateTimeout();
+        	emit updateTimeout();
+
+
+#if !defined QT_NO_DEBUG
+        	qDebug() << "CQGeoPositionInfoSourceS60::updatePosition position timeout\n" ;
+#endif
     }
 }
 
 // Returns the PositionServer handle
 RPositionServer& CQGeoPositionInfoSourceS60:: getPositionServer()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::getPositionServer\n" ;
+#endif
+	
     return mPositionServer;
 }
 
@@ -748,6 +822,10 @@ void CQGeoPositionInfoSourceS60::requestUpdate(int aTimeout)
 {
     TInt index = -1;
     TUint8 bits;
+    
+#if !defined QT_NO_DEBUG
+    qDebug() << "CQGeoPositionInfoSourceS60::requestUpdate\n" ;
+#endif
 
     CQMLBackendAO *temp = NULL;
 
@@ -767,6 +845,7 @@ void CQGeoPositionInfoSourceS60::requestUpdate(int aTimeout)
 
     if (aTimeout == 0)
         aTimeout = 20000;
+        
 
     bits = mModuleFlags;
 
@@ -784,6 +863,10 @@ void CQGeoPositionInfoSourceS60::requestUpdate(int aTimeout)
         if (mList[index].mUid == mReqModuleId) {
             if (mReqUpdateAO) {
                 mReqUpdateAO->requestUpdate(aTimeout);
+#if !defined QT_NO_DEBUG
+                qDebug() << "CQGeoPositionInfoSourceS60::requestUpdate mReqUpdateAO\n" ;
+                qDebug() << index ;
+#endif
                 return;
             }
         }
@@ -804,6 +887,10 @@ void CQGeoPositionInfoSourceS60::requestUpdate(int aTimeout)
 
             //start the update
             mReqUpdateAO->requestUpdate(aTimeout);
+#if !defined QT_NO_DEBUG
+            qDebug() << "CQGeoPositionInfoSourceS60::requestUpdate mReqUpdateAO\n" ;
+            qDebug() << index ;
+#endif
 
             return;
         }
@@ -826,6 +913,9 @@ void CQGeoPositionInfoSourceS60::requestUpdate(int aTimeout)
 // starts the regular updates
 void CQGeoPositionInfoSourceS60::startUpdates()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::startUpdates\n" ;
+#endif
     //SetUpdateInterval if it is not already set from application
     if (!mUpdateIntervalSet)
         setUpdateInterval(1000);
@@ -839,12 +929,16 @@ void CQGeoPositionInfoSourceS60::startUpdates()
         mRegUpdateAO->startUpdates();
     mRegularUpdateTimedOut = false;
     mStartUpdates = true;
+       
 }
 
 // stops the regular updates
 void CQGeoPositionInfoSourceS60::stopUpdates()
 {
     mStartUpdates = false;
+#if !defined QT_NO_DEBUG   
+    qDebug() << "CQGeoPositionInfoSourceS60::stopUpdates\n" ;
+#endif
 
     if (mRegUpdateAO == NULL || mCurrentModuleId == TUid::Null()) {
         emit updateTimeout();
@@ -852,11 +946,17 @@ void CQGeoPositionInfoSourceS60::stopUpdates()
     }
 
     mRegUpdateAO->cancelUpdate();
+#if !defined QT_NO_DEBUG  
+    qDebug() << "CQGeoPositionInfoSourceS60::stopUpdates backup update cancelled\n" ;
+#endif    
+    
 }
 
 void CQGeoPositionInfoSourceS60::setPreferredPositioningMethods(PositioningMethods aMethods)
 {
-
+#if !defined QT_NO_DEBUG
+		qDebug() << "CQGeoPositionInfoSourceS60::setPreferredPositioningMethods\n" ;
+#endif
 
     QGeoPositionInfoSource::setPreferredPositioningMethods(aMethods);
 
@@ -931,7 +1031,9 @@ void CQGeoPositionInfoSourceS60::setPreferredPositioningMethods(PositioningMetho
 
 void CQGeoPositionInfoSourceS60::setUpdateInterval(int aMilliSec)
 {
-
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::setUpdateInterval\n" ;
+#endif
 
     if (mRegUpdateAO) {
         int interval = mRegUpdateAO->setUpdateInterval(aMilliSec);
@@ -945,6 +1047,9 @@ void CQGeoPositionInfoSourceS60::setUpdateInterval(int aMilliSec)
 
 void CQGeoPositionInfoSourceS60::connectNotify(const char *aSignal)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::connectNotify\n" ;
+#endif
     // start update if it already connected
     if (mStartUpdates && mRegUpdateAO && QLatin1String(aSignal) == SIGNAL(positionUpdated(QGeoPositionInfo)))
         mRegUpdateAO->startUpdates();
@@ -953,6 +1058,9 @@ void CQGeoPositionInfoSourceS60::connectNotify(const char *aSignal)
 
 void CQGeoPositionInfoSourceS60::disconnectNotify(const char *aSignal)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQGeoPositionInfoSourceS60::disconnectNotify\n" ;
+#endif
     // Cancel updates if slot is disconnected for the positionUpdate() signal.
 
     if ((mRegUpdateAO) && (QLatin1String(aSignal) == SIGNAL(positionUpdated(QGeoPositionInfo))) && receivers(SIGNAL(positionUpdated(QGeoPositionInfo))) == 0)
diff --git a/src/location/qgeopositioninfosource_s60_p.h b/src/location/qgeopositioninfosource_s60_p.h
index 5d1639ef59..16b9da60b8 100644
--- a/src/location/qgeopositioninfosource_s60_p.h
+++ b/src/location/qgeopositioninfosource_s60_p.h
@@ -102,6 +102,7 @@ class CQGeoPositionInfoSourceS60 : public INotificationCallback,
         public QGeoPositionInfoSource
 
 {
+	
 public:
     // Constructors and destructor
     /**
@@ -196,7 +197,6 @@ public slots :
     // stops the regular updates
     virtual void stopUpdates();
 
-
 private:
 
     /**
diff --git a/src/location/qlocationnetworkaccessmanagerfactory.cpp b/src/location/qlocationnetworkaccessmanagerfactory.cpp
new file mode 100644
index 0000000000..d214ef714b
--- /dev/null
+++ b/src/location/qlocationnetworkaccessmanagerfactory.cpp
@@ -0,0 +1,78 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "qlocationnetworkaccessmanagerfactory.h"
+
+#include <QNetworkAccessManager>
+#include <QDeclarativeNetworkAccessManagerFactory>
+
+QTM_BEGIN_NAMESPACE
+
+QLocationNetworkAccessManagerFactory* QLocationNetworkAccessManagerFactory::m_instance = NULL;
+
+QLocationNetworkAccessManagerFactory::QLocationNetworkAccessManagerFactory() :
+        m_factory(NULL)
+{
+}
+
+QLocationNetworkAccessManagerFactory
+*QLocationNetworkAccessManagerFactory::instance()
+{
+    if (!m_instance)
+        m_instance = new QLocationNetworkAccessManagerFactory();
+    return m_instance;
+}
+
+void QLocationNetworkAccessManagerFactory::setDeclarativeFactory(
+        QDeclarativeNetworkAccessManagerFactory *factory)
+{
+    m_factory = factory;
+}
+
+QNetworkAccessManager *QLocationNetworkAccessManagerFactory::create(QObject *parent)
+{
+    if (m_factory)
+        return m_factory->create(parent);
+    else
+        return new QNetworkAccessManager(parent);
+}
+
+QTM_END_NAMESPACE
diff --git a/src/location/qlocationnetworkaccessmanagerfactory.h b/src/location/qlocationnetworkaccessmanagerfactory.h
new file mode 100644
index 0000000000..39cf108946
--- /dev/null
+++ b/src/location/qlocationnetworkaccessmanagerfactory.h
@@ -0,0 +1,71 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QLOCATIONNETWORKACCESSMANAGERFACTORY_H
+#define QLOCATIONNETWORKACCESSMANAGERFACTORY_H
+
+#include "qmobilityglobal.h"
+
+class QObject;
+class QNetworkAccessManager;
+class QDeclarativeNetworkAccessManagerFactory;
+
+QTM_BEGIN_NAMESPACE
+
+class Q_LOCATION_EXPORT QLocationNetworkAccessManagerFactory
+{
+public:
+    static QLocationNetworkAccessManagerFactory *instance();
+
+    QNetworkAccessManager *create(QObject *parent);
+
+    void setDeclarativeFactory(QDeclarativeNetworkAccessManagerFactory *factory);
+
+private:
+    QLocationNetworkAccessManagerFactory();
+
+    static QLocationNetworkAccessManagerFactory* m_instance;
+    QDeclarativeNetworkAccessManagerFactory *m_factory;
+};
+
+QTM_END_NAMESPACE
+
+#endif
diff --git a/src/location/qmlTimer.cpp b/src/location/qmlTimer.cpp
new file mode 100644
index 0000000000..0ea2564438
--- /dev/null
+++ b/src/location/qmlTimer.cpp
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "qgeopositioninfosource_s60_p.h"
+#include "qmlbackendao_s60_p.h"
+#include <QDebug>
+#include "qmltimer.h"
+
+QTM_BEGIN_NAMESPACE
+
+CQMLTimer::~CQMLTimer()
+{
+}
+
+CQMLTimer::CQMLTimer():
+CTimer(CActive::EPriorityStandard),
+mOperatingState(INITIAL)
+{
+}
+
+CQMLTimer* CQMLTimer::NewL(QObject *aRequester)
+{
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLTimer::NewL\n" ;
+#endif
+	CQMLTimer* self = CQMLTimer::NewLC(aRequester);
+	CleanupStack::Pop(); // self;
+  return self;
+}
+
+CQMLTimer* CQMLTimer::NewLC(QObject *aRequester)
+{
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLTimer::NewLC\n" ;
+#endif
+ 	CQMLTimer* self = new(ELeave) CQMLTimer();
+  CleanupStack::PushL(self);
+  self->ConstructL(aRequester);
+  return self;
+}
+
+void CQMLTimer::ConstructL(QObject *aRequester)
+{
+	CTimer::ConstructL();
+	CActiveScheduler::Add(this);
+	mRequester = static_cast<CQGeoPositionInfoSourceS60*>(aRequester);
+	mIsTimerOn = false;
+	mTimerStopped = true;
+}
+   
+void CQMLTimer::RunL()
+{
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLTimer::RunL \n";
+#endif
+
+	if (mIsTimerOn){
+		
+		mTimerStopped = false;
+		
+		// states for timer operation 
+		switch (mOperatingState){
+			case CQMLTimer::HYBRID_RUNNING:
+			{
+				if (!mRequester->isUpdates()){
+					CTimer::After(UPDATE_TIMER);
+					
+	#if !defined QT_NO_DEBUG
+			qDebug() << "Backup updates is on \n";
+	#endif				
+				}
+				break;
+			}
+			case CQMLTimer::HYBRID_STOPPED:
+			{
+				CTimer::After(UPDATE_TIMER);
+				break;
+			}
+			case CQMLTimer::HYBRID_RESTART:
+			{
+				mRequester->startBackupUpdate();
+				break;
+			}
+			case CQMLTimer::INITIAL:
+			default:
+				break;
+		}
+	}else{
+		// timer timesout and automatically stopped and not restarted
+		mTimerStopped = true;
+	}
+}
+    
+void CQMLTimer::DoCancel()
+{
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLTimer::DoCancel \n";
+#endif
+	// cancel is called during final exit
+	CTimer::Cancel();
+	mOperatingState = CQMLTimer::INITIAL;
+}
+
+bool CQMLTimer::StartTimer()
+{
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLTimer::StartTimer \n";
+#endif
+	CTimer::After(UPDATE_TIMER);
+	mIsTimerOn = true;	
+	mTimerStopped = false;
+}
+
+void CQMLTimer::StopTimer()
+{
+		mIsTimerOn = false;	
+}
+
+void CQMLTimer::setTrackState(int nTrackState)
+{
+	// set the state of the timer operation
+	mOperatingState = nTrackState;
+}
+
+//
+TInt CQMLTimer::RunError(TInt aError)
+{
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::RunError\n" ;
+#endif
+    return aError;
+}
+
+QTM_END_NAMESPACE
+
diff --git a/src/location/qmlTimer.h b/src/location/qmlTimer.h
new file mode 100644
index 0000000000..e78e831e2d
--- /dev/null
+++ b/src/location/qmlTimer.h
@@ -0,0 +1,130 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QMLTIMER_H
+#define QMLTIMER_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+#include <e32base.h>    // For CActive, link against: euser.lib
+#include <lbs.h>
+#include <lbscommon.h>
+
+QTM_BEGIN_NAMESPACE
+
+#define UPDATE_TIMER 5000000
+
+class CQGeoPositionInfoSourceS60;
+
+class CQMLTimer : public CTimer
+{
+public:
+	
+		enum OPERATING_STATE{
+			INITIAL,
+			HYBRID_RUNNING,
+			HYBRID_STOPPED,
+			HYBRID_RESTART
+		};
+	
+    // Cancel and destroy
+    ~CQMLTimer();
+
+    // Two-phased constructor.
+    static CQMLTimer* NewL(QObject *aRequester);
+
+    // Two-phased constructor.
+    static CQMLTimer* NewLC(QObject *aRequester);
+    
+    bool StartTimer(); 
+    
+    void StopTimer();
+    
+    bool isTimerStopped(){
+    	return mTimerStopped;
+    };
+    
+    void setTrackState(int nTrackState);
+    
+    int getTrackState(){
+    	return mOperatingState;
+    }
+    
+private:
+    // From CActive
+    // Handle completion
+    void RunL();
+
+    // How to cancel me
+    void DoCancel();
+
+    // Override to handle leaves from RunL(). Default implementation causes
+    // the active scheduler to panic.
+    int RunError(int aError);
+    
+ 
+private:
+		CQMLTimer();
+		void ConstructL(QObject *aRequester);
+          
+private:
+	 // Request is a device or a regular
+    CQGeoPositionInfoSourceS60 *mRequester;
+    
+    int	mOperatingState;
+    
+  	bool mIsTimerOn;
+  	
+  	bool mTimerStopped;
+     
+};
+
+QTM_END_NAMESPACE
+
+#endif // QMLTimer_H
diff --git a/src/location/qmlbackendao_s60.cpp b/src/location/qmlbackendao_s60.cpp
index 876e5465c3..bb78e82abb 100644
--- a/src/location/qmlbackendao_s60.cpp
+++ b/src/location/qmlbackendao_s60.cpp
@@ -42,6 +42,7 @@
 #include "qgeopositioninfosource_s60_p.h"
 #include "qgeosatelliteinfosource_s60_p.h"
 #include "qmlbackendao_s60_p.h"
+#include <QDebug>
 
 QTM_BEGIN_NAMESPACE
 
@@ -56,6 +57,9 @@ CQMLBackendAO::CQMLBackendAO() :
         mRequesterSatellite(NULL),
         mRequestType(RequestType(0))
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::CQMLBackendAO\n" ;
+#endif
 }
 
 //
@@ -64,6 +68,9 @@ CQMLBackendAO::CQMLBackendAO() :
 CQMLBackendAO* CQMLBackendAO::NewLC(QObject *aRequester,
                                     RequestType  aRequestType, TPositionModuleId  aModId)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::NewLC\n" ;
+#endif
     CQMLBackendAO* self = new(ELeave) CQMLBackendAO();
     CleanupStack::PushL(self);
     self->ConstructL(aRequester, aRequestType, aModId);
@@ -76,6 +83,9 @@ CQMLBackendAO* CQMLBackendAO::NewLC(QObject *aRequester,
 CQMLBackendAO* CQMLBackendAO::NewL(QObject *aRequester,
                                    RequestType  aRequestType, TPositionModuleId  aModId)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::NewL\n" ;
+#endif
     CQMLBackendAO* self = CQMLBackendAO::NewLC(aRequester, aRequestType, aModId);
     CleanupStack::Pop(); // self;
     return self;
@@ -87,8 +97,9 @@ CQMLBackendAO* CQMLBackendAO::NewL(QObject *aRequester,
 TInt CQMLBackendAO::ConstructL(QObject *aRequester, RequestType  aRequestType,
                                TPositionModuleId  aModId)
 {
-    TInt error = KErrNone;
-    RPositionServer PosServer;
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::ConstructL\n" ;
+#endif
 
     if (aRequester->inherits("QGeoSatelliteInfoSource"))
         mRequesterSatellite = static_cast<CQGeoSatelliteInfoSourceS60*>(aRequester);
@@ -98,36 +109,38 @@ TInt CQMLBackendAO::ConstructL(QObject *aRequester, RequestType  aRequestType,
     mRequestType = aRequestType;
 
     if ((mRequestType == RegularUpdate) || (mRequestType == OnceUpdate)) {
+
+        RPositionServer PosServer;
+
         if (aRequester->inherits("QGeoSatelliteInfoSource"))
             PosServer = mRequesterSatellite->getPositionServer();
         else
             PosServer = mRequester->getPositionServer();
 
-        error  =  mPositioner.Open(PosServer, aModId);
-
-        if (error != KErrNone)
-            return error;
+#if !defined QT_NO_DEBUG
+        qDebug() << "CQMLBackendAO::ConstructL, mPositioner.Open";
+#endif
+        User::LeaveIfError(mPositioner.Open(PosServer, aModId));
 
-        CleanupClosePushL(mPositioner);
-
-        error = mPositioner.SetRequestor(CRequestor::ERequestorService ,
-                                         CRequestor::EFormatApplication, _L("QTmobility_Location"));
-
-        CleanupStack::Pop(1);
-
-        if (error != KErrNone)
-            return error;
+#if !defined QT_NO_DEBUG
+        qDebug() << "CQMLBackendAO::ConstructL, mPositioner.SetRequestor";
+#endif
+        User::LeaveIfError(mPositioner.SetRequestor(CRequestor::ERequestorService ,
+                CRequestor::EFormatApplication, _L("QTmobility_Location")));
 
     }
 
     CActiveScheduler::Add(this); // Add to scheduler
 
-    return error;
+    return ETrue;
 }
 
 //
 CQMLBackendAO::~CQMLBackendAO()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::CQMLBackendAO\n" ;
+#endif
     Cancel();
 
     if ((mRequestType == OnceUpdate) || (mRequestType == RegularUpdate)) {
@@ -145,18 +158,23 @@ CQMLBackendAO::~CQMLBackendAO()
         RPositionServer posServer;
 
         //done only by the position server Active Object
-        if (mRequester)
+        if (mRequester) {
             posServer = mRequester->getPositionServer();
-        else
+            posServer.Close();
+        }
+        else if(mRequesterSatellite) {
             posServer = mRequesterSatellite->getPositionServer();
-
-        posServer.Close();
+            posServer.Close();
+        }
     }
 }
 
 //
 void CQMLBackendAO::DoCancel()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::DoCancel\n" ;
+#endif
     CancelAll();
 }
 
@@ -164,6 +182,9 @@ void CQMLBackendAO::DoCancel()
 //
 void CQMLBackendAO::RunL()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::RunL\n" ;
+#endif
     switch (mRequestType) {
         case DeviceStatus :
             handleDeviceNotification(iStatus.Int());
@@ -180,6 +201,9 @@ void CQMLBackendAO::RunL()
 //
 TInt CQMLBackendAO::RunError(TInt aError)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::RunError\n" ;
+#endif
     return aError;
 }
 
@@ -187,6 +211,9 @@ TInt CQMLBackendAO::RunError(TInt aError)
 // checks any pending request in activeobject
 bool CQMLBackendAO::isRequestPending()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::isRequestPending\n" ;
+#endif
     if (IsActive())
         return true;
     else
@@ -198,6 +225,9 @@ bool CQMLBackendAO::isRequestPending()
 // Async call to get notifications about device status.
 void CQMLBackendAO::notifyDeviceStatus(TPositionModuleStatusEventBase &aStatusEvent)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::notifyDeviceStatus\n" ;
+#endif
     RPositionServer PosServ;
 
     if (mRequester)
@@ -207,7 +237,7 @@ void CQMLBackendAO::notifyDeviceStatus(TPositionModuleStatusEventBase &aStatusEv
 
     //register for device status events
     TPositionModuleStatusEventBase::TModuleEvent RequestedEvents(
-        TPositionModuleStatusEventBase::EEventDeviceStatus);
+        TPositionModuleStatusEventBase::EEventAll);
 
     aStatusEvent.SetRequestedEvents(RequestedEvents);
 
@@ -219,6 +249,9 @@ void CQMLBackendAO::notifyDeviceStatus(TPositionModuleStatusEventBase &aStatusEv
 
 void CQMLBackendAO::CancelAll()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::CancelAll\n" ;
+#endif
 
     RPositionServer PosServer;
     if (mRequestType == DeviceStatus) {
@@ -237,6 +270,9 @@ void CQMLBackendAO::CancelAll()
 //Initialize the posInfo with appropriate fields
 bool CQMLBackendAO::initializePosInfo()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::initializePosInfo\n" ;
+#endif
     if (!mPosInfo) {
         mPosInfo = HPositionGenericInfo::New();
 
@@ -286,6 +322,9 @@ bool CQMLBackendAO::initializePosInfo()
 //requestUpdate : request for position update once
 void CQMLBackendAO::requestUpdate(int aTimeout)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::requestUpdate\n" ;
+#endif
     TPositionUpdateOptions  aPosOption;
 
     mPositioner.GetUpdateOptions(aPosOption);
@@ -303,6 +342,9 @@ void CQMLBackendAO::requestUpdate(int aTimeout)
 //
 void CQMLBackendAO::cancelUpdate()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::cancelUpdate\n" ;
+#endif
     Cancel();
 
 }
@@ -311,17 +353,22 @@ void CQMLBackendAO::cancelUpdate()
 //
 void CQMLBackendAO::handleDeviceNotification(int aError)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::handleDeviceNotification\n" ;
+#endif
     switch (aError) {
             //NotifyPositionModulestatusEvent successfully completed
         case KErrNone :
 
             //module not found
         case KErrNotFound :
-            if (mRequester)
-                mRequester->updateDeviceStatus();
-            else
-                mRequesterSatellite->updateDeviceStatus();
-            break;
+        if (mRequester) {
+            mRequester->updateDeviceStatus();
+        }
+        else {
+            mRequesterSatellite->updateDeviceStatus();
+        }
+        break;
 
             //request has been successfully cancelled
         case KErrCancel :
@@ -337,20 +384,17 @@ void CQMLBackendAO::handleDeviceNotification(int aError)
 //
 void CQMLBackendAO::handlePosUpdateNotification(int aError)
 {
-
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::handlePosUpdateNotification\n" ;
+#endif
     HPositionGenericInfo *positionInfo = NULL;
 
     TPositionSatelliteInfo satInfo;
     switch (aError) {
             //NotifyPositionUpdate successfully completed
         case KErrNone :
-
-
             //requested information could not be retrieved within the maximum peroid
         case KErrTimedOut:
-
-
-
             if (mRequester) {
                 positionInfo = HPositionGenericInfo::New();
 
@@ -377,24 +421,26 @@ void CQMLBackendAO::handlePosUpdateNotification(int aError)
                 SetActive();
             }
 
-            if (mRequester) {
-                mRequester->updatePosition(positionInfo, aError);
-                delete positionInfo;
-            } else {
-                if ((aError != KErrTimedOut) || (mRequestType != RegularUpdate)) {
-                    mRequesterSatellite->updatePosition(satInfo, aError, (mRequestType == RegularUpdate));
-                }
+        if (mRequester) {
+            mRequester->updatePosition(positionInfo, aError);
+            delete positionInfo;
+        }
+        else {
+            if ((aError != KErrTimedOut) || (mRequestType != RegularUpdate)) {
+                mRequesterSatellite->updatePosition(satInfo, aError, (mRequestType == RegularUpdate));
             }
+        }
 
             break;
 
         default :
-            if (mRequester) {
-                mRequester->updatePosition(positionInfo, aError); // positionInfo will be NULL
-            } else {
-                mRequesterSatellite->updatePosition(satInfo, aError, (mRequestType == RegularUpdate));
-            }
-            break;
+        if (mRequester) {
+            mRequester->updatePosition(positionInfo, aError); // positionInfo will be NULL
+        }
+        else {
+            mRequesterSatellite->updatePosition(satInfo, aError, (mRequestType == RegularUpdate));
+        }
+        break;
 
     }
 }
@@ -405,6 +451,9 @@ void CQMLBackendAO::handlePosUpdateNotification(int aError)
 //////////////////////////////////////////////////////////////
 int CQMLBackendAO::setUpdateInterval(int aMilliSec)
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::setUpdateInterval\n" ;
+#endif
     int minimumUpdateInterval = 0;
     TInt64 mUpdateInterval = 0 ;
 
@@ -461,12 +510,16 @@ int CQMLBackendAO::setUpdateInterval(int aMilliSec)
 
 void CQMLBackendAO::startUpdates()
 {
+#if !defined QT_NO_DEBUG
+	qDebug() << "CQMLBackendAO::startUpdates\n" ;
+#endif
     if (!IsActive()) {
         if (mRequester) {
             initializePosInfo();
             mPositioner.NotifyPositionUpdate(*mPosInfo , iStatus);
-        } else {
-			mPosSatInfo.ClearSatellitesInView();
+        }
+        else {
+            mPosSatInfo.ClearSatellitesInView();
             mPositioner.NotifyPositionUpdate(mPosSatInfo , iStatus);
 		}
 		
diff --git a/src/location/qmlbackendao_s60_p.h b/src/location/qmlbackendao_s60_p.h
index 6152f7b215..a53c446e94 100644
--- a/src/location/qmlbackendao_s60_p.h
+++ b/src/location/qmlbackendao_s60_p.h
@@ -106,8 +106,6 @@ public:
 
     void startUpdates();
 
-
-
 private:
     // C++ constructor
     CQMLBackendAO();
@@ -125,6 +123,8 @@ private:
     void CancelAll();
 
     bool initializePosInfo();
+    
+    
 
 private:
     // From CActive
diff --git a/src/messaging/messaging.pro b/src/messaging/messaging.pro
index f33dd889b9..db13ca1653 100644
--- a/src/messaging/messaging.pro
+++ b/src/messaging/messaging.pro
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 TARGET = QtMessaging
 include(../../common.pri)
@@ -289,8 +291,8 @@ symbian|win32|maemo6|maemo5|mac:!simulator {
             -lecom 
         TARGET.CAPABILITY = ALL \
             -TCB
-        TARGET.UID3 = 0x2002AC82
-        QtMessaging.sources = QtMessaging.dll
+        TARGET.UID3 = $$mobilityUID(0x2002AC82)
+        QtMessaging.sources = QtMessaging$${QT_LIBINFIX}.dll
         QtMessaging.path = /sys/bin
         DEPLOYMENT += QtMessaging
     }
diff --git a/src/messaging/qfsengine_symbian.cpp b/src/messaging/qfsengine_symbian.cpp
index 413660ede0..1b5714a793 100644
--- a/src/messaging/qfsengine_symbian.cpp
+++ b/src/messaging/qfsengine_symbian.cpp
@@ -2367,7 +2367,7 @@ bool CFSEngine::message(QMessage* message, const QMessageId& id) const
     if (err == KErrNone) {
         MEmailMessage* fsMessage = NULL;
         TRAP(err, fsMessage = mailbox->MessageL(messageId));
-        if (err == KErrNone) {
+        if (err == KErrNone && fsMessage) {
             TRAP(err, CreateQMessageL(message, *fsMessage));
             if (err == KErrNone) {
                 retVal = true;
@@ -2412,6 +2412,9 @@ bool CFSEngine::sendEmail(QMessage &message)
 
 void CFSEngine::CreateQMessageL(QMessage* aQMessage, const MEmailMessage& aFSMessage) const
 {
+    if ( !aQMessage ) {
+        User::Leave(KErrArgument);
+    }
     QMessagePrivate* privateMessage = QMessagePrivate::implementation(*aQMessage);
 
     aQMessage->setType(QMessage::Email);
diff --git a/src/messaging/qmessage.cpp b/src/messaging/qmessage.cpp
index f53b962e12..5af913514a 100644
--- a/src/messaging/qmessage.cpp
+++ b/src/messaging/qmessage.cpp
@@ -374,6 +374,8 @@ QList<QByteArray> charsets;
 
     Set the list of cc (carbon copy) recipients for the message to \a ccList.
 
+    On Symbian cc recipient list must not contain more than one element.
+
     \since 1.0
     \sa cc(), setTo(), setBcc()
 */
@@ -392,6 +394,8 @@ QList<QByteArray> charsets;
 
     Set the list of bcc (blind carbon copy) recipients for the message to \a bccList.
 
+    On Symbian bcc recipient list must not contain more than one element.
+
     \since 1.0
     \sa bcc(), setTo(), setCc()
 */
@@ -471,6 +475,9 @@ QList<QByteArray> charsets;
     If the \a mimeType is not specified, the content type will default to "text/plain", and
     the encoding charset will be as determined by preferredCharsets().
 
+    On Symbian platform email messages with HTML body cannot be sent. If HTML content needs
+    to be sent it can be added as attachment.
+
     \since 1.0
     \sa bodyId(), preferredCharsets()
 */
@@ -484,6 +491,9 @@ QList<QByteArray> charsets;
     If the \a mimeType is not specified, the content type will default to "text/plain", and
     the encoding charset will be as determined by preferredCharsets().
 
+    On Symbian platform email messages with HTML body cannot be sent. If HTML content needs
+    to be sent it can be added as attachment.
+
     \since 1.0
     \sa bodyId(), preferredCharsets()
 */
diff --git a/src/messaging/qmessageaccountid.cpp b/src/messaging/qmessageaccountid.cpp
index 3e66e879f5..26f26a7195 100644
--- a/src/messaging/qmessageaccountid.cpp
+++ b/src/messaging/qmessageaccountid.cpp
@@ -140,6 +140,8 @@ bool QMessageAccountId::operator!=(const QMessageAccountId &other) const
 
 /*! \typedef QMessageAccountIdList
 
+    \relates QMessageAccountId
+
     Qt-style synonym for QList<QMessageAccountId>
 */
 
diff --git a/src/messaging/qmessageaddress.cpp b/src/messaging/qmessageaddress.cpp
index 81cd24b83a..6d6cda237c 100644
--- a/src/messaging/qmessageaddress.cpp
+++ b/src/messaging/qmessageaddress.cpp
@@ -234,6 +234,8 @@ void QMessageAddress::parseEmailAddress(const QString &emailAddress, QString *na
 
 /*! \typedef QMessageAddressList
 
+    \relates QMessageAddress
+
     Qt-style synonym for QList<QMessageAddress>
 */
 
diff --git a/src/messaging/qmessagecontentcontainerid.cpp b/src/messaging/qmessagecontentcontainerid.cpp
index 01c33c5860..dc6ec1d86c 100644
--- a/src/messaging/qmessagecontentcontainerid.cpp
+++ b/src/messaging/qmessagecontentcontainerid.cpp
@@ -145,6 +145,8 @@ bool QMessageContentContainerId::operator!=(const QMessageContentContainerId &ot
 
 /*! \typedef QMessageContentContainerIdList
 
+    \relates QMessageContentContainerId
+
     Qt-style synonym for QList<QMessageContentContainerId>
 */
 
diff --git a/src/messaging/qmessageid.cpp b/src/messaging/qmessageid.cpp
index 39f616bbd8..461354f420 100644
--- a/src/messaging/qmessageid.cpp
+++ b/src/messaging/qmessageid.cpp
@@ -143,6 +143,8 @@ bool QMessageId::operator!=(const QMessageId &other) const
 
 /*! \typedef QMessageIdList
 
+    \relates QMessageId
+
     Qt-style synonym for QList<QMessageId>
 */
 
diff --git a/src/messaging/qmessagemanager.cpp b/src/messaging/qmessagemanager.cpp
index d063b3acdd..6fad88c1db 100644
--- a/src/messaging/qmessagemanager.cpp
+++ b/src/messaging/qmessagemanager.cpp
@@ -491,7 +491,7 @@ bool QMessageManager::removeMessages(const QMessageFilter& filter, QMessageManag
 
   Remove account \a id and all associated information (folders, messages etc.)
 
-  On Windows mobile and desktop platforms, Maemo 5, and Symbian prior to SR1.11 this function performs no operation.
+  On Windows mobile and desktop platforms, Maemo 5, and Symbian prior to Belle this function performs no operation.
   \since 1.2
 */
 bool QMessageManager::removeAccount(const QMessageAccountId &id)
@@ -639,8 +639,9 @@ void QMessageManager::unregisterNotificationFilter(NotificationFilterId notifica
     Since the filters apply to the state of the data after the message removal, the only
     data item that may be subject to filtration is the identifier of the removed message.
     
-    On Symbian^3 platform to get signals about removed emails the related mailbox must
-    be manually synchronized.
+    On Symbian^3 platform to get signals about permanent removed emails the related mailbox 
+    must be manually synchronized. Email marked to be deleted, i.e. moved to deleted folder
+    still exists in message store.
 
     \since 1.0
     \sa messageAdded(), messageUpdated(), registerNotificationFilter()
diff --git a/src/messaging/qmessageservice.cpp b/src/messaging/qmessageservice.cpp
index e8ecdc4192..e7173db32c 100644
--- a/src/messaging/qmessageservice.cpp
+++ b/src/messaging/qmessageservice.cpp
@@ -321,7 +321,9 @@ QTM_BEGIN_NAMESPACE
 
     The folder must be in the same account as the message. This will move the message on the external server, as well as locally.
 
-    On Windows mobile and desktop platforms this function is not supported. On Symbian prior to SR1.11 this function is not supported. On Symbian SR1.11 this function is only partially supported.
+    On Windows mobile and desktop platforms this function is not supported. On Symbian prior to Belle this function is not supported.
+    On Symbian Belle POP supports moving messages to drafts folder only and source folder must be either sent or outbox folder in
+    IMAP and POP if target is drafts folder.
 
     Returns true if the operation can be initiated; otherwise returns false.
     \since 1.2
diff --git a/src/messaging/qmessageservice_qmf.cpp b/src/messaging/qmessageservice_qmf.cpp
index e50c68eb7e..a31dd24921 100644
--- a/src/messaging/qmessageservice_qmf.cpp
+++ b/src/messaging/qmessageservice_qmf.cpp
@@ -612,7 +612,7 @@ bool QMessageService::moveMessages(const QMessageIdList &messageIds, const QMess
     d_ptr->_active = 0;
     d_ptr->_error = QMessageManager::NoError;
     d_ptr->_active = &d_ptr->_storage;
-    d_ptr->_storage.moveMessages(convert(messageIds), convert(toFolderId));
+    d_ptr->_storage.onlineMoveMessages(convert(messageIds), convert(toFolderId));
     return true;
 }
 
diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index a6868d31e0..ecd83d4e62 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 
 # distinct from QtMultimedia
@@ -8,7 +10,7 @@ INCLUDEPATH+= .
 
 QT += network
 
-contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2): !symbian {
+contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
    QT += opengl
 } else {
    DEFINES += QT_NO_OPENGL
@@ -189,10 +191,18 @@ maemo6 {
 
 symbian {
     contains(surfaces_s60_enabled, yes) {
-        SOURCES += qgraphicsvideoitem_symbian.cpp
+        SOURCES += qeglimagevideosurface_symbian.cpp \
+                   qgraphicsvideoitem_symbian.cpp
+        HEADERS += qeglimagevideosurface_symbian_p.h
     } else {
         SOURCES += qgraphicsvideoitem_overlay.cpp
     }
+    contains(QT_CONFIG, egl): LIBS *= -llibegl
+    contains(QT_CONFIG, openvg) {
+        LIBS += -llibopenvg
+    } else {
+        DEFINES += QT_NO_OPENVG
+    }
 }
 
 !maemo*:!symbian {
@@ -204,10 +214,10 @@ HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 symbian {
     contains(S60_VERSION, 5.1) |contains (S60_VERSION, 3.2) | contains(S60_VERSION, 3.1): DEFINES += PRE_S60_52_PLATFORM
     load(data_caging_paths)
-    QtMediaDeployment.sources = QtMultimediaKit.dll
+    QtMediaDeployment.sources = QtMultimediaKit$${QT_LIBINFIX}.dll
     QtMediaDeployment.path = /sys/bin
     DEPLOYMENT += QtMediaDeployment
-    TARGET.UID3=0x2002AC77
+    TARGET.UID3 = $$mobilityUID(0x2002AC77)
     TARGET.CAPABILITY = ALL -TCB
     LIBS += -lefsrv
 }
diff --git a/src/multimedia/qeglimagevideosurface_symbian.cpp b/src/multimedia/qeglimagevideosurface_symbian.cpp
new file mode 100644
index 0000000000..4b6a2a3dd1
--- /dev/null
+++ b/src/multimedia/qeglimagevideosurface_symbian.cpp
@@ -0,0 +1,465 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtCore/QDebug>
+#include <QtCore/QVariant>
+#include <QtGui/QPainter>
+#include <qeglimagevideosurface_symbian_p.h>
+#include <qvideosurfaceformat.h>
+
+#ifndef QT_NO_OPENGL
+#include <GLES/glext.h>
+#include <QtOpenGL/QGLShaderProgram>
+#endif
+
+QT_BEGIN_NAMESPACE
+
+//-----------------------------------------------------------------------------
+// QEglImageVideoSurface
+//-----------------------------------------------------------------------------
+
+QEglImageVideoSurface::QEglImageVideoSurface(QObject *parent)
+:   QAbstractVideoSurface(parent)
+,   m_frameIsNew(false)
+,   m_ready(false)
+{
+
+}
+
+QEglImageVideoSurface::~QEglImageVideoSurface()
+{
+    if (isActive())
+        stop();
+}
+
+QList<QVideoFrame::PixelFormat> QEglImageVideoSurface::supportedPixelFormats(QAbstractVideoBuffer::HandleType handleType) const
+{
+    TRACE("QEglImageVideoSurface::supportedPixelFormats" << qtThisPtr()
+          << "handleType" << handleType);
+    return QList<QVideoFrame::PixelFormat>()
+               << QVideoFrame::Format_RGB32
+               << QVideoFrame::Format_ARGB32;
+}
+
+bool QEglImageVideoSurface::start(const QVideoSurfaceFormat &format)
+{
+    TRACE("QEglImageVideoSurface::start" << qtThisPtr());
+    bool result = false;
+    if (isActive())
+        stop();
+    if (format.frameSize().isEmpty())
+        setError(UnsupportedFormatError);
+    else
+        doStart(format);
+    if (error() == QAbstractVideoSurface::NoError) {
+        m_format = format;
+        m_ready = true;
+        result = QAbstractVideoSurface::start(format);
+    } else {
+        QAbstractVideoSurface::stop();
+    }
+    return result;
+}
+
+void QEglImageVideoSurface::stop()
+{
+    TRACE("QEglImageVideoSurface::stop" << qtThisPtr());
+    if (isActive()) {
+        doStop();
+        m_format = QVideoSurfaceFormat();
+        m_frame = QVideoFrame();
+        m_ready = false;
+        QAbstractVideoSurface::stop();
+    }
+}
+
+bool QEglImageVideoSurface::present(const QVideoFrame &frame)
+{
+    VERBOSE_TRACE("QEglImageVideoSurface::present" << qtThisPtr()
+                  << "active" << isActive()
+                  << "ready" << m_ready
+                  << "handleType" << frame.handleType()
+                  << "handle" << frame.handle().value<uint>()
+                  << "frame.isValid" << frame.isValid()
+                  << "format.pixelFormat" << m_format.pixelFormat()
+                  << "format.frameSize" << m_format.frameSize()
+                  << "frame.pixelFormat" << frame.pixelFormat()
+                  << "frame.Size" << frame.size());
+    bool result = false;
+    m_frame = frame;
+    m_frameIsNew = true;
+    if (!m_ready) {
+        if (!isActive())
+            setError(StoppedError);
+    } else if (frame.isValid()
+               && (frame.pixelFormat() != m_format.pixelFormat()
+                   || frame.size() != m_format.frameSize())) {
+        setError(IncorrectFormatError);
+        qWarning() << "QEglImageVideoSurface::present received frame of incorrect format, stopping the surface";
+        stop();
+    } else {
+        m_ready = false;
+        emit frameChanged();
+        result = true;
+    }
+    return result;
+}
+
+void QEglImageVideoSurface::viewportDestroyed()
+{
+    TRACE("QEglImageVideoSurface::viewportDestroyed" << qtThisPtr());
+    onViewportDestroyed();
+    doStop();
+}
+
+void QEglImageVideoSurface::setReady(bool ready)
+{
+    if (m_ready != ready) {
+        VERBOSE_TRACE("QEglImageVideoSurface::setReady" << qtThisPtr()
+                      << "ready" << ready
+                      << "frame.isValid" << m_frame.isValid());
+        m_ready = ready;
+    }
+}
+
+void QEglImageVideoSurface::frameDisplayed()
+{
+    m_frameIsNew = false;
+}
+
+void QEglImageVideoSurface::onViewportDestroyed()
+{
+    // Default implementation does nothing
+}
+
+void QEglImageVideoSurface::doStart(const QVideoSurfaceFormat &format)
+{
+    TRACE("QEglImageVideoSurface::doStart" << qtThisPtr());
+    Q_UNUSED(format)
+    // Default implementation does nothing
+}
+
+
+//-----------------------------------------------------------------------------
+// QEglImageGLVideoSurface
+//-----------------------------------------------------------------------------
+
+#ifndef QT_NO_OPENGL
+
+static const char *qt_QEglImageGLVideoSurface_VertexShaderProgram =
+    "attribute highp vec4 vertexCoordArray;\n"
+    "attribute mediump vec2 textureCoordArray;\n"
+    "uniform highp mat4 positionMatrix;\n"
+    "varying mediump vec2 textureCoord;\n"
+    "void main (void)\n"
+    "{\n"
+    "   gl_Position = positionMatrix * vertexCoordArray;\n"
+    "   textureCoord = textureCoordArray;\n"
+    "}";
+
+static const char* qt_QEglImageGLVideoSurface_FragmentShaderProgram =
+    "uniform sampler2D texRgb;\n"
+    "varying mediump vec2 textureCoord;\n"
+    "void main (void)\n"
+    "{\n"
+    "    gl_FragColor = texture2D(texRgb, textureCoord);\n"
+    "}";
+
+QEglImageGLVideoSurface::QEglImageGLVideoSurface(QObject *parent)
+:   QEglImageVideoSurface(parent)
+,   m_context(const_cast<QGLContext *>(QGLContext::currentContext()))
+{
+    TRACE("QEglImageGLVideoSurface::QEglImageGLVideoSurface" << qtThisPtr());
+    Q_ASSERT(m_context);
+}
+
+QEglImageGLVideoSurface::~QEglImageGLVideoSurface()
+{
+    TRACE("QEglImageGLVideoSurface::~QEglImageGLVideoSurface" << qtThisPtr();)
+}
+
+void QEglImageGLVideoSurface::paint(QPainter *painter, const QRectF &sourceRect,
+                                    const QRectF &targetRect)
+{
+    VERBOSE_TRACE("QEglImageGLVideoSurface::paint" << qtThisPtr()
+                  << "sourceRect" << sourceRect
+                  << "targetRect" << targetRect
+                  << "isActive" << isActive()
+                  << "frameIsValid" << m_frame.isValid());
+    if (!isActive() || !m_frame.isValid()) {
+        painter->fillRect(targetRect, QBrush(Qt::black));
+    } else {
+        const QRectF viewport = m_format.viewport();
+        const QRectF source(viewport.x() + viewport.width() * sourceRect.x(),
+                            viewport.y() + viewport.height() * sourceRect.y(),
+                            viewport.width() * sourceRect.width(),
+                            viewport.height() * sourceRect.height());
+
+        const bool stencilTestEnabled = glIsEnabled(GL_STENCIL_TEST);
+        const bool scissorTestEnabled = glIsEnabled(GL_SCISSOR_TEST);
+
+        painter->beginNativePainting();
+
+        if (stencilTestEnabled)
+            glEnable(GL_STENCIL_TEST);
+        if (scissorTestEnabled)
+            glEnable(GL_SCISSOR_TEST);
+
+        const int width = m_context->device()->width();
+        const int height = m_context->device()->height();
+        const GLfloat wfactor = 2.0 / width;
+        const GLfloat hfactor = -2.0 / height;
+
+        const QTransform transform = painter->deviceTransform();
+        const GLfloat positionMatrix[4][4] =
+        {
+            {
+                /*(0,0)*/ GLfloat(wfactor * transform.m11() - transform.m13()),
+                /*(0,1)*/ GLfloat(hfactor * transform.m12() + transform.m13()),
+                /*(0,2)*/ 0.0,
+                /*(0,3)*/ GLfloat(transform.m13())
+            }, {
+                /*(1,0)*/ GLfloat(wfactor * transform.m21() - transform.m23()),
+                /*(1,1)*/ GLfloat(hfactor * transform.m22() + transform.m23()),
+                /*(1,2)*/ 0.0,
+                /*(1,3)*/ GLfloat(transform.m23())
+            }, {
+                /*(2,0)*/ 0.0,
+                /*(2,1)*/ 0.0,
+                /*(2,2)*/ -1.0,
+                /*(2,3)*/ 0.0
+            }, {
+                /*(3,0)*/ GLfloat(wfactor * transform.dx() - transform.m33()),
+                /*(3,1)*/ GLfloat(hfactor * transform.dy() + transform.m33()),
+                /*(3,2)*/ 0.0,
+                /*(3,3)*/ GLfloat(transform.m33())
+            }
+        };
+
+        QVideoSurfaceFormat::Direction scanLineDirection = m_format.scanLineDirection();
+        const GLfloat vTop = targetRect.top();
+        const GLfloat vBottom = targetRect.bottom() + 1;
+
+        const GLfloat vertexCoordArray[] =
+        {
+            GLfloat(targetRect.left())     , GLfloat(vBottom),
+            GLfloat(targetRect.right() + 1), GLfloat(vBottom),
+            GLfloat(targetRect.left())     , GLfloat(vTop),
+            GLfloat(targetRect.right() + 1), GLfloat(vTop)
+        };
+
+        const QSize frameSize = m_format.frameSize();
+        GLfloat txLeft = sourceRect.left();
+        GLfloat txRight = sourceRect.right();
+        GLfloat txTop = scanLineDirection == QVideoSurfaceFormat::TopToBottom
+                ? sourceRect.top()
+                : sourceRect.bottom();
+        GLfloat txBottom = scanLineDirection == QVideoSurfaceFormat::TopToBottom
+                ? sourceRect.bottom()
+                : sourceRect.top();
+
+        const GLfloat textureCoordArray[] =
+        {
+            txLeft , txBottom,
+            txRight, txBottom,
+            txLeft , txTop,
+            txRight, txTop
+        };
+
+        m_shaderProgram->bind();
+        m_shaderProgram->enableAttributeArray("vertexCoordArray");
+        m_shaderProgram->enableAttributeArray("textureCoordArray");
+        m_shaderProgram->setAttributeArray("vertexCoordArray", vertexCoordArray, 2);
+        m_shaderProgram->setAttributeArray("textureCoordArray", textureCoordArray, 2);
+        m_shaderProgram->setUniformValue("positionMatrix", positionMatrix);
+        m_shaderProgram->setUniformValue("texRgb", 0);
+
+        glEnable(GL_TEXTURE_2D);
+        m_frame.map(QAbstractVideoBuffer::ReadOnly);
+        bindTexture();
+        glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+        unbindTexture();
+        m_frame.unmap();
+        frameDisplayed();
+
+        m_shaderProgram->release();
+        painter->endNativePainting();
+    }
+}
+
+void QEglImageGLVideoSurface::onViewportDestroyed()
+{
+    m_context = 0;
+}
+
+void QEglImageGLVideoSurface::doStart(const QVideoSurfaceFormat &format)
+{
+    TRACE("QEglImageGLVideoSurface::doStart" << qtThisPtr());
+    m_context->makeCurrent();
+    m_shaderProgram = new QGLShaderProgram(m_context, this);
+    if (!m_shaderProgram->addShaderFromSourceCode(QGLShader::Vertex,
+                                                  qt_QEglImageGLVideoSurface_VertexShaderProgram)) {
+        qWarning("QEglImageGLVideoSurface::doStart vertex shader compile error %s",
+                 qPrintable(m_shaderProgram->log()));
+        setError(QAbstractVideoSurface::ResourceError);
+    } else if (!m_shaderProgram->addShaderFromSourceCode(QGLShader::Fragment,
+                                                         qt_QEglImageGLVideoSurface_FragmentShaderProgram)) {
+        qWarning("QEglImageGLVideoSurface::doStart vertex shader compile error %s",
+                 qPrintable(m_shaderProgram->log()));
+        setError(QAbstractVideoSurface::ResourceError);
+    } else {
+        m_shaderProgram->bindAttributeLocation("textureCoordArray", 1);
+        if (!m_shaderProgram->link()) {
+            qWarning("QEglImageGLVideoSurface::doStart shader link error %s",
+                     qPrintable(m_shaderProgram->log()));
+            m_shaderProgram->removeAllShaders();
+            setError(QAbstractVideoSurface::ResourceError);
+        }
+    }
+    if (error() != QAbstractVideoSurface::NoError) {
+        delete m_shaderProgram;
+        m_shaderProgram = 0;
+    }
+}
+
+void QEglImageGLVideoSurface::doStop()
+{
+    if (m_context) {
+        m_context->makeCurrent();
+        m_shaderProgram->removeAllShaders();
+    }
+    delete m_shaderProgram;
+    m_shaderProgram = 0;
+}
+
+void QEglImageGLVideoSurface::bindTexture()
+{
+    const GLuint texture = m_frame.handle().value<GLuint>();
+    VERBOSE_TRACE("QEglImageGLVideoSurface::bindTexture" << qtThisPtr()
+                  << "texture" << texture);
+    glActiveTexture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, texture);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+}
+
+void QEglImageGLVideoSurface::unbindTexture()
+{
+    VERBOSE_TRACE("QEglImageGLVideoSurface::unbindTexture" << qtThisPtr());
+    glActiveTexture(GL_TEXTURE0);
+    glBindTexture(GL_TEXTURE_2D, 0);
+}
+
+#endif // !QT_NO_OPENGL
+
+
+//-----------------------------------------------------------------------------
+// QEglImageVGVideoSurface
+//-----------------------------------------------------------------------------
+
+#ifndef QT_NO_OPENVG
+
+QEglImageVGVideoSurface::QEglImageVGVideoSurface(QObject *parent)
+:   QEglImageVideoSurface(parent)
+{
+    TRACE("QEglImageVGVideoSurface::QEglImageVGVideoSurface" << qtThisPtr());
+}
+
+QEglImageVGVideoSurface::~QEglImageVGVideoSurface()
+{
+    TRACE("QEglImageVGVideoSurface::~QEglImageVGVideoSurface" << qtThisPtr());
+}
+
+void QEglImageVGVideoSurface::paint(QPainter *painter, const QRectF &sourceRect,
+                                    const QRectF &targetRect)
+{
+    VERBOSE_TRACE("QEglImageVGVideoSurface::paint" << qtThisPtr()
+                  << "sourceRect" << sourceRect
+                  << "targetRect" << targetRect
+                  << "isActive" << isActive());
+    if (!isActive() || !m_frame.isValid()) {
+        painter->fillRect(targetRect, QBrush(Qt::black));
+    } else {
+        VERBOSE_TRACE("QEglImageVGVideoSurface::paint" << qtThisPtr());
+        m_frame.map(QAbstractVideoBuffer::ReadOnly);
+        const VGImage image = m_frame.handle().value<VGImage>();
+        const int imageWidth = vgGetParameteri(image, VG_IMAGE_WIDTH);
+        const int imageHeight = vgGetParameteri(image, VG_IMAGE_WIDTH);
+        const QRectF subImageRect(sourceRect.left() * imageWidth,
+                                  sourceRect.top() * imageHeight,
+                                  sourceRect.width() * imageWidth,
+                                  sourceRect.height() * imageHeight);
+        const VGImage subImage = vgChildImage(image, subImageRect.left(),
+                                                     subImageRect.top(),
+                                                     subImageRect.width(),
+                                                     subImageRect.height());
+        const qreal scaleX = targetRect.width() / subImageRect.width();
+        const qreal scaleY = targetRect.height() / subImageRect.height();
+        const VGint scissor = vgGeti(VG_SCISSORING);
+        painter->save();
+        if (QVideoSurfaceFormat::BottomToTop == m_format.scanLineDirection()) {
+            painter->translate(targetRect.bottomLeft());
+            painter->scale(scaleX, -scaleY);
+        } else {
+            painter->translate(targetRect.topLeft());
+            painter->scale(scaleX, scaleY);
+        }
+        painter->beginNativePainting();
+        vgSeti(VG_SCISSORING, scissor);
+        vgDrawImage(subImage);
+        vgDestroyImage(subImage);
+        m_frame.unmap();
+        frameDisplayed();
+        painter->endNativePainting();
+        painter->restore();
+    }
+}
+
+void QEglImageVGVideoSurface::doStop()
+{
+    // TODO: release resources
+}
+
+#endif // !QT_NO_OPENVG
+
+QT_END_NAMESPACE
diff --git a/src/multimedia/qeglimagevideosurface_symbian_p.h b/src/multimedia/qeglimagevideosurface_symbian_p.h
new file mode 100644
index 0000000000..5e19eda5fb
--- /dev/null
+++ b/src/multimedia/qeglimagevideosurface_symbian_p.h
@@ -0,0 +1,193 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QEGLIMAGESURFACE_SYMBIAN_P_H
+#define QEGLIMAGESURFACE_SYMBIAN_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qabstractvideosurface.h>
+#include <qvideoframe.h>
+#include <qvideosurfaceformat.h>
+
+#if !defined(QT_NO_OPENGL) || !defined(QT_NO_OPENVG)
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#endif
+
+#ifndef QT_NO_OPENGL
+#include <QtOpenGL/qgl.h>
+#endif
+
+#ifndef QT_NO_OPENVG
+#include <QtOpenVG/qvg.h>
+#endif
+
+#ifdef _DEBUG
+#define QTMMK_ENABLE_TRACE
+#endif
+
+//#define QTMMK_ENABLE_VERBOSE_TRACE
+
+#ifdef QTMMK_ENABLE_TRACE
+
+#   include <QtCore/QDebug>
+#   define TRACE(args) qDebug() << "[QtMultimediaKit]" << args
+#   ifdef QTMMK_ENABLE_VERBOSE_TRACE
+#       define VERBOSE_TRACE(args) TRACE(args)
+#   else // QTMMK_ENABLE_VERBOSE_TRACE
+#       define VERBOSE_TRACE(args)
+#   endif // QTMMK_ENABLE_VERBOSE_TRACE
+
+    template <typename T>
+    inline const void *qtVoidPtr(T *ptr)
+    { return reinterpret_cast<const void *>(ptr); }
+
+#   define qtThisPtr() qtVoidPtr(this)
+
+#else // QTMMK_ENABLE_TRACE
+#   define TRACE(args)
+#   define VERBOSE_TRACE(args)
+#endif
+
+QT_BEGIN_NAMESPACE
+
+class QEglImageVideoSurface : public QAbstractVideoSurface
+{
+    Q_OBJECT
+public:
+    ~QEglImageVideoSurface();
+
+    // QAbstractVideoSurface
+    QList<QVideoFrame::PixelFormat> supportedPixelFormats(
+        QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const;
+    bool start(const QVideoSurfaceFormat &format);
+    void stop();
+    bool present(const QVideoFrame &frame);
+
+    void setReady(bool ready);
+    virtual void paint(QPainter *painter,
+                       const QRectF &sourceRect, const QRectF &targetRect) = 0;
+
+signals:
+    void frameChanged();
+
+public slots:
+    void viewportDestroyed();
+
+protected:
+    QEglImageVideoSurface(QObject *parent);
+    void frameDisplayed();
+
+private:
+    virtual void onViewportDestroyed();
+    virtual void doStart(const QVideoSurfaceFormat &format);
+    virtual void doStop() = 0;
+
+protected:
+    QVideoFrame m_frame;
+    QVideoSurfaceFormat m_format;
+
+private:
+    bool m_frameIsNew;
+    bool m_ready;
+};
+
+#ifndef QT_NO_OPENGL
+
+class QGLShaderProgram;
+
+class QEglImageGLVideoSurface : public QEglImageVideoSurface
+{
+    Q_OBJECT
+public:
+    QEglImageGLVideoSurface(QObject *parent = 0);
+    ~QEglImageGLVideoSurface();
+
+    // QEglImageVideoSurface
+    void paint(QPainter *painter,
+               const QRectF &sourceRect, const QRectF &targetRect);
+
+private:
+    void onViewportDestroyed();
+    void doStart(const QVideoSurfaceFormat &format);
+    void doStop();
+    void bindTexture();
+    void unbindTexture();
+
+private:
+    QGLContext *m_context;
+    QGLShaderProgram *m_shaderProgram;
+};
+
+#endif // !QT_NO_OPENGL
+
+#ifndef QT_NO_OPENVG
+
+class QEglImageVGVideoSurface : public QEglImageVideoSurface
+{
+    Q_OBJECT
+public:
+    QEglImageVGVideoSurface(QObject *parent = 0);
+    ~QEglImageVGVideoSurface();
+
+    // QEglImageVideoSurface
+    void paint(QPainter *painter,
+               const QRectF &sourceRect, const QRectF &targetRect);
+
+private:
+    void doStop();
+};
+
+#endif // !QT_NO_OPENVG
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/multimedia/qgraphicsvideoitem_symbian.cpp b/src/multimedia/qgraphicsvideoitem_symbian.cpp
index f94bbe9ff2..bdd52a0147 100644
--- a/src/multimedia/qgraphicsvideoitem_symbian.cpp
+++ b/src/multimedia/qgraphicsvideoitem_symbian.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -40,35 +40,111 @@
 ****************************************************************************/
 
 
-#include <QtCore/qglobal.h>
-
 #include <QtCore/QDebug>
 #include <QtCore/QEvent>
 #include <QtCore/QPointer>
 #include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
 #include <QtGui/QGraphicsScene>
 #include <QtGui/QGraphicsView>
+#include <QtGui/QPainter>
 
-#include "qgraphicsvideoitem.h"
-
+#include <qgraphicsvideoitem.h>
 #include <qmediaobject.h>
 #include <qmediaservice.h>
+#include <qmediaservice.h>
+#include <qvideorenderercontrol.h>
+#include <qvideosurfaceformat.h>
 #include <qvideowidgetcontrol.h>
 
+#ifndef QT_NO_EGL
+#include <qeglimagevideosurface_symbian_p.h>
+#include <EGL/egl.h>
+#endif
+
+// This graphics item can operate in either of two modes: "direct" and "renderer".
+// These correspond to the backend control APIs used to render the content
+// into the QPaintDevice: QVideoWidgetControl and QVideoRendererControl.
+//
+// Which mode to use depends on a custom property _q_preferredVideoRenderingPath,
+// of type QString, which can be set on an ancestor of the QGraphicsVideoItem
+// (e.g. on the QGraphicsView).  This property may take the following values:
+//
+// auto:     Automatically switch between "widget" and "renderer" modes
+// direct:   Always use "direct" mode
+// renderer: Use "renderer" mode if available when the item is created.  Do
+//           not subsequently switch to "direct" even if fast-path conditions
+//           are met.
+//
+// In 'auto' mode, if all the following conditions are met, 'renderer' is used;
+// otherwise 'direct' is used.
+// * graphics system is opengl or openvg
+// * current media service is mediaplayer (not camera)
+// * current media service provides QVideoRendererControl
+// * video item extent is less than full screen
+// * paint device is a QWidget
+
+
+//-----------------------------------------------------------------------------
+// Namespace
+//-----------------------------------------------------------------------------
+
 Q_DECLARE_METATYPE(WId)
+Q_DECLARE_METATYPE(QVideoSurfaceFormat)
 
-static const QEvent::Type UpdateViewportTransparencyEvent =
+static const QEvent::Type EnableViewportTransparencyEvent =
     static_cast<QEvent::Type>(QEvent::registerEventType());
 
 QT_BEGIN_NAMESPACE
 
+class QGraphicsVideoItemImplBase;
+class QGraphicsVideoItemWidgetImpl;
+
+#ifndef QT_NO_EGL
+class QGraphicsVideoItemEglRendererImpl;
+#endif
+
+//-----------------------------------------------------------------------------
+// Debugging macros
+//-----------------------------------------------------------------------------
+
+// Expand the bounding rectangle to be the same size as the item's size, and
+// fill non-video areas with black borders
+//#define GRAPHICSVIDEOITEM_SHOW_BORDERS
+
+// Draw a dashed line around the item's bounding rectangle
+//#define GRAPHICSVIDEOITEM_SHOW_RECTS
+
+
+//-----------------------------------------------------------------------------
+// Constants
+//-----------------------------------------------------------------------------
+
+static const char *PreferredRenderingPathProperty = "_q_preferredVideoRenderingPath";
+static const char *CurrentRenderingPathProperty   = "_q_currentVideoRenderingPath";
+static const QString RenderingPathAuto     = "auto";
+static const QString RenderingPathDefault  = "default";
+static const QString RenderingPathRenderer = "renderer";
+static const QString RenderingPathDirect   = "direct";
+static const QString DefaultPreferredRenderingPath  = RenderingPathAuto;
+
+
+//-----------------------------------------------------------------------------
+// QGraphicsVideoItemPrivate
+//-----------------------------------------------------------------------------
+
 class QGraphicsVideoItemPrivate : public QObject
 {
     Q_OBJECT
-
+    Q_DECLARE_PUBLIC(QGraphicsVideoItem)
 public:
     QGraphicsVideoItemPrivate(QGraphicsVideoItem *parent);
     ~QGraphicsVideoItemPrivate();
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+               QWidget *widget);
+    void itemChange(QGraphicsVideoItem::GraphicsItemChange change,
+                    const QVariant &value);
     QMediaObject *mediaObject() const;
     bool setMediaObject(QMediaObject *mediaObject);
     Qt::AspectRatioMode aspectRatioMode() const;
@@ -80,213 +156,355 @@ public:
     QRectF rect() const;
     QRectF boundingRect() const;
     QSize nativeSize() const;
-    void setCurrentView(QGraphicsView *view);
-    void setVisible(bool visible);
-    void setZValue(int zValue);
-    void setTransform(const QTransform &transform);
-    void setWithinViewBounds(bool within);
-    bool hasContent() const;
 
-    bool eventFilter(QObject *watched, QEvent *event);
-    void customEvent(QEvent *event);
+    void prepareGeometryChange();
 
     void _q_present();
     void _q_updateNativeSize();
     void _q_serviceDestroyed();
-    void _q_mediaObjectDestroyed();
 
-public slots:
-    void updateWidgetOrdinalPosition();
-    void updateItemAncestors();
+    static QGraphicsVideoItemPrivate *getPtrHelper(QGraphicsVideoItem *item);
 
 private slots:
-    void hasContentChanged();
+    void screenSizeChanged();
+    void rendererControlError();
 
 private:
-    void clearService();
-    QWidget *videoWidget() const;
-    void updateGeometry();
-    void updateViewportAncestorEventFilters();
-    void updateWidgetVisibility();
-    void updateTopWinId();
+    friend class QGraphicsVideoItemImplBase;
+    QGraphicsVideoItemImplBase* impl();
+    const QGraphicsVideoItemImplBase* impl() const;
+    QString getPreferredRenderingPath() const;
+    bool setViewport(QGraphicsView *view);
+    bool setTransform(const QTransform &transform);
+    bool setWidgetPaintDevice(bool widget);
+    void restoreViewportState();
+    void geometryChanged();
+    void determineGraphicsSystem();
+    bool useDirectMode() const;
+    void destroyImpl();
+    void createImpl();
+    void createImpl(bool direct);
+    void recreateImpl(bool force = false);
 
 private:
+    friend class QGraphicsVideoItemWidgetImpl;
+#ifndef QT_NO_EGL
+    friend class QGraphicsVideoItemEglRendererImpl;
+#endif
     QGraphicsVideoItem *q_ptr;
+    QGraphicsVideoItemImplBase *m_impl;
+    bool m_isDirect;
     QMediaService *m_service;
-    QMediaObject *m_mediaObject;
-    QVideoWidgetControl *m_widgetControl;
-    QPointer<QGraphicsView> m_currentView;
-    QList<QPointer<QObject> > m_viewportAncestors;
-    QList<QPointer<QObject> > m_itemAncestors;
-    QGraphicsView::ViewportUpdateMode m_savedViewportUpdateMode;
+    bool m_serviceSupportsRendererControl;
+    bool m_rendererControlError;
+    QPointer<QMediaObject> m_mediaObject;
     Qt::AspectRatioMode m_aspectRatioMode;
+    QPointer<QGraphicsView> m_viewport;
+    QGraphicsView::ViewportUpdateMode m_savedViewportUpdateMode;
+    bool m_viewportTransparencyEnabled;
+    QTransform m_transform;
     QRectF m_rect;
     QRectF m_boundingRect;
     QSize m_nativeSize;
-    QPointF m_offset;
-    QTransform m_transform;
-    bool m_visible;
-    bool m_withinViewBounds;
+    QSize m_screenSize;
+    bool m_widgetPaintDevice;
+    QString m_graphicsSystem;
+    bool m_geometryChanged;
 };
 
 
-QGraphicsVideoItemPrivate::QGraphicsVideoItemPrivate(QGraphicsVideoItem *parent)
-:   q_ptr(parent)
-,   m_service(0)
-,   m_mediaObject(0)
-,   m_widgetControl(0)
-,   m_savedViewportUpdateMode(QGraphicsView::FullViewportUpdate)
-,   m_aspectRatioMode(Qt::KeepAspectRatio)
-,   m_rect(0.0, 0.0, 320.0, 240.0)
-,   m_visible(false)
-,   m_withinViewBounds(false)
-{
-    qRegisterMetaType<WId>("WId");
-    updateItemAncestors();
-}
+//-----------------------------------------------------------------------------
+// QGraphicsVideoItemImplBase
+//-----------------------------------------------------------------------------
 
-QGraphicsVideoItemPrivate::~QGraphicsVideoItemPrivate()
+class QGraphicsVideoItemImplBase : public QObject
 {
-    if (m_widgetControl)
-        m_service->releaseControl(m_widgetControl);
-    setCurrentView(0);
-}
+    Q_OBJECT
+public:
+    ~QGraphicsVideoItemImplBase();
+
+    virtual void paint(QPainter *painter, QWidget *widget) = 0;
+    virtual void itemChange(QGraphicsVideoItem::GraphicsItemChange change,
+                            const QVariant &value) = 0;
+    virtual void present() = 0;
+    virtual void updateNativeSize() = 0;
+    virtual void viewportChanged();
+    virtual void aspectRatioModeChanged();
+    virtual bool isReadyToPaint() const;
+    void updateGeometry();
 
-QMediaObject *QGraphicsVideoItemPrivate::mediaObject() const
+protected:
+    Q_DECLARE_PUBLIC(QGraphicsVideoItemPrivate)
+    inline QGraphicsVideoItem* qq_func() { return q_ptr->q_func(); }
+    inline const QGraphicsVideoItem* qq_func() const { return q_ptr->q_func(); }
+    QGraphicsVideoItemImplBase(QGraphicsVideoItemPrivate *parent);
+    virtual void doUpdateGeometry() = 0;
+
+private:
+    void customEvent(QEvent *event);
+
+protected:
+    QGraphicsVideoItemPrivate *q_ptr;
+    QRectF m_contentRect;
+    // The following rectangles are in global (screen) coordinates
+    QRect m_screenRect;
+    QRect m_boundingScreenRect;
+    QRect m_contentScreenRect;
+    QRect m_viewportScreenRect;
+};
+
+QGraphicsVideoItemImplBase::QGraphicsVideoItemImplBase(QGraphicsVideoItemPrivate *parent)
+    :   QObject(parent)
+    ,   q_ptr(parent)
 {
-    return m_mediaObject;
+
 }
 
-bool QGraphicsVideoItemPrivate::setMediaObject(QMediaObject *mediaObject)
+QGraphicsVideoItemImplBase::~QGraphicsVideoItemImplBase()
 {
-    bool bound = false;
-    if (m_mediaObject != mediaObject) {
-        clearService();
-        m_mediaObject = mediaObject;
-        if (m_mediaObject) {
-            m_service = m_mediaObject->service();
-            if (m_service) {
-                connect(m_service, SIGNAL(destroyed()), q_ptr, SLOT(_q_serviceDestroyed()));
-                m_widgetControl = qobject_cast<QVideoWidgetControl *>(
-                    m_service->requestControl(QVideoWidgetControl_iid));
-                if (m_widgetControl) {
-                    connect(m_widgetControl, SIGNAL(nativeSizeChanged()), q_ptr, SLOT(_q_updateNativeSize()));
-                    connect(m_widgetControl, SIGNAL(hasContentChanged()), this, SLOT(hasContentChanged()));
-                    m_widgetControl->setAspectRatioMode(Qt::IgnoreAspectRatio);
-                    updateGeometry();
-                    updateTopWinId();
-                    updateWidgetOrdinalPosition();
-                    updateWidgetVisibility();
-                    bound = true;
-                }
-            }
-        }
-    }
-    return bound;
+    Q_Q(QGraphicsVideoItemPrivate);
+    q->restoreViewportState();
 }
 
-Qt::AspectRatioMode QGraphicsVideoItemPrivate::aspectRatioMode() const
+// Helper
+QRect toScreen(const QRectF &rect, const QTransform &transform, const QWidget *viewport)
 {
-    return m_aspectRatioMode;
+    const QRectF screenRectF = transform.mapRect(rect);
+    const QRect screenRect(screenRectF.topLeft().toPoint(), screenRectF.size().toSize());
+    return QRect(viewport->mapToGlobal(screenRect.topLeft()), screenRect.size());
 }
 
-void QGraphicsVideoItemPrivate::setAspectRatioMode(Qt::AspectRatioMode mode)
+void QGraphicsVideoItemImplBase::updateGeometry()
 {
-    if (mode != m_aspectRatioMode) {
-        m_aspectRatioMode = mode;
-        updateGeometry();
+    Q_Q(QGraphicsVideoItemPrivate);
+    q->prepareGeometryChange();
+    QSizeF videoSize;
+    if (q->m_nativeSize.isEmpty()) {
+        videoSize = q->m_rect.size();
+    } else if (q->m_aspectRatioMode == Qt::IgnoreAspectRatio) {
+        videoSize = q->m_rect.size();
+    } else {
+        // KeepAspectRatio or KeepAspectRatioByExpanding
+        videoSize = q->m_nativeSize;
+        videoSize.scale(q->m_rect.size(), q->m_aspectRatioMode);
     }
+    m_contentRect = QRectF(QPointF(0, 0), videoSize);
+#ifdef GRAPHICSVIDEOITEM_SHOW_BORDERS
+    q->m_boundingRect = q->m_rect;
+#else
+    m_contentRect.moveCenter(q->m_rect.center());
+    q->m_boundingRect = m_contentRect.intersected(q->m_rect);
+#endif
+    m_boundingScreenRect = QRect();
+    m_contentScreenRect = QRect();
+    m_viewportScreenRect = QRect();
+    if (q->m_viewport) {
+        m_screenRect = toScreen(q->m_rect, q->m_transform, q->m_viewport);
+        m_boundingScreenRect = toScreen(q->m_boundingRect, q->m_transform, q->m_viewport);
+        m_contentScreenRect = toScreen(m_contentRect, q->m_transform, q->m_viewport);
+        m_viewportScreenRect = QRect(q->m_viewport->viewport()->mapToGlobal(QPoint(0, 0)),
+                                     q->m_viewport->viewport()->size());
+    }
+    VERBOSE_TRACE("QGraphicsVideoItemImplBase::updateGeometry" << qtThisPtr()
+                  << "nativeSize" << q->m_nativeSize
+                  << "rect" << q->m_rect
+                  << "aspectRatioMode" << q->m_aspectRatioMode);
+    VERBOSE_TRACE("QGraphicsVideoItemImplBase::updateGeometry" << qtThisPtr()
+                  << "boundingRect" << q->m_boundingRect
+                  << "contentRect" << m_contentRect);
+    VERBOSE_TRACE("QGraphicsVideoItemImplBase::updateGeometry" << qtThisPtr()
+                  << "screenRect" << m_screenRect
+                  << "boundingScreenRect" << m_boundingScreenRect
+                  << "contentScreenRect" << m_contentScreenRect
+                  << "viewportScreenRect" << m_viewportScreenRect);
+    doUpdateGeometry();
 }
 
-QPointF QGraphicsVideoItemPrivate::offset() const
+void QGraphicsVideoItemImplBase::viewportChanged()
 {
-    return m_rect.topLeft();
+    // Default implementation does nothing
 }
 
-void QGraphicsVideoItemPrivate::setOffset(const QPointF &offset)
+void QGraphicsVideoItemImplBase::aspectRatioModeChanged()
 {
-    if (m_offset != offset) {
-        m_offset = offset;
-        updateGeometry();
-    }
+    // Default implementation does nothing
 }
 
-QSizeF QGraphicsVideoItemPrivate::size() const
+bool QGraphicsVideoItemImplBase::isReadyToPaint() const
 {
-    return m_rect.size();
+    return true;
 }
 
-void QGraphicsVideoItemPrivate::setSize(const QSizeF &size)
+void QGraphicsVideoItemImplBase::customEvent(QEvent *event)
 {
-    if (m_rect.size() != size) {
-        m_rect.setSize(size.isValid() ? size : QSizeF(0, 0));
-        updateGeometry();
+    Q_Q(QGraphicsVideoItemPrivate);
+    if (event->type() == EnableViewportTransparencyEvent && q->m_viewport) {
+        TRACE("QGraphicsVideoItemImplBase::customEvent" << qtThisPtr()
+              << "EnableViewportTransparencyEvent");
+        q->m_viewport->window()->setAttribute(Qt::WA_TranslucentBackground);
+        q->m_viewport->window()->update();
+        q->m_viewportTransparencyEnabled = true;
     }
+    QObject::customEvent(event);
 }
 
-QRectF QGraphicsVideoItemPrivate::rect() const
+
+//-----------------------------------------------------------------------------
+// QGraphicsVideoItemWidgetImpl
+//-----------------------------------------------------------------------------
+
+class QGraphicsVideoItemWidgetImpl : public QGraphicsVideoItemImplBase
 {
-    return m_rect;
-}
+    Q_OBJECT
+public:
+    QGraphicsVideoItemWidgetImpl(QGraphicsVideoItemPrivate *parent);
+    ~QGraphicsVideoItemWidgetImpl();
+
+    // QGraphicsVideoItemImplBase
+    void paint(QPainter *painter, QWidget *widget);
+    void itemChange(QGraphicsVideoItem::GraphicsItemChange change,
+                    const QVariant &value);
+    void present();
+    void updateNativeSize();
+    bool hasContent() const;
 
-QRectF QGraphicsVideoItemPrivate::boundingRect() const
+    bool eventFilter(QObject *watched, QEvent *event);
+
+private slots:
+    void updateItemAncestors();
+    void updateWidgetOrdinalPosition();
+    void hasContentChanged();
+
+private:
+    // QGraphicsVideoItemImplBase
+    void doUpdateGeometry();
+    void viewportChanged();
+    void aspectRatioModeChanged();
+
+    void setVisible(bool visible);
+    void setWithinViewBounds(bool within);
+    void updateTopWinId();
+    void updateViewportAncestorEventFilters();
+    void updateWidgetVisibility();
+    QWidget *videoWidget() const;
+
+private:
+    QVideoWidgetControl *m_widgetControl;
+    QList<QPointer<QObject> > m_viewportAncestors;
+    QList<QPointer<QObject> > m_itemAncestors;
+    bool m_visible;
+    bool m_withinViewBounds;
+};
+
+QGraphicsVideoItemWidgetImpl::QGraphicsVideoItemWidgetImpl(QGraphicsVideoItemPrivate *parent)
+    :   QGraphicsVideoItemImplBase(parent)
+    ,   m_widgetControl(0)
+    ,   m_visible(true)
+    ,   m_withinViewBounds(false)
 {
-    return m_boundingRect;
+    Q_Q(QGraphicsVideoItemPrivate);
+    TRACE("QGraphicsVideoItemWidgetImpl::QGraphicsVideoItemWidgetImpl" << qtThisPtr());
+    qRegisterMetaType<WId>("WId");
+    m_visible = qq_func()->isVisible();
+    updateItemAncestors();
+    m_widgetControl = qobject_cast<QVideoWidgetControl *>(
+        q->m_service->requestControl(QVideoWidgetControl_iid));
+    if (m_widgetControl) {
+        connect(m_widgetControl, SIGNAL(nativeSizeChanged()),
+                qq_func(), SLOT(_q_updateNativeSize()));
+        connect(m_widgetControl, SIGNAL(hasContentChanged()),
+                this, SLOT(hasContentChanged()));
+        m_widgetControl->setAspectRatioMode(q->aspectRatioMode());
+        updateGeometry();
+        updateTopWinId();
+        // Delay invocation of updateWidgetOrdinalPosition until after construction is
+        // complete, because it relies on this item having been added to the
+        // QGraphicsScene
+        QMetaObject::invokeMethod(this, "updateWidgetOrdinalPosition", Qt::QueuedConnection);
+        updateWidgetVisibility();
+    }
 }
 
-QSize QGraphicsVideoItemPrivate::nativeSize() const
+QGraphicsVideoItemWidgetImpl::~QGraphicsVideoItemWidgetImpl()
 {
-    return m_nativeSize;
+    TRACE("QGraphicsVideoItemWidgetImpl::~QGraphicsVideoItemWidgetImpl" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    if (m_widgetControl) {
+        m_widgetControl->disconnect();
+        if (q->m_service)
+            q->m_service->releaseControl(m_widgetControl);
+    }
 }
 
-void QGraphicsVideoItemPrivate::setCurrentView(QGraphicsView *view)
+void QGraphicsVideoItemWidgetImpl::paint(QPainter *painter, QWidget *widget)
 {
-    if (m_currentView != view) {
-        if (m_currentView)
-            m_currentView->setViewportUpdateMode(m_savedViewportUpdateMode);
-        m_currentView = view;
-        updateTopWinId();
-        if (m_currentView) {
-            m_savedViewportUpdateMode = m_currentView->viewportUpdateMode();
-            m_currentView->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
-            updateWidgetOrdinalPosition();
-            updateGeometry();
-        }
-        updateViewportAncestorEventFilters();
-     }
+    VERBOSE_TRACE("QGraphicsVideoItemWidgetImpl::paint" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    if (widget && !widget->window()->testAttribute(Qt::WA_TranslucentBackground)) {
+        // On Symbian, setting Qt::WA_TranslucentBackground can cause the
+        // current window surface to be replaced.  Because of this, it cannot
+        // safely be changed from the context of the viewport paintEvent(), so we
+        // queue a custom event to set the attribute.
+        QEvent *event = new QEvent(EnableViewportTransparencyEvent);
+        QCoreApplication::instance()->postEvent(this, event);
+    }
+    const QPainter::CompositionMode oldCompositionMode = painter->compositionMode();
+    painter->setCompositionMode(QPainter::CompositionMode_Source);
+    const QColor color = hasContent() ? Qt::transparent : Qt::black;
+    painter->fillRect(q->boundingRect(), color);
+    painter->setCompositionMode(oldCompositionMode);
 }
 
-void QGraphicsVideoItemPrivate::setVisible(bool visible)
+void QGraphicsVideoItemWidgetImpl::itemChange(QGraphicsVideoItem::GraphicsItemChange change,
+                                                  const QVariant &value)
 {
-    if (m_visible != visible) {
-        m_visible = visible;
-        updateWidgetVisibility();
+    Q_Q(QGraphicsVideoItemPrivate);
+    switch (change) {
+    case QGraphicsVideoItem::ItemScenePositionHasChanged:
+        VERBOSE_TRACE("QGraphicsVideoItemWidgetImpl::itemChange" << qtThisPtr()
+                      << "ItemScenePositionHasChanged" << value);
+        qq_func()->update(q->boundingRect());
+        break;
+    case QGraphicsVideoItem::ItemVisibleChange:
+        TRACE("QGraphicsVideoItemWidgetImpl::itemChange" << qtThisPtr()
+              << "ItemVisibleChange" << value);
+        setVisible(value.toBool());
+        break;
+    case QGraphicsVideoItem::ItemZValueHasChanged:
+        TRACE("QGraphicsVideoItemWidgetImpl::itemChange" << qtThisPtr()
+              << "ItemZValueHasChanged" << value);
+        updateWidgetOrdinalPosition();
+        break;
+    default:
+        break;
     }
 }
 
-void QGraphicsVideoItemPrivate::setTransform(const QTransform &transform)
+void QGraphicsVideoItemWidgetImpl::present()
 {
-    if (m_transform != transform) {
-        m_transform = transform;
-        updateGeometry();
-    }
+    // Do nothing
 }
 
-void QGraphicsVideoItemPrivate::setWithinViewBounds(bool within)
+void QGraphicsVideoItemWidgetImpl::updateNativeSize()
 {
-    if (m_withinViewBounds != within) {
-        m_withinViewBounds = within;
-        updateWidgetVisibility();
-    }
+    Q_Q(QGraphicsVideoItemPrivate);
+    QSize size;
+    if (m_widgetControl)
+        size = m_widgetControl->property("nativeSize").toSize();
+    TRACE("QGraphicsVideoItemWidgetImpl::updateNativeSize" << qtThisPtr()
+          << "size" << size);
+    if (q->m_nativeSize != size)
+        q->m_nativeSize = size;
 }
 
-bool QGraphicsVideoItemPrivate::hasContent() const
+bool QGraphicsVideoItemWidgetImpl::hasContent() const
 {
     return m_widgetControl && m_widgetControl->property("hasContent").value<bool>();
 }
 
-bool QGraphicsVideoItemPrivate::eventFilter(QObject *watched, QEvent *event)
+bool QGraphicsVideoItemWidgetImpl::eventFilter(QObject *watched, QEvent *event)
 {
+    Q_Q(QGraphicsVideoItemPrivate);
     bool updateViewportAncestorEventFiltersRequired = false;
     bool updateGeometryRequired = false;
     foreach (QPointer<QObject> target, m_viewportAncestors) {
@@ -310,7 +528,7 @@ bool QGraphicsVideoItemPrivate::eventFilter(QObject *watched, QEvent *event)
         updateViewportAncestorEventFilters();
     if (updateGeometryRequired)
         updateGeometry();
-    if (watched == m_currentView) {
+    if (watched == q->m_viewport) {
         switch (event->type()) {
         case QEvent::Show:
             setVisible(true);
@@ -323,51 +541,49 @@ bool QGraphicsVideoItemPrivate::eventFilter(QObject *watched, QEvent *event)
     return QObject::eventFilter(watched, event);
 }
 
-void QGraphicsVideoItemPrivate::customEvent(QEvent *event)
+void QGraphicsVideoItemWidgetImpl::viewportChanged()
 {
-    if (event->type() == UpdateViewportTransparencyEvent && m_currentView) {
-        m_currentView->window()->setAttribute(Qt::WA_TranslucentBackground);
-        m_currentView->window()->update();
+    TRACE("QGraphicsVideoItemWidgetImpl::viewportChanged" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    updateTopWinId();
+    if (q->m_viewport) {
+        q->m_viewport->setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+        updateWidgetOrdinalPosition();
     }
-    QObject::customEvent(event);
+    updateViewportAncestorEventFilters();
 }
 
-void QGraphicsVideoItemPrivate::clearService()
+void QGraphicsVideoItemWidgetImpl::aspectRatioModeChanged()
 {
-    if (m_widgetControl) {
-        m_service->releaseControl(m_widgetControl);
-        m_widgetControl = 0;
-    }
-    if (m_service) {
-        m_service->disconnect(q_ptr);
-        m_service = 0;
-    }
+    TRACE("QGraphicsVideoItemWidgetImpl::aspectRatioModeChanged" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    if (m_widgetControl)
+        m_widgetControl->setAspectRatioMode(q->aspectRatioMode());
 }
 
-QWidget *QGraphicsVideoItemPrivate::videoWidget() const
+void QGraphicsVideoItemWidgetImpl::setVisible(bool visible)
 {
-    return m_widgetControl ? m_widgetControl->videoWidget() : 0;
+    if (m_visible != visible) {
+        TRACE("QGraphicsVideoItemWidgetImpl::setVisible" << qtThisPtr()
+              << "visible" << visible);
+        m_visible = visible;
+        updateWidgetVisibility();
+    }
 }
 
-void QGraphicsVideoItemPrivate::updateViewportAncestorEventFilters()
+void QGraphicsVideoItemWidgetImpl::setWithinViewBounds(bool within)
 {
-    // In order to determine when the absolute screen position of the item
-    // changes, we need to receive move events sent to m_currentView
-    // or any of its ancestors.
-    foreach (QPointer<QObject> target, m_viewportAncestors)
-        if (target)
-            target->removeEventFilter(this);
-    m_viewportAncestors.clear();
-    QObject *target = m_currentView;
-    while (target) {
-        target->installEventFilter(this);
-        m_viewportAncestors.append(target);
-        target = target->parent();
+    if (m_withinViewBounds != within) {
+        TRACE("QGraphicsVideoItemWidgetImpl::setWithinViewBounds" << qtThisPtr()
+              << "within" << within);
+        m_withinViewBounds = within;
+        updateWidgetVisibility();
     }
 }
 
-void QGraphicsVideoItemPrivate::updateItemAncestors()
+void QGraphicsVideoItemWidgetImpl::updateItemAncestors()
 {
+    TRACE("QGraphicsVideoItemWidgetImpl::updateItemAncestors" << qtThisPtr());
     // We need to monitor the ancestors of this item to check for zOrder
     // changes and reparenting, both of which influence the stacking order
     // of this item and so require changes to the backend window ordinal position.
@@ -379,7 +595,7 @@ void QGraphicsVideoItemPrivate::updateItemAncestors()
         }
     }
     m_itemAncestors.clear();
-    QGraphicsItem *item = q_ptr;
+    QGraphicsItem *item = qq_func();
     while (item) {
         if (QGraphicsObject *object = item->toGraphicsObject()) {
             connect(object, SIGNAL(zChanged()), this, SLOT(updateWidgetOrdinalPosition()));
@@ -391,120 +607,755 @@ void QGraphicsVideoItemPrivate::updateItemAncestors()
     }
 }
 
-void QGraphicsVideoItemPrivate::hasContentChanged()
+void QGraphicsVideoItemWidgetImpl::updateTopWinId()
 {
-    q_ptr->update();
+    TRACE("QGraphicsVideoItemWidgetImpl::updateTopWinId" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    if (m_widgetControl) {
+        WId topWinId = q->m_viewport ? q->m_viewport->effectiveWinId() : 0;
+        m_widgetControl->setProperty("topWinId", QVariant::fromValue<WId>(topWinId));
+    }
 }
 
-void QGraphicsVideoItemPrivate::updateGeometry()
+void QGraphicsVideoItemWidgetImpl::updateWidgetOrdinalPosition()
 {
-    q_ptr->prepareGeometryChange();
-    QSizeF videoSize;
-    if (m_nativeSize.isEmpty()) {
-        videoSize = m_rect.size();
-    } else if (m_aspectRatioMode == Qt::IgnoreAspectRatio) {
-        videoSize = m_rect.size();
-    } else {
-        // KeepAspectRatio or KeepAspectRatioByExpanding
-        videoSize = m_nativeSize;
-        videoSize.scale(m_rect.size(), m_aspectRatioMode);
+    TRACE("QGraphicsVideoItemWidgetImpl::updateWidgetOrdinalPosition" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    if (q->m_viewport) {
+        QGraphicsScene *scene = q->m_viewport->scene();
+        const QGraphicsScene::ItemIndexMethod indexMethod = scene->itemIndexMethod();
+        scene->setItemIndexMethod(QGraphicsScene::BspTreeIndex);
+        QT_TRY {
+            const QList<QGraphicsItem*> items = q->m_viewport->items();
+            QList<QGraphicsVideoItem*> graphicsVideoItems;
+            foreach (QGraphicsItem *item, items)
+                if (QGraphicsVideoItem *x = qobject_cast<QGraphicsVideoItem *>(item->toGraphicsObject()))
+                    graphicsVideoItems.append(x);
+            int ordinalPosition = 1;
+            foreach (QGraphicsVideoItem *item, graphicsVideoItems) {
+                QGraphicsVideoItemPrivate *d = QGraphicsVideoItemPrivate::getPtrHelper(item);
+                if (QGraphicsVideoItemWidgetImpl *dd =
+                    qobject_cast<QGraphicsVideoItemWidgetImpl *>(d->impl()))
+                    if (QVideoWidgetControl *widgetControl = dd->m_widgetControl)
+                        widgetControl->setProperty("ordinalPosition", ordinalPosition++);
+            }
+        } QT_CATCH(...) {
+            scene->setItemIndexMethod(indexMethod);
+            QT_RETHROW;
+        }
+        scene->setItemIndexMethod(indexMethod);
     }
-    QRectF displayRect(QPointF(0, 0), videoSize);
-    displayRect.moveCenter(m_rect.center());
-    m_boundingRect = displayRect.intersected(m_rect);
+}
+
+void QGraphicsVideoItemWidgetImpl::hasContentChanged()
+{
+    TRACE("QGraphicsVideoItemWidgetImpl::hasContentChanged" << qtThisPtr()
+          << "hasContent" << hasContent());
+    qq_func()->update();
+}
+
+void QGraphicsVideoItemWidgetImpl::doUpdateGeometry()
+{
+    Q_Q(QGraphicsVideoItemPrivate);
     if (QWidget *widget = videoWidget()) {
-        QRect widgetGeometry;
-        QRect extent;
-        if (m_currentView) {
-            const QRectF viewRectF = m_transform.mapRect(displayRect);
-            const QRect viewRect(viewRectF.topLeft().toPoint(), viewRectF.size().toSize());
+        QRect widgetRect;
+        QRect extentRect;
+        if (q->m_viewport) {
+            widgetRect = m_screenRect.intersected(m_viewportScreenRect);
             // Without this, a line of transparent pixels is visible round the edge of the
             // item.  This is probably down to an error in conversion between scene and
             // screen coordinates, but the root cause has not yet been tracked down.
-            static const QPoint positionFudgeFactor(-1, -1);
-            static const QSize sizeFudgeFactor(4, 4);
-            const QRect videoGeometry(m_currentView->mapToGlobal(viewRect.topLeft()) + positionFudgeFactor,
-                                      viewRect.size() + sizeFudgeFactor);
-            QRect viewportGeometry = QRect(m_currentView->viewport()->mapToGlobal(QPoint(0, 0)),
-                                           m_currentView->viewport()->size());
-            widgetGeometry = videoGeometry.intersected(viewportGeometry);
-            extent = QRect(videoGeometry.topLeft() - widgetGeometry.topLeft(),
-                           videoGeometry.size());
+            widgetRect.adjust(-1, -1, 4, 4);
+            const QPoint offset((widgetRect.width() - m_contentScreenRect.width()) / 2,
+                                (widgetRect.height() - m_contentScreenRect.height()) / 2);
+            extentRect = QRect(offset, m_contentScreenRect.size());
         }
-        setWithinViewBounds(!widgetGeometry.size().isEmpty());
-        widget->setGeometry(widgetGeometry);
-        m_widgetControl->setProperty("extentRect", QVariant::fromValue<QRect>(extent));
-        const qreal angle = m_transform.map(QLineF(0, 0, 1, 0)).angle();
+        const qreal angle = q->m_transform.map(QLineF(0, 0, 1, 0)).angle();
+        VERBOSE_TRACE("QGraphicsVideoItemWidgetImpl::doUpdateGeometry" << qtThisPtr()
+                      << "widgetRect" << widgetRect
+                      << "extentRect" << extentRect
+                      << "angle" << angle);
+        setWithinViewBounds(!widgetRect.size().isEmpty());
+        widget->setGeometry(widgetRect);
+        m_widgetControl->setProperty("extentRect", QVariant::fromValue<QRect>(extentRect));
         m_widgetControl->setProperty("rotation", QVariant::fromValue<qreal>(angle));
     }
 }
 
-void QGraphicsVideoItemPrivate::updateWidgetVisibility()
+void QGraphicsVideoItemWidgetImpl::updateViewportAncestorEventFilters()
 {
+    TRACE("QGraphicsVideoItemWidgetImpl::updateViewportAncestorEventFilters" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    // In order to determine when the absolute screen position of the item
+    // changes, we need to receive move events sent to m_viewport
+    // or any of its ancestors.
+    foreach (QPointer<QObject> target, m_viewportAncestors)
+        if (target)
+            target->removeEventFilter(this);
+    m_viewportAncestors.clear();
+    QObject *target = q->m_viewport;
+    while (target) {
+        target->installEventFilter(this);
+        m_viewportAncestors.append(target);
+        target = target->parent();
+    }
+}
+
+void QGraphicsVideoItemWidgetImpl::updateWidgetVisibility()
+{
+    TRACE("QGraphicsVideoItemWidgetImpl::updateWidgetVisibility" << qtThisPtr()
+          << "widget" << qtVoidPtr(videoWidget())
+          << "visible" << m_visible
+          << "withinViewBounds" << m_withinViewBounds);
     if (QWidget *widget = videoWidget())
         widget->setVisible(m_visible && m_withinViewBounds);
 }
 
-void QGraphicsVideoItemPrivate::updateTopWinId()
+QWidget *QGraphicsVideoItemWidgetImpl::videoWidget() const
 {
-    if (m_widgetControl) {
-        WId topWinId = m_currentView ? m_currentView->effectiveWinId() : 0;
-        // Set custom property
-        m_widgetControl->setProperty("topWinId", QVariant::fromValue<WId>(topWinId));
+    return m_widgetControl ? m_widgetControl->videoWidget() : 0;
+}
+
+
+//-----------------------------------------------------------------------------
+// QGraphicsVideoItemEglRendererImpl
+//-----------------------------------------------------------------------------
+
+#ifndef QT_NO_EGL
+
+class QGraphicsVideoItemEglRendererImpl : public QGraphicsVideoItemImplBase
+{
+    Q_OBJECT
+public:
+    QGraphicsVideoItemEglRendererImpl(const QString &graphicsSystem,
+                                      QGraphicsVideoItemPrivate *parent);
+    ~QGraphicsVideoItemEglRendererImpl();
+
+    // QGraphicsVideoItemImplBase
+    void paint(QPainter *painter, QWidget *widget);
+    void itemChange(QGraphicsVideoItem::GraphicsItemChange change, const QVariant &value);
+    void present();
+    void updateNativeSize();
+    bool isReadyToPaint() const;
+
+    bool hasRendererControl() const;
+
+private:
+    // QGraphicsVideoItemImplBase
+    void doUpdateGeometry();
+
+private:
+    const QString m_graphicsSystem;
+    QVideoRendererControl *m_rendererControl;
+    QEglImageVideoSurface *m_surface;
+    bool m_updatePaintDevice;
+    QRectF m_sourceRect;
+};
+
+QGraphicsVideoItemEglRendererImpl::QGraphicsVideoItemEglRendererImpl(const QString &graphicsSystem,
+                                                                     QGraphicsVideoItemPrivate *parent)
+    :   QGraphicsVideoItemImplBase(parent)
+    ,   m_graphicsSystem(graphicsSystem)
+    ,   m_rendererControl(0)
+    ,   m_surface(0)
+    ,   m_updatePaintDevice(true)
+{
+    Q_Q(QGraphicsVideoItemPrivate);
+    TRACE("QGraphicsVideoItemEglRendererImpl::QGraphicsVideoItemEglRendererImpl" << qtThisPtr()
+          << "graphicsSystem" << graphicsSystem << "q" << q << "q->m_service" << q->m_service);
+    m_rendererControl = qobject_cast<QVideoRendererControl *>(
+        q->m_service->requestControl(QVideoRendererControl_iid));
+    TRACE("QGraphicsVideoItemEglRendererImpl::QGraphicsVideoItemEglRendererImpl" << qtThisPtr()
+          << "rendererControl" << m_rendererControl);
+    if (m_rendererControl) {
+        connect(m_rendererControl, SIGNAL(error()),
+                q, SLOT(rendererControlError()));
+        qRegisterMetaType<QVideoSurfaceFormat>();
+#ifndef QT_NO_OPENGL
+        if ("opengl" == m_graphicsSystem)
+            m_surface = new QEglImageGLVideoSurface(this);
+#endif // !QT_NO_OPENGL
+#ifndef QT_NO_OPENVG
+        if ("openvg" == m_graphicsSystem)
+            m_surface = new QEglImageVGVideoSurface(this);
+#endif // !QT_NO_OPENVG
+        Q_ASSERT(m_surface);
+        connect(m_surface, SIGNAL(frameChanged()),
+                qq_func(), SLOT(_q_present()));
+        connect(m_surface, SIGNAL(surfaceFormatChanged(QVideoSurfaceFormat)),
+                qq_func(), SLOT(_q_updateNativeSize()), Qt::QueuedConnection);
     }
 }
 
-void QGraphicsVideoItemPrivate::updateWidgetOrdinalPosition()
+QGraphicsVideoItemEglRendererImpl::~QGraphicsVideoItemEglRendererImpl()
 {
-    if (m_currentView) {
-        QGraphicsScene *scene = m_currentView->scene();
-        const QGraphicsScene::ItemIndexMethod indexMethod = scene->itemIndexMethod();
-        scene->setItemIndexMethod(QGraphicsScene::BspTreeIndex);
-        const QList<QGraphicsItem*> items = m_currentView->items();
-        QList<QGraphicsVideoItem*> graphicsVideoItems;
-        foreach (QGraphicsItem *item, items)
-            if (QGraphicsVideoItem *x = qobject_cast<QGraphicsVideoItem *>(item->toGraphicsObject()))
-                graphicsVideoItems.append(x);
-        int ordinalPosition = 1;
-        foreach (QGraphicsVideoItem *item, graphicsVideoItems)
-            if (QVideoWidgetControl *widgetControl = item->d_ptr->m_widgetControl)
-                widgetControl->setProperty("ordinalPosition", ordinalPosition++);
-        scene->setItemIndexMethod(indexMethod);
+    TRACE("QGraphicsVideoItemEglRendererImpl::~QGraphicsVideoItemEglRendererImpl" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    if (m_surface) {
+        m_surface->disconnect();
+        m_surface->stop();
+    }
+    if (m_rendererControl) {
+        m_rendererControl->setSurface(0);
+        if (q->m_service)
+            q->m_service->releaseControl(m_rendererControl);
     }
 }
 
+void QGraphicsVideoItemEglRendererImpl::paint(QPainter *painter, QWidget *widget)
+{
+    VERBOSE_TRACE("QGraphicsVideoItemEglRendererImpl::paint" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    if (m_surface && m_rendererControl && m_updatePaintDevice) {
+        m_updatePaintDevice = false;
+        if (widget)
+            connect(widget, SIGNAL(destroyed()), m_surface, SLOT(viewportDestroyed()));
+        if (m_rendererControl->surface() != m_surface)
+            m_rendererControl->setSurface(m_surface);
+    }
+    painter->fillRect(q->m_boundingRect, QBrush(Qt::black));
+    if (isReadyToPaint()) {
+        QRectF targetRect = m_contentRect;
+        targetRect.moveCenter(q->m_boundingRect.center());
+        targetRect = targetRect.intersected(q->m_boundingRect);
+        m_surface->paint(painter, m_sourceRect, targetRect);
+        m_surface->setReady(true);
+    }
+}
+
+void QGraphicsVideoItemEglRendererImpl::itemChange(QGraphicsVideoItem::GraphicsItemChange change,
+                                              const QVariant &value)
+{
+    Q_UNUSED(change)
+    Q_UNUSED(value)
+    // Do nothing
+}
+
+void QGraphicsVideoItemEglRendererImpl::present()
+{
+    VERBOSE_TRACE("QGraphicsVideoItemEglRendererImpl::present" << qtThisPtr());
+    Q_Q(QGraphicsVideoItemPrivate);
+    qq_func()->update(q->m_boundingRect);
+}
+
+void QGraphicsVideoItemEglRendererImpl::updateNativeSize()
+{
+    TRACE("QGraphicsVideoItemEglRendererImpl::updateNativeSize" << qtThisPtr()
+          << "sizeHint" << m_surface->surfaceFormat().sizeHint());
+    Q_Q(QGraphicsVideoItemPrivate);
+    QSize size = m_surface->surfaceFormat().sizeHint();
+    if (size.isEmpty() && m_rendererControl)
+        size = m_rendererControl->property("nativeSize").toSize();
+    if (q->m_nativeSize != size)
+        q->m_nativeSize = size;
+}
+
+bool QGraphicsVideoItemEglRendererImpl::hasRendererControl() const
+{
+    bool result = false;
+    if (m_rendererControl) {
+        // Check that the control implementation is the correct type, i.e. it
+        // produces video frames as EGL images.
+        const QString className(m_rendererControl->metaObject()->className());
+        TRACE("QGraphicsVideoItemEglRendererImpl::hasRendererControl" << qtThisPtr()
+              << "className" << className);
+        result = (className == "S60VideoEglRendererControl");
+    }
+    return result;
+}
+
+bool QGraphicsVideoItemEglRendererImpl::isReadyToPaint() const
+{
+    return (m_surface && m_surface->isActive());
+}
+
+void QGraphicsVideoItemEglRendererImpl::doUpdateGeometry()
+{
+    Q_Q(QGraphicsVideoItemPrivate);
+    if (q->m_nativeSize.isEmpty()) {
+        // Do nothing
+    } else if (q->m_aspectRatioMode == Qt::IgnoreAspectRatio) {
+        m_sourceRect = QRectF(0, 0, 1, 1);
+    } else if (q->m_aspectRatioMode == Qt::KeepAspectRatio) {
+        m_sourceRect = QRectF(0, 0, 1, 1);
+    } else if (q->m_aspectRatioMode == Qt::KeepAspectRatioByExpanding) {
+        QSizeF size = q->m_rect.size();
+        size.scale(q->m_nativeSize, Qt::KeepAspectRatio);
+        const qreal w = size.width() / q->m_nativeSize.width();
+        const qreal h = size.height() / q->m_nativeSize.height();
+        m_sourceRect = QRectF(0, 0, w, h);
+        m_sourceRect.moveCenter(QPointF(0.5, 0.5));
+    }
+    VERBOSE_TRACE("QGraphicsVideoItemEglRendererImpl::doUpdateGeometry" << qtThisPtr()
+                  << "sourceRect" << m_sourceRect);
+}
+
+#endif // !QT_NO_EGL
+
+
+//-----------------------------------------------------------------------------
+// QGraphicsVideoItemPrivate
+//-----------------------------------------------------------------------------
+
+QGraphicsVideoItemPrivate::QGraphicsVideoItemPrivate(QGraphicsVideoItem *parent)
+    :   QObject(parent)
+    ,   q_ptr(0)
+    ,   m_impl(0)
+    ,   m_isDirect(false)
+    ,   m_service(0)
+    ,   m_serviceSupportsRendererControl(true)
+    ,   m_rendererControlError(false)
+    ,   m_aspectRatioMode(Qt::KeepAspectRatio)
+    ,   m_viewport(0)
+    ,   m_savedViewportUpdateMode(QGraphicsView::FullViewportUpdate)
+    ,   m_viewportTransparencyEnabled(false)
+    ,   m_rect(0, 0, 320, 240)
+    ,   m_screenSize(QApplication::desktop()->size())
+    ,   m_widgetPaintDevice(true)
+{
+    TRACE("QGraphicsVideoItemPrivate::QGraphicsVideoItemPrivate" << qtThisPtr()
+          << "parent" << qtVoidPtr(parent)
+          << "screenSize" << m_screenSize);
+    connect(QApplication::desktop(), SIGNAL(resized(int)),
+            this, SLOT(screenSizeChanged()));
+}
+
+QGraphicsVideoItemPrivate::~QGraphicsVideoItemPrivate()
+{
+    TRACE("QGraphicsVideoItemPrivate::~QGraphicsVideoItemPrivate" << qtThisPtr());
+}
+
+void QGraphicsVideoItemPrivate::paint(QPainter *painter,
+                                      const QStyleOptionGraphicsItem *option,
+                                      QWidget *widget)
+{
+    VERBOSE_TRACE("QGraphicsVideoItemPrivate::paint" << qtThisPtr()
+                  << "paintDeviceType" << painter->device()->devType());
+    Q_Q(QGraphicsVideoItem);
+    Q_UNUSED(option)
+    if (m_graphicsSystem.isEmpty())
+        determineGraphicsSystem();
+    QGraphicsView *view = 0;
+    QGraphicsScene *scene = q->scene();
+    if (scene && !scene->views().isEmpty())
+        view = scene->views().first();
+    m_geometryChanged |= setViewport(view);
+    m_geometryChanged |= setTransform(painter->combinedTransform());
+    m_geometryChanged |= setWidgetPaintDevice(QInternal::Widget == painter->device()->devType());
+    if (m_service) {
+        if (!m_impl) {
+            createImpl();
+        } else if (m_geometryChanged) {
+            recreateImpl();
+            m_impl->updateGeometry();
+            m_geometryChanged = false;
+        }
+    }
+    if (m_impl)
+        m_impl->paint(painter, widget);
+}
+
+void QGraphicsVideoItemPrivate::itemChange(QGraphicsVideoItem::GraphicsItemChange change,
+                                           const QVariant &value)
+{
+    if (m_impl)
+        m_impl->itemChange(change, value);
+}
+
+QMediaObject *QGraphicsVideoItemPrivate::mediaObject() const
+{
+    return m_mediaObject;
+}
+
+bool QGraphicsVideoItemPrivate::setMediaObject(QMediaObject *mediaObject)
+{
+    TRACE("QGraphicsVideoItemPrivate::setMediaObject" << qtThisPtr()
+          << "mediaObject" << mediaObject);
+    Q_Q(QGraphicsVideoItem);
+    bool bound = false;
+    if (m_mediaObject != mediaObject) {
+        m_rendererControlError = false;
+        destroyImpl();
+        m_mediaObject = mediaObject;
+        if (m_mediaObject) {
+            m_service = m_mediaObject->service();
+            if (m_service) {
+                connect(m_service, SIGNAL(destroyed()),
+                        q, SLOT(_q_serviceDestroyed()));
+                bound = true;
+                q->update();
+            }
+        }
+    }
+    return bound;
+}
+
+Qt::AspectRatioMode QGraphicsVideoItemPrivate::aspectRatioMode() const
+{
+    return m_aspectRatioMode;
+}
+
+void QGraphicsVideoItemPrivate::setAspectRatioMode(Qt::AspectRatioMode mode)
+{
+    TRACE("QGraphicsVideoItemPrivate::setAspectRatioMode" << qtThisPtr()
+          << "mode" << mode);
+    const bool changed = (m_aspectRatioMode != mode);
+    m_aspectRatioMode = mode;
+    if (changed && m_impl) {
+        m_impl->aspectRatioModeChanged();
+        m_impl->updateGeometry();
+    }
+}
+
+QPointF QGraphicsVideoItemPrivate::offset() const
+{
+    return m_rect.topLeft();
+}
+
+void QGraphicsVideoItemPrivate::setOffset(const QPointF &offset)
+{
+    TRACE("QGraphicsVideoItemPrivate::setOffset" << qtThisPtr()
+          << "offset" << offset);
+    const bool changed = (this->offset() != offset);
+    m_rect.setTopLeft(offset);
+    if (changed)
+        geometryChanged();
+}
+
+QSizeF QGraphicsVideoItemPrivate::size() const
+{
+    return m_rect.size();
+}
+
+void QGraphicsVideoItemPrivate::setSize(const QSizeF &size)
+{
+    TRACE("QGraphicsVideoItemPrivate::setSize" << qtThisPtr()
+          << "size" << size);
+    const bool changed = (this->size() != size);
+    m_rect.setSize(size);
+    if (changed)
+        geometryChanged();
+}
+
+QRectF QGraphicsVideoItemPrivate::boundingRect() const
+{
+    return m_boundingRect;
+}
+
+QSize QGraphicsVideoItemPrivate::nativeSize() const
+{
+    return m_nativeSize;
+}
+
+void QGraphicsVideoItemPrivate::prepareGeometryChange()
+{
+    VERBOSE_TRACE("QGraphicsVideoItemPrivate::prepareGeometryChange" << qtThisPtr());
+    Q_Q(QGraphicsVideoItem);
+    q->prepareGeometryChange();
+}
+
 void QGraphicsVideoItemPrivate::_q_present()
 {
-    // Not required for this implementation of QGraphicsVideoItem
+    VERBOSE_TRACE("QGraphicsVideoItemPrivate::_q_present" << qtThisPtr());
+    if (m_impl)
+        m_impl->present();
 }
 
 void QGraphicsVideoItemPrivate::_q_updateNativeSize()
 {
-    const QSize size = m_widgetControl ? m_widgetControl->property("nativeSize").value<QSize>() : QSize();
-    if (!size.isEmpty() && m_nativeSize != size) {
-        m_nativeSize = size;
-        updateGeometry();
-        emit q_ptr->nativeSizeChanged(m_nativeSize);
+    TRACE("QGraphicsVideoItemPrivate::_q_updateNativeSize" << qtThisPtr());
+    Q_Q(QGraphicsVideoItem);
+    const QSize oldNativeSize = m_nativeSize;
+    if (m_impl)
+        m_impl->updateNativeSize();
+    if (oldNativeSize != m_nativeSize) {
+        TRACE("QGraphicsVideoItemPrivate::_q_updateNativeSize" << qtThisPtr()
+              << "old" << oldNativeSize << "new" << m_nativeSize);
+        geometryChanged();
+        emit q->nativeSizeChanged(m_nativeSize);
     }
 }
 
 void QGraphicsVideoItemPrivate::_q_serviceDestroyed()
 {
-    m_widgetControl = 0;
+    TRACE("QGraphicsVideoItemPrivate::_q_serviceDestroyed" << qtThisPtr());
+    Q_Q(QGraphicsVideoItem);
+    if (m_service)
+        m_service->disconnect(q);
     m_service = 0;
+    destroyImpl();
+}
+
+QGraphicsVideoItemPrivate *QGraphicsVideoItemPrivate::getPtrHelper(QGraphicsVideoItem *item)
+{
+    return item->d_ptr;
+}
+
+void QGraphicsVideoItemPrivate::screenSizeChanged()
+{
+    m_screenSize = QApplication::desktop()->size();
+    TRACE("QGraphicsVideoItemPrivate::screenSizeChanged" << qtThisPtr()
+          << "size" << m_screenSize);
+    recreateImpl();
+}
+
+void QGraphicsVideoItemPrivate::rendererControlError()
+{
+    TRACE("QGraphicsVideoItemPrivate::rendererControlError" << qtThisPtr());
+    qWarning() << "QGraphicsVideoItem renderer error - falling back to direct rendering";
+    m_rendererControlError = true;
+    recreateImpl(true);
+}
+
+// Helper
+QString getPreferredRenderingPathHelper(const QObject *item)
+{
+    QString path;
+    const QObject *obj = item;
+    while (obj) {
+        VERBOSE_TRACE("QGraphicsVideoItemPrivate" << qtVoidPtr(item)
+                      << "ancestor" << qtVoidPtr(obj));
+        QVariant v = obj->property(PreferredRenderingPathProperty);
+        if (v.isValid()) {
+            const QString mode = v.toString();
+            if (mode == RenderingPathAuto ||
+                mode == RenderingPathRenderer ||
+                mode == RenderingPathDirect) {
+                VERBOSE_TRACE("QGraphicsVideoItemPrivate" << qtVoidPtr(item)
+                              << "preferred rendering path" << mode
+                              << "from ancestor" << qtVoidPtr(obj));
+                path = mode;
+                break;
+            }
+        }
+        obj = obj->parent();
+    }
+    return path;
+}
+
+inline QGraphicsVideoItemImplBase *QGraphicsVideoItemPrivate::impl()
+{
+    return reinterpret_cast<QGraphicsVideoItemImplBase *>(qGetPtrHelper(m_impl));
+}
+
+inline const QGraphicsVideoItemImplBase *QGraphicsVideoItemPrivate::impl() const
+{
+    return reinterpret_cast<const QGraphicsVideoItemImplBase *>(qGetPtrHelper(m_impl));
+}
+
+QString QGraphicsVideoItemPrivate::getPreferredRenderingPath() const
+{
+    QString path = getPreferredRenderingPathHelper(this);
+    if (path.isEmpty() && m_viewport)
+        path = getPreferredRenderingPathHelper(m_viewport);
+    if (path.isEmpty())
+        path = DefaultPreferredRenderingPath;
+    return path;
+}
+
+bool QGraphicsVideoItemPrivate::setViewport(QGraphicsView *view)
+{
+    bool changed = false;
+    if (view != m_viewport) {
+        TRACE("QGraphicsVideoItemPrivate::setViewport" << qtThisPtr()
+              << "view" << qtVoidPtr(view));
+        restoreViewportState();
+        m_viewport = view;
+        if (m_viewport)
+            m_savedViewportUpdateMode = m_viewport->viewportUpdateMode();
+        if (m_impl)
+            m_impl->viewportChanged();
+        changed = true;
+    }
+    return changed;
+}
+
+bool QGraphicsVideoItemPrivate::setTransform(const QTransform &transform)
+{
+    bool changed = false;
+    if (m_transform != transform) {
+        VERBOSE_TRACE("QGraphicsVideoItemPrivate::setTransform" << qtThisPtr());
+        m_transform = transform;
+        changed = true;
+    }
+    return changed;
+}
+
+bool QGraphicsVideoItemPrivate::setWidgetPaintDevice(bool widget)
+{
+    bool changed = false;
+    if (m_widgetPaintDevice != widget) {
+        VERBOSE_TRACE("QGraphicsVideoItemPrivate::setWidgetPaintDevice" << qtThisPtr()
+                      << "widget" << widget);
+        m_widgetPaintDevice = widget;
+        changed = true;
+    }
+    return changed;
+}
+
+void QGraphicsVideoItemPrivate::restoreViewportState()
+{
+    TRACE("QGraphicsVideoItemPrivate::restoreViewportState" << qtThisPtr()
+          << "viewport" << qtVoidPtr(m_viewport.data())
+          << "savedViewportUpdateMode" << m_savedViewportUpdateMode
+          << "viewportTransparencyEnabled" << m_viewportTransparencyEnabled);
+    if (m_viewport) {
+        m_viewport->setViewportUpdateMode(m_savedViewportUpdateMode);
+        if (m_viewportTransparencyEnabled)
+            m_viewport->window()->setAttribute(Qt::WA_TranslucentBackground, false);
+    }
+    m_viewportTransparencyEnabled = false;
+}
+
+void QGraphicsVideoItemPrivate::geometryChanged()
+{
+    Q_Q(QGraphicsVideoItem);
+    VERBOSE_TRACE("QGraphicsVideoItemPrivate::geometryChanged" << qtThisPtr());
+    m_geometryChanged = true;
+    q->update();
+}
+
+void QGraphicsVideoItemPrivate::determineGraphicsSystem()
+{
+    Q_ASSERT(m_graphicsSystem.isEmpty());
+    m_graphicsSystem = "raster";
+#ifndef QT_NO_EGL
+    if (EGL_NO_CONTEXT != eglGetCurrentContext()) {
+        const EGLenum api = eglQueryAPI();
+        if (EGL_OPENGL_ES_API == api)
+            m_graphicsSystem = "opengl";
+        else if (EGL_OPENVG_API == api)
+            m_graphicsSystem = "openvg";
+    }
+#endif
+    TRACE("QGraphicsVideoItemPrivate::determineGraphicsSystem" << qtThisPtr()
+          << "graphicsSystem" << m_graphicsSystem);
+}
+
+void QGraphicsVideoItemPrivate::destroyImpl()
+{
+    Q_Q(QGraphicsVideoItem);
+    if (m_impl) {
+        TRACE("QGraphicsVideoItemPrivate::destroyImpl" << qtThisPtr());
+        delete m_impl;
+        m_impl = 0;
+        m_isDirect = false;
+    }
+    q->setProperty(CurrentRenderingPathProperty, "");
+}
+
+bool QGraphicsVideoItemPrivate::useDirectMode() const
+{
+    Q_ASSERT(!m_graphicsSystem.isEmpty());
+    const bool rasterGraphicsSystem = ("raster" == m_graphicsSystem);
+    bool isFullScreen = false;
+    if (m_viewport) {
+        const QRectF boundingScreenRectF = m_transform.mapRect(m_rect);
+        QRect boundingScreenRect(boundingScreenRectF.topLeft().toPoint(), boundingScreenRectF.size().toSize());
+        boundingScreenRect = QRect(m_viewport->mapToGlobal(boundingScreenRect.topLeft()), boundingScreenRect.size());
+        QRect screenRect(QPoint(0,0), m_screenSize);
+        isFullScreen = (boundingScreenRect.intersected(screenRect).size() == m_screenSize);
+    }
+    const bool result = rasterGraphicsSystem
+                        || !m_serviceSupportsRendererControl
+                        || m_rendererControlError
+                        || (m_widgetPaintDevice
+                            && isFullScreen);
+    if (!m_impl || (result != m_isDirect))
+        TRACE("QGraphicsVideoItemPrivate::useDirectMode" << qtThisPtr()
+              << "d" << qtVoidPtr(m_impl)
+              << "isDirect" << m_isDirect
+              << "graphicsSystem" << m_graphicsSystem
+              << "serviceSupportsRendererControl" << m_serviceSupportsRendererControl
+              << "rendererControlError" << m_rendererControlError
+              << "widgetPaintDevice" << m_widgetPaintDevice
+              << "isFullScreen" << isFullScreen
+              << "result" << result);
+    return result;
+}
+
+void QGraphicsVideoItemPrivate::createImpl()
+{
+    const QString preferredRenderingPath = getPreferredRenderingPath();
+    TRACE("QGraphicsVideoItemPrivate::createImpl" << qtThisPtr()
+          << "preferredRenderingPath" << preferredRenderingPath);
+    bool widget = true;
+    if (RenderingPathRenderer == preferredRenderingPath)
+        widget = false;
+    else if (RenderingPathAuto == preferredRenderingPath)
+        widget = useDirectMode();
+    createImpl(widget);
 }
 
-void QGraphicsVideoItemPrivate::_q_mediaObjectDestroyed()
+void QGraphicsVideoItemPrivate::createImpl(bool direct)
 {
-    m_mediaObject = 0;
-    clearService();
-    q_ptr->update();
+    Q_ASSERT(!m_graphicsSystem.isEmpty());
+    TRACE("QGraphicsVideoItemPrivate::createImpl" << qtThisPtr()
+          << "graphicsSystem" << m_graphicsSystem << "direct" << direct);
+    Q_Q(QGraphicsVideoItem);
+    Q_ASSERT(!m_impl);
+    if ("opengl" != m_graphicsSystem && "openvg" != m_graphicsSystem && !direct) {
+        TRACE("QGraphicsVideoItemPrivate::createImpl" << qtThisPtr()
+              << "invalid graphics system - falling back to direct mode");
+        direct = true;
+    }
+    if (direct) {
+        m_impl = new QGraphicsVideoItemWidgetImpl(this);
+    } else {
+#ifndef QT_NO_EGL
+        QGraphicsVideoItemEglRendererImpl *renderer = new QGraphicsVideoItemEglRendererImpl(m_graphicsSystem, this);
+        if (renderer->hasRendererControl()) {
+            m_impl = renderer;
+        } else {
+            TRACE("QGraphicsVideoItemPrivate::createImpl" << qtThisPtr()
+                  << "failed to create QVideoRendererControl - falling back to QVideoWidgetControl");
+            // Avoid attempting to recreate QGraphicsVideoItemEglRendererImpl in future
+            m_serviceSupportsRendererControl = false;
+            delete renderer;
+            m_impl = new QGraphicsVideoItemWidgetImpl(this);
+        }
+#endif // QT_NO_EGL
+    }
+    Q_ASSERT(m_impl);
+    m_isDirect = (qobject_cast<QGraphicsVideoItemWidgetImpl *>(m_impl) != 0);
+    const QString currentPath = m_isDirect ? RenderingPathDirect : RenderingPathRenderer;
+    q->setProperty(CurrentRenderingPathProperty, currentPath);
+    m_impl->q_ptr = this;
+    TRACE("QGraphicsVideoItemPrivate::createImpl" << qtThisPtr() << "q" << qtVoidPtr(q)
+          << "isDirect" << m_isDirect << "currentPath" << currentPath);
+    q->update();
+}
+
+void QGraphicsVideoItemPrivate::recreateImpl(bool force)
+{
+    bool recreate = force;
+    bool direct = m_isDirect;
+    if (force)
+        destroyImpl();
+    if (force || ("auto" == getPreferredRenderingPath()))
+        direct = useDirectMode();
+    if (!recreate)
+        recreate = (m_impl && m_impl->isReadyToPaint()) && (direct != m_isDirect);
+    if (recreate) {
+        TRACE("QGraphicsVideoItemPrivate::recreateImpl" << qtThisPtr()
+              << "force" << force
+              << "isDirect" << m_isDirect
+              << "useDirectMode" << direct);
+        destroyImpl();
+        createImpl(direct);
+    }
 }
 
+
+//-----------------------------------------------------------------------------
+// QGraphicsVideoItem
+//-----------------------------------------------------------------------------
+
 QGraphicsVideoItem::QGraphicsVideoItem(QGraphicsItem *parent)
 :   QGraphicsObject(parent)
 ,   d_ptr(new QGraphicsVideoItemPrivate(this))
 {
+    d_ptr->q_ptr = this;
     setCacheMode(NoCache);
     setFlag(QGraphicsItem::ItemIgnoresParentOpacity);
     setFlag(QGraphicsItem::ItemSendsGeometryChanges);
@@ -513,7 +1364,7 @@ QGraphicsVideoItem::QGraphicsVideoItem(QGraphicsItem *parent)
 
 QGraphicsVideoItem::~QGraphicsVideoItem()
 {
-    delete d_ptr;
+
 }
 
 QMediaObject *QGraphicsVideoItem::mediaObject() const
@@ -553,7 +1404,7 @@ QSizeF QGraphicsVideoItem::size() const
 
 void QGraphicsVideoItem::setSize(const QSizeF &size)
 {
-    d_func()->setSize(size);
+    d_func()->setSize(size.isValid() ? size : QSizeF(0, 0));
 }
 
 QSizeF QGraphicsVideoItem::nativeSize() const
@@ -566,47 +1417,29 @@ QRectF QGraphicsVideoItem::boundingRect() const
     return d_func()->boundingRect();
 }
 
-void QGraphicsVideoItem::paint(
-        QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+void QGraphicsVideoItem::paint(QPainter *painter,
+                               const QStyleOptionGraphicsItem *option,
+                               QWidget *widget)
 {
-    Q_UNUSED(option);
     Q_D(QGraphicsVideoItem);
-    QGraphicsView *view = 0;
-    if (scene() && !scene()->views().isEmpty())
-        view = scene()->views().first();
-    d->setCurrentView(view);
-    d->setTransform(painter->combinedTransform());
-    if (widget && !widget->window()->testAttribute(Qt::WA_TranslucentBackground)) {
-        // On Symbian, setting Qt::WA_TranslucentBackground can cause the
-        // current window surface to be replaced.  Because of this, it cannot
-        // safely be changed from the context of the viewport paintEvent(), so we
-        // queue a custom event to set the attribute.
-        QEvent *event = new QEvent(UpdateViewportTransparencyEvent);
-        QCoreApplication::instance()->postEvent(d, event);
+    d->paint(painter, option, widget);
+#ifdef GRAPHICSVIDEOITEM_SHOW_RECTS
+    if (!boundingRect().isEmpty()) {
+        painter->save();
+        painter->setPen(QPen(Qt::white, 1.0, Qt::DashLine));
+        painter->drawRect(boundingRect());
+        painter->setPen(QPen(Qt::red, 1.0, Qt::DashLine));
+        painter->drawRect(d->m_rect);
+        painter->restore();
     }
-    const QPainter::CompositionMode oldCompositionMode = painter->compositionMode();
-    painter->setCompositionMode(QPainter::CompositionMode_Source);
-    const QColor color = d->hasContent() ? Qt::transparent : Qt::black;
-    painter->fillRect(d->boundingRect(), color);
-    painter->setCompositionMode(oldCompositionMode);
+#endif
 }
 
-QVariant QGraphicsVideoItem::itemChange(GraphicsItemChange change, const QVariant &value)
+QVariant QGraphicsVideoItem::itemChange(GraphicsItemChange change,
+                                        const QVariant &value)
 {
     Q_D(QGraphicsVideoItem);
-    switch (change) {
-    case ItemScenePositionHasChanged:
-        update(boundingRect());
-        break;
-    case ItemVisibleChange:
-        d->setVisible(value.toBool());
-        break;
-    case ItemZValueHasChanged:
-        d->updateWidgetOrdinalPosition();
-        break;
-    default:
-        break;
-    }
+    d->itemChange(change, value);
     return QGraphicsItem::itemChange(change, value);
 }
 
diff --git a/src/multimedia/qmediaresource.cpp b/src/multimedia/qmediaresource.cpp
index a0dddb1037..27618a6780 100644
--- a/src/multimedia/qmediaresource.cpp
+++ b/src/multimedia/qmediaresource.cpp
@@ -79,6 +79,8 @@ QT_BEGIN_NAMESPACE
 /*!
     \typedef QMediaResourceList
 
+    \relates QMediaResource
+
     Synonym for \c QList<QMediaResource>
 */
 
diff --git a/src/organizer/organizer.pro b/src/organizer/organizer.pro
index 49974997de..467f39ed93 100644
--- a/src/organizer/organizer.pro
+++ b/src/organizer/organizer.pro
@@ -1,6 +1,9 @@
 # #####################################################################
 # Organizer Mobility API
 # #####################################################################
+
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 
 # Target gets fixed up in common.pri
@@ -99,13 +102,13 @@ symbian {
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
 
-    TARGET.UID3 = 0x2002BFCD
+    TARGET.UID3 = $$mobilityUID(0x2002BFCD)
     
     LIBS += -lefsrv
 
     # ## Organizer
     # Main library
-    ORGANIZER_DEPLOYMENT.sources = QtOrganizer.dll
+    ORGANIZER_DEPLOYMENT.sources = QtOrganizer$${QT_LIBINFIX}.dll
     ORGANIZER_DEPLOYMENT.path = /sys/bin
     DEPLOYMENT += ORGANIZER_DEPLOYMENT
 }
diff --git a/src/organizer/qorganizercollectionengineid.cpp b/src/organizer/qorganizercollectionengineid.cpp
index 16195fa35c..cc230c9dc6 100644
--- a/src/organizer/qorganizercollectionengineid.cpp
+++ b/src/organizer/qorganizercollectionengineid.cpp
@@ -43,7 +43,7 @@
 
 /*!
   \class QOrganizerCollectionEngineId
-  \relates QOrganizerCollectionId
+  \sa QOrganizerCollectionId
   \brief The QOrganizerCollectionEngineId class uniquely identifies an item within a
   particular engine plugin.
   \since 1.1
diff --git a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pro b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pro
index 2fa0faba65..d47de1a531 100644
--- a/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pro
+++ b/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pro
@@ -1,7 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = app
-TARGET = qpspathmapperserver
+TARGET = qpspathmapperserver$${QT_LIBINFIX}
 QT = core
-TARGET.UID3 = 0x2002AC88
 
 CONFIG += no_icon
 
@@ -9,6 +10,7 @@ SOURCES += pspathmapperservermain.cpp
 
 include(../../../common.pri)
 
+TARGET.UID3 = $$mobilityUID(0x2002AC88)
 
 DEPENDPATH += ../xqsettingsmanager_symbian
 INCLUDEPATH += ../xqsettingsmanager_symbian\
diff --git a/src/publishsubscribe/publishsubscribe.pro b/src/publishsubscribe/publishsubscribe.pro
index fbcff71534..4b04b5222a 100644
--- a/src/publishsubscribe/publishsubscribe.pro
+++ b/src/publishsubscribe/publishsubscribe.pro
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 TARGET = QtPublishSubscribe
 QT = core
@@ -46,9 +48,9 @@ symbian {
     SOURCES += settingslayer_symbian.cpp
 
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x2002AC78
+    TARGET.UID3 = $$mobilityUID(0x2002AC78)
 
-    QtPublishSubscribeDeployment.sources = QtPublishSubscribe.dll qpspathmapperserver.exe
+    QtPublishSubscribeDeployment.sources = QtPublishSubscribe$${QT_LIBINFIX}.dll qpspathmapperserver$${QT_LIBINFIX}.exe
     QtPublishSubscribeDeployment.path = /sys/bin
     DEPLOYMENT += QtPublishSubscribeDeployment
 }
diff --git a/src/s60installs/bwins/QtLocationu.def b/src/s60installs/bwins/QtLocationu.def
index 51fa24787e..2bf7e534ab 100644
--- a/src/s60installs/bwins/QtLocationu.def
+++ b/src/s60installs/bwins/QtLocationu.def
@@ -1734,4 +1734,6 @@ EXPORTS
 	?minimumTilt@QGraphicsGeoMap@QtMobility@@QBEMXZ @ 1733 NONAME ; float QtMobility::QGraphicsGeoMap::minimumTilt(void) const
 	?replyFinished@QGeoTiledMapData@QtMobility@@AAEXPAVQGeoTiledMapReply@2@@Z @ 1734 NONAME ; void QtMobility::QGeoTiledMapData::replyFinished(class QtMobility::QGeoTiledMapReply *)
 	?bearing@QGraphicsGeoMap@QtMobility@@QBEMXZ @ 1735 NONAME ; float QtMobility::QGraphicsGeoMap::bearing(void) const
-
+    ?instance@QLocationNetworkAccessManagerFactory@QtMobility@@SAPAV12@XZ @ 1736 NONAME ; class QtMobility::QLocationNetworkAccessManagerFactory * QtMobility::QLocationNetworkAccessManagerFactory::instance(void)
+    ?setDeclarativeFactory@QLocationNetworkAccessManagerFactory@QtMobility@@QAEXPAVQDeclarativeNetworkAccessManagerFactory@@@Z @ 1737 NONAME ; void QtMobility::QLocationNetworkAccessManagerFactory::setDeclarativeFactory(class QDeclarativeNetworkAccessManagerFactory *)
+    ?create@QLocationNetworkAccessManagerFactory@QtMobility@@QAEPAVQNetworkAccessManager@@PAVQObject@@@Z @ 1738 NONAME ; class QNetworkAccessManager * QtMobility::QLocationNetworkAccessManagerFactory::create(class QObject *)
diff --git a/src/s60installs/deviceconfiguration/bld.inf b/src/s60installs/deviceconfiguration/bld.inf
index 3cf99b3683..c10f42fcae 100644
--- a/src/s60installs/deviceconfiguration/bld.inf
+++ b/src/s60installs/deviceconfiguration/bld.inf
@@ -35,14 +35,9 @@ mobilityconfig.prf                      /epoc32/tools/qt/mkspecs/features/mobili
 
 qtmobility.iby CORE_MW_LAYER_IBY_EXPORT_PATH(qtmobility.iby)
 
-qtmobility.confml         CONFML_EXPORT_PATH(qtmobility.confml,uda_content)
-qtmobility_copy.implml    CRML_EXPORT_PATH(qtmobility_copy.implml,uda_content)
-qtmobility.sisx           CRML_EXPORT_PATH(../content/sis/,uda_content)
 qtmobility_stub.sis       /epoc32/data/z/system/install/qtmobility_stub.sis
 
 ../../../bin/servicedbgen.exe    /epoc32/tools/servicedbgen.exe
-../../../features/qtservice.xml  /epoc32/tools/makefile_templates/qt/qtservice.xml
-../../../features/qtservice.flm  /epoc32/tools/makefile_templates/qt/qtservice.flm
 ../../../features/qtservice.prf  /epoc32/tools/qt/mkspecs/features/symbian/qtservice.prf
 
 PRJ_MMPFILES
diff --git a/src/s60installs/deviceconfiguration/qtmobility_stub.sis b/src/s60installs/deviceconfiguration/qtmobility_stub.sis
index c329df390a..35752a37bc 100644
--- a/src/s60installs/deviceconfiguration/qtmobility_stub.sis
+++ b/src/s60installs/deviceconfiguration/qtmobility_stub.sis
diff --git a/src/s60installs/deviceconfiguration/qtmobilitycontactssrv.iby b/src/s60installs/deviceconfiguration/qtmobilitycontactssrv.iby
new file mode 100644
index 0000000000..6405b6564c
--- /dev/null
+++ b/src/s60installs/deviceconfiguration/qtmobilitycontactssrv.iby
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not,
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
+*
+* Description: Qt Mobility Contact Service files in Symbian Belle release.
+*              In future releases these are under new sf/mw/contactssrv component.
+*
+*/
+
+#ifndef QTMOBILITYCONTACTSSRV_IBY
+#define QTMOBILITYCONTACTSSRV_IBY
+
+#include <bldvariant.hrh>
+#include <data_caging_paths_for_iby.hrh>
+
+#ifndef FF_QT_IN_UDA
+
+file=ABI_DIR\BUILD_DIR\qtcontacts_symbian.dll                                                      SHARED_LIB_DIR\qtcontacts_symbian.dll
+data=EPOCROOT##epoc32\data\z\resource\qt\plugins\contacts\qtcontacts_symbian.qtplugin              resource\qt\plugins\contacts\qtcontacts_symbian.qtplugin
+file=ABI_DIR\BUILD_DIR\qtcontacts_symbiansim.dll                                                   SHARED_LIB_DIR\qtcontacts_symbiansim.dll
+data=EPOCROOT##epoc32\data\z\resource\qt\plugins\contacts\qtcontacts_symbiansim.qtplugin           resource\qt\plugins\contacts\qtcontacts_symbiansim.qtplugin
+file=ABI_DIR\BUILD_DIR\cntversitfavoriteplugin.dll                                                 SHARED_LIB_DIR\cntversitfavoriteplugin.dll
+data=EPOCROOT##epoc32\data\z\resource\qt\plugins\versit\cntversitfavoriteplugin.qtplugin           resource\qt\plugins\versit\cntversitfavoriteplugin.qtplugin
+file=ABI_DIR\BUILD_DIR\cntversitlandlineplugin.dll                                                 SHARED_LIB_DIR\cntversitlandlineplugin.dll
+data=EPOCROOT##epoc32\data\z\resource\qt\plugins\versit\cntversitlandlineplugin.qtplugin           resource\qt\plugins\versit\cntversitlandlineplugin.qtplugin
+file=ABI_DIR\BUILD_DIR\cntversitmycardplugin.dll                                                   SHARED_LIB_DIR\cntversitmycardplugin.dll
+data=EPOCROOT##epoc32\data\z\resource\qt\plugins\versit\cntversitmycardplugin.qtplugin             resource\qt\plugins\versit\cntversitmycardplugin.qtplugin
+file=ABI_DIR\BUILD_DIR\cntversitprefplugin.dll                                                     SHARED_LIB_DIR\cntversitprefplugin.dll
+data=EPOCROOT##epoc32\data\z\resource\qt\plugins\versit\cntversitprefplugin.qtplugin               resource\qt\plugins\versit\cntversitprefplugin.qtplugin
+
+#endif // FF_QT_IN_UDA
+
+#endif // QTMOBILITYCONTACTSSRV_IBY
diff --git a/src/s60installs/deviceconfiguration/symbian3_config.pri b/src/s60installs/deviceconfiguration/symbian3_config.pri
index a2e8d2dbb0..796cb60695 100644
--- a/src/s60installs/deviceconfiguration/symbian3_config.pri
+++ b/src/s60installs/deviceconfiguration/symbian3_config.pri
@@ -17,7 +17,7 @@ mobility_modules = bearer location contacts systeminfo publishsubscribe versit m
 contains(mobility_modules,versit): mobility_modules *= contacts
 contains(mobility_modules,connectivity): mobility_modules *= serviceframework
 lbt_enabled = yes
-location_fix_enabled = no
+location_fix_enabled = yes
 snap_enabled = yes
 occ_enabled = yes
 symbianenote_enabled = no
@@ -34,12 +34,13 @@ radioutility_s60_enabled = yes
 openmaxal_symbian_enabled = no
 surfaces_s60_enabled = yes
 messaging_freestyle_enabled = yes
-messaging_freestyle_mapi12_enabled = no
+messaging_freestyle_mapi12_enabled = yes
 callinformation_symbian_enabled = yes
 immersion_enabled = no
 symbian_camera_camautofocus_enabled = no
 symbian_camera_ecamadvsettings_enabled = yes
 symbian_camera_devvideorecord_enabled = yes
+symbian_camera_snapshot_enabled = yes
 advancedtouchfeedback_enabled = yes
 chwrmhaptics_enabled = yes
 mds_enabled = yes
@@ -49,3 +50,10 @@ nfc_symbian_enabled = yes
 btengconnman_symbian_enabled = yes
 btengdevman_symbian_enabled = yes
 MOBILITY_SD_MCL_BUILD = yes
+LockandFlipPSkeys_enabled = yes
+DiskNotifyClient_enabled = yes
+thermalstatus_symbian_enabled = yes
+FmTxClient_enabled = yes
+etelpacketservice_symbian_enabled = yes
+networkhandlingengine_symbian_enabled = yes
+
diff --git a/src/s60installs/eabi/QtLocationu.def b/src/s60installs/eabi/QtLocationu.def
index d6d27411d0..37ed0e157c 100644
--- a/src/s60installs/eabi/QtLocationu.def
+++ b/src/s60installs/eabi/QtLocationu.def
@@ -1796,4 +1796,6 @@ EXPORTS
 	_ZTIN10QtMobility29QGeoPositionInfoSourceFactoryE @ 1795 NONAME ; #<TI>#
 	_ZTVN10QtMobility19QGeoMapCustomObjectE @ 1796 NONAME ; #<VT>#
 	_ZTVN10QtMobility29QGeoPositionInfoSourceFactoryE @ 1797 NONAME ; #<VT>#
-
+    _ZN10QtMobility36QLocationNetworkAccessManagerFactory8instanceEv @ 1798 NONAME
+    _ZN10QtMobility36QLocationNetworkAccessManagerFactory21setDeclarativeFactoryEP39QDeclarativeNetworkAccessManagerFactory @ 1799 NONAME
+    _ZN10QtMobility36QLocationNetworkAccessManagerFactory6createEP7QObject @ 1800 NONAME
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index a774042bc0..ffadf7efdc 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -1,13 +1,14 @@
 TEMPLATE = subdirs
 
-isEmpty(QT_LIBINFIX):symbian {
+symbian {
     include(../../staticconfig.pri)
+    include(../../features/utils.pri)
     load(data_caging_paths)
     include($$QT_MOBILITY_BUILD_TREE/config.pri)
 
     SUBDIRS =
-    TARGET = "QtMobility"
-    TARGET.UID3 = 0x2002ac89
+    TARGET = "QtMobility$${QT_LIBINFIX}"
+    TARGET.UID3 = $$mobilityUID(0x2002AC89)
 
     VERSION = 1.2.2
 
@@ -66,20 +67,20 @@ isEmpty(QT_LIBINFIX):symbian {
     #see $QTDIR/mkspecs/common/symbian/symbian.conf for details
     exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) {
         pkg_version = $$replace(VERSION,"\\.",",")
-        qtmobilitydeployment.pkg_prerules += "$${LITERAL_HASH}{\"QtMobility\"},(0x2002AC89),$${pkg_version},TYPE=SA,RU,NR"
+        qtmobilitydeployment.pkg_prerules += "$${LITERAL_HASH}{\"QtMobility$${QT_LIBINFIX}\"},($${TARGET.UID3}),$${pkg_version},TYPE=SA,RU,NR"
     }
 
     contains(mobility_modules, messaging) {
         qtmobilitydeployment.sources += \
-        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtMessaging.dll
+        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtMessaging$${QT_LIBINFIX}.dll
 
         contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_messaging.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_messaging$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\messaging\\qmakepluginstubs\\declarative_messaging.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\messaging\\declarative_messaging.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\messaging\\qmakepluginstubs\\declarative_messaging$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\messaging\\declarative_messaging$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\messaging\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\messaging\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\messaging\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\messaging\\qmldir\""
         }
     }
     
@@ -97,24 +98,24 @@ isEmpty(QT_LIBINFIX):symbian {
         # - S60 3.1 and 3.2 build only produces a stub library.
         connectivity = \
             "IF package(0x20022E6D) AND exists(\"z:\\sys\\bin\\nfc.dll\")" \
-            "    \"$${EPOCROOT_S3PS2}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity.dll\" - \"!:\\sys\\bin\\QtConnectivity.dll\"" \
+            "    \"$${EPOCROOT_S3PS2}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtConnectivity$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x20022E6D)" \
-            "    \"$${EPOCROOT_S3PS1}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity.dll\" - \"!:\\sys\\bin\\QtConnectivity.dll\"" \
+            "    \"$${EPOCROOT_S3PS1}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtConnectivity$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x1028315F)" \
-            "    \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity.dll\" - \"!:\\sys\\bin\\QtConnectivity.dll\"" \
+            "    \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtConnectivity$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102752AE) OR package(0x102032BE)" \
-            "    \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity.dll\" - \"!:\\sys\\bin\\QtConnectivity.dll\"" \
+            "    \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtConnectivity$${QT_LIBINFIX}.dll\"" \
             "ELSE" \
-            "    \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity.dll\" - \"!:\\sys\\bin\\QtConnectivity.dll\"" \
+            "    \"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/QtConnectivity$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtConnectivity$${QT_LIBINFIX}.dll\"" \
             "ENDIF"
 
         contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_connectivity.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_connectivity$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\connectivity\\qmakepluginstubs\\declarative_connectivity.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\connectivity\\declarative_connectivity.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\connectivity\\qmakepluginstubs\\declarative_connectivity$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\connectivity\\declarative_connectivity$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\connectivity\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\connectivity\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\connectivity\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\connectivity\\qmldir\""
         }
 
 
@@ -123,147 +124,147 @@ isEmpty(QT_LIBINFIX):symbian {
 
     contains(mobility_modules, serviceframework) { 
         qtmobilitydeployment.sources += \
-        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtServiceFramework.dll \
-        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qsfwdatabasemanagerserver.exe
+        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtServiceFramework$${QT_LIBINFIX}.dll \
+        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qsfwdatabasemanagerserver$${QT_LIBINFIX}.exe
         contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_serviceframework.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_serviceframework$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\serviceframework\\qmakepluginstubs\\declarative_serviceframework.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\serviceframework\\declarative_serviceframework.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\serviceframework\\qmakepluginstubs\\declarative_serviceframework$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\serviceframework\\declarative_serviceframework$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\serviceframework\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\serviceframework\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\serviceframework\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\serviceframework\\qmldir\""
         }
     }
 
     contains(mobility_modules, location) {
-        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtLocation.dll
-        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtgeoservices_nokia.dll
-        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtlandmarks_symbian.dll
-        pluginstubs += "\"$$QT_MOBILITY_BUILD_TREE/plugins/geoservices/nokia/qmakepluginstubs/qtgeoservices_nokia.qtplugin\" - \"!:\\resource\\qt\\plugins\\geoservices\\qtgeoservices_nokia.qtplugin\""
-        pluginstubs += "\"$$QT_MOBILITY_BUILD_TREE/plugins/landmarks/symbian_landmarks/qmakepluginstubs/qtlandmarks_symbian.qtplugin\" - \"!:\\resource\\qt\\plugins\\landmarks\\qtlandmarks_symbian.qtplugin\""
+        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtLocation$${QT_LIBINFIX}.dll
+        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtgeoservices_nokia$${QT_LIBINFIX}.dll
+        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtlandmarks_symbian$${QT_LIBINFIX}.dll
+        pluginstubs += "\"$$QT_MOBILITY_BUILD_TREE/plugins/geoservices/nokia/qmakepluginstubs/qtgeoservices_nokia$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\geoservices\\qtgeoservices_nokia$${QT_LIBINFIX}.qtplugin\""
+        pluginstubs += "\"$$QT_MOBILITY_BUILD_TREE/plugins/landmarks/symbian_landmarks/qmakepluginstubs/qtlandmarks_symbian$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\landmarks\\qtlandmarks_symbian$${QT_LIBINFIX}.qtplugin\""
         contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_location.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_location$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\location\\qmakepluginstubs\\declarative_location.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\location\\declarative_location.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\location\\qmakepluginstubs\\declarative_location$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\location\\declarative_location$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\location\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\location\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\location\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\location\\qmldir\""
         }
     }
 
     contains(mobility_modules, systeminfo) { 
         sysinfo = \
             "IF package(0x1028315F)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtSystemInfo.dll\" - \"!:\\sys\\bin\\QtSystemInfo.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtSystemInfo$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtSystemInfo$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102032BE)" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/QtSystemInfo.dll\" - \"!:\\sys\\bin\\QtSystemInfo.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/QtSystemInfo$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtSystemInfo$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102752AE)" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/QtSystemInfo.dll\" - \"!:\\sys\\bin\\QtSystemInfo.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/QtSystemInfo$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtSystemInfo$${QT_LIBINFIX}.dll\"" \
             "ELSE" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtSystemInfo.dll\" - \"!:\\sys\\bin\\QtSystemInfo.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtSystemInfo$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtSystemInfo$${QT_LIBINFIX}.dll\"" \
             "ENDIF"
 
         qtmobilitydeployment.pkg_postrules += sysinfo
         contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_systeminfo.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_systeminfo$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\systeminfo\\qmakepluginstubs\\declarative_systeminfo.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\systeminfo\\declarative_systeminfo.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\systeminfo\\qmakepluginstubs\\declarative_systeminfo$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\systeminfo\\declarative_systeminfo$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\systeminfo\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\systeminfo\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\systeminfo\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\systeminfo\\qmldir\""
         }
     }
 
     contains(mobility_modules, publishsubscribe) {
         qtmobilitydeployment.sources += \
-        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtPublishSubscribe.dll \
-        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qpspathmapperserver.exe
+        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtPublishSubscribe$${QT_LIBINFIX}.dll \
+        $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qpspathmapperserver$${QT_LIBINFIX}.exe
         contains(QT_CONFIG, declarative) {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_publishsubscribe.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_publishsubscribe$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\publishsubscribe\\qmakepluginstubs\\declarative_publishsubscribe.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\publishsubscribe\\declarative_publishsubscribe.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\publishsubscribe\\qmakepluginstubs\\declarative_publishsubscribe$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\publishsubscribe\\declarative_publishsubscribe$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\publishsubscribe\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\publishsubscribe\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\publishsubscribe\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\publishsubscribe\\qmldir\""
         }
     }
 
     contains(mobility_modules, versit) {
-        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtVersit.dll
-        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtversit_backuphandler.dll
+        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtVersit$${QT_LIBINFIX}.dll
+        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtversit_backuphandler$${QT_LIBINFIX}.dll
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\versit\\backuphandler\\qmakepluginstubs\\qtversit_backuphandler.qtplugin\"  - \"!:\\resource\\qt\\plugins\\versit\\qtversit_backuphandler.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\versit\\backuphandler\\qmakepluginstubs\\qtversit_backuphandler$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\versit\\qtversit_backuphandler$${QT_LIBINFIX}.qtplugin\""
 
         ## now the versit organizer module - depends on versit and organizer.
         contains(mobility_modules, organizer) {
-            qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtVersitOrganizer.dll
+            qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtVersitOrganizer$${QT_LIBINFIX}.dll
         }
     }
 
     contains(mobility_modules, feedback) {
-        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtFeedback.dll
+        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtFeedback$${QT_LIBINFIX}.dll
         contains(immersion_enabled, yes) {
-            qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_immersion.dll
+            qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_immersion$${QT_LIBINFIX}.dll
             pluginstubs += \
-                "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\feedback\\immersion\\qmakepluginstubs\\qtfeedback_immersion.qtplugin\"  - \"!:\\resource\\qt\\plugins\\feedback\\qtfeedback_immersion.qtplugin\""
+                "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\feedback\\immersion\\qmakepluginstubs\\qtfeedback_immersion$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\feedback\\qtfeedback_immersion$${QT_LIBINFIX}.qtplugin\""
         }
 
         equals(QT_MAJOR_VERSION, 4) : greaterThan(QT_MINOR_VERSION, 6):contains(mobility_modules,multimedia) {
-            qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_mmk.dll
+            qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_mmk$${QT_LIBINFIX}.dll
             pluginstubs += \
-                "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\feedback\\mmk\\qmakepluginstubs\\qtfeedback_mmk.qtplugin\"  - \"!:\\resource\\qt\\plugins\\feedback\\qtfeedback_mmk.qtplugin\""
+                "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\feedback\\mmk\\qmakepluginstubs\\qtfeedback_mmk$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\feedback\\qtfeedback_mmk$${QT_LIBINFIX}.qtplugin\""
         }
 
         feedback = \
             "IF package(0x1028315F)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_symbian.dll\" - \"!:\\sys\\bin\\qtfeedback_symbian.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtfeedback_symbian$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102752AE)" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_symbian.dll\" - \"!:\\sys\\bin\\qtfeedback_symbian.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtfeedback_symbian$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102032BE)" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_symbian.dll\" - \"!:\\sys\\bin\\qtfeedback_symbian.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtfeedback_symbian$${QT_LIBINFIX}.dll\"" \
             "ELSE" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_symbian.dll\" - \"!:\\sys\\bin\\qtfeedback_symbian.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtfeedback_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtfeedback_symbian$${QT_LIBINFIX}.dll\"" \
             "ENDIF"
 
         qtmobilitydeployment.pkg_postrules += feedback
 
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\feedback\\symbian\\qmakepluginstubs\\qtfeedback_symbian.qtplugin\"  - \"!:\\resource\\qt\\plugins\\feedback\\qtfeedback_symbian.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\feedback\\symbian\\qmakepluginstubs\\qtfeedback_symbian$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\feedback\\qtfeedback_symbian$${QT_LIBINFIX}.qtplugin\""
 
         contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-                $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_feedback.dll
+                $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_feedback$${QT_LIBINFIX}.dll
             pluginstubs += \
-                "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\feedback\\qmakepluginstubs\\declarative_feedback.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\feedback\\declarative_feedback.qtplugin\""
+                "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\feedback\\qmakepluginstubs\\declarative_feedback$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\feedback\\declarative_feedback$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-                "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\feedback\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\feedback\\qmldir\""
+                "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\feedback\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\feedback\\qmldir\""
         }
     }
 
     contains(mobility_modules, organizer) { 
-        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtOrganizer.dll   
+        qtmobilitydeployment.sources += $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtOrganizer$${QT_LIBINFIX}.dll   
         organizer = \
             "IF package(0x1028315F)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtorganizer_symbian.dll\" - \"!:\\sys\\bin\\qtorganizer_symbian.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtorganizer_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtorganizer_symbian$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102752AE)" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtorganizer_symbian.dll\" - \"!:\\sys\\bin\\qtorganizer_symbian.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtorganizer_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtorganizer_symbian$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102032BE)" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtorganizer_symbian.dll\" - \"!:\\sys\\bin\\qtorganizer_symbian.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtorganizer_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtorganizer_symbian$${QT_LIBINFIX}.dll\"" \
             "ELSE" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtorganizer_symbian.dll\" - \"!:\\sys\\bin\\qtorganizer_symbian.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtorganizer_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtorganizer_symbian$${QT_LIBINFIX}.dll\"" \
             "ENDIF"
 
         qtmobilitydeployment.pkg_postrules += organizer
 
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\organizer\\symbian\\qmakepluginstubs\\qtorganizer_symbian.qtplugin\"  - \"!:\\resource\\qt\\plugins\\organizer\\qtorganizer_symbian.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\organizer\\symbian\\qmakepluginstubs\\qtorganizer_symbian$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\organizer\\qtorganizer_symbian$${QT_LIBINFIX}.qtplugin\""
      contains(QT_CONFIG, declarative):contains(mobility_modules,versit)  {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_organizer.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_organizer$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\organizer\\qmakepluginstubs\\declarative_organizer.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\organizer\\declarative_organizer.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\organizer\\qmakepluginstubs\\declarative_organizer$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\organizer\\declarative_organizer$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\organizer\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\organizer\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\organizer\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\organizer\\qmldir\""
         }
     }
 
@@ -277,15 +278,15 @@ isEmpty(QT_LIBINFIX):symbian {
         # Also if checked mds library is present on c-drive then also check whether mds is installed
         gallerymdscheck = \
             "if exists(\"z:\sys\bin\locationutility.dll\")" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery.dll\" - \"!:\\sys\\bin\\QtGallery.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtGallery$${QT_LIBINFIX}.dll\"" \
             "elseif exists(\"c:\sys\bin\locationutility.dll\") AND package(0x200009F5)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery.dll\" - \"!:\\sys\\bin\\QtGallery.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtGallery$${QT_LIBINFIX}.dll\"" \
             "elseif exists(\"z:\sys\bin\locationmanagerserver.exe\")" \
-            "   \"$${EPOCROOT51}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery.dll\" - \"!:\\sys\\bin\\QtGallery.dll\"" \
+            "   \"$${EPOCROOT51}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtGallery$${QT_LIBINFIX}.dll\"" \
             "elseif exists(\"c:\sys\bin\locationmanagerserver.exe\") AND package(0x200009F5)" \
-            "   \"$${EPOCROOT51}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery.dll\" - \"!:\\sys\\bin\\QtGallery.dll\"" \
+            "   \"$${EPOCROOT51}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtGallery$${QT_LIBINFIX}.dll\"" \
             "else" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery.dll\" - \"!:\\sys\\bin\\QtGallery.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/QtGallery$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtGallery$${QT_LIBINFIX}.dll\"" \
             "endif"
 
         qtmobilitydeployment.pkg_postrules += gallerymdscheck
@@ -293,24 +294,24 @@ isEmpty(QT_LIBINFIX):symbian {
         # QDocumentGallery QML plugin
         contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_gallery.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_gallery$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\gallery\\qmakepluginstubs\\declarative_gallery.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\gallery\\declarative_gallery.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\gallery\\qmakepluginstubs\\declarative_gallery$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\gallery\\declarative_gallery$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\gallery\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\gallery\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\gallery\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\gallery\\qmldir\""
         }
     }
 
     contains(mobility_modules, bearer) {
         bearer = \
             "IF package(0x1028315F)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtBearer$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102752AE)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtBearer$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102032BE)" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtBearer$${QT_LIBINFIX}.dll\"" \
             "ELSE" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer.dll\" - \"!:\\sys\\bin\\QtBearer.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtBearer$${QT_LIBINFIX}.dll\"" \
             "ENDIF"
 
         qtmobilitydeployment.pkg_postrules += bearer
@@ -319,14 +320,14 @@ isEmpty(QT_LIBINFIX):symbian {
     contains(mobility_modules, bearer) {
             !contains(MOBILITY_SD_MCL_BUILD, yes):exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/data/z/system/install/series60v5.2.sis)|exists($${EPOCROOT}epoc32/release/armv5/lib/libstdcppv5.dso) {
             bearer10_0 = \ 
-	    "IF package(0x1028315F)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer{000a0000}.dll\" - \"!:\\sys\\bin\\QtBearer{000a0000}.dll\"" \
+        "IF package(0x1028315F)" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer{000a0000}$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtBearer{000a0000}$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x102752AE)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer{000a0000}.dll\" - \"!:\\sys\\bin\\QtBearer{000a0000}.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer{000a0000}$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtBearer{000a0000}$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x102032BE)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer{000a0000}.dll\" - \"!:\\sys\\bin\\QtBearer{000a0000}.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer{000a0000}$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtBearer{000a0000}$${QT_LIBINFIX}.dll\"" \
                 "ELSE" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer{000a0000}.dll\" - \"!:\\sys\\bin\\QtBearer{000a0000}.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtBearer{000a0000}$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\QtBearer{000a0000}$${QT_LIBINFIX}.dll\"" \
                 "ENDIF"
             qtmobilitydeployment.pkg_postrules += bearer10_0
         }
@@ -335,44 +336,45 @@ isEmpty(QT_LIBINFIX):symbian {
     contains(mobility_modules, contacts) {
 
         qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtContacts.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtContacts$${QT_LIBINFIX}.dll
         contains(mobility_modules,serviceframework):qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_serviceactionmanager.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_serviceactionmanager$${QT_LIBINFIX}.dll
 
         !exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.4.sis){
             contacts = \
                 "IF package(0x1028315F)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x102752AE)" \
-                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian.dll\"" \
+                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x102032BE)" \
-                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian.dll\"" \
+                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian$${QT_LIBINFIX}.dll\"" \
                 "ELSE" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbian$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtcontacts_symbian$${QT_LIBINFIX}.dll\"" \
                 "ENDIF"
 
             qtmobilitydeployment.pkg_postrules += contacts
 
             pluginstubs += \
-                "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbian/plugin/qmakepluginstubs/qtcontacts_symbian.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\qtcontacts_symbian.qtplugin\""
-            }
+                "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbian/plugin/qmakepluginstubs/qtcontacts_symbian$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\contacts\\qtcontacts_symbian$${QT_LIBINFIX}.qtplugin\""
+        }
+
         contains(mobility_modules,serviceframework):pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/serviceactionmanager/qmakepluginstubs/qtcontacts_serviceactionmanager.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\qtcontacts_serviceactionmanager.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/serviceactionmanager/qmakepluginstubs/qtcontacts_serviceactionmanager$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\contacts\\qtcontacts_serviceactionmanager$${QT_LIBINFIX}.qtplugin\""
 
         !exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.4.sis){
             contains(symbiancntsim_enabled, yes) {
                 pluginstubs += \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbiansim/qmakepluginstubs/qtcontacts_symbiansim.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\qtcontacts_symbiansim.qtplugin\""
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/contacts/symbiansim/qmakepluginstubs/qtcontacts_symbiansim$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt\\plugins\\contacts\\qtcontacts_symbiansim$${QT_LIBINFIX}.qtplugin\""
 
                 symbiancntsim = \
                     "IF package(0x1028315F)" \
-                    "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim.dll\"" \
+                    "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim$${QT_LIBINFIX}.dll\"" \
                     "ELSEIF package(0x102752AE)" \
-                    "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim.dll\"" \
+                    "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim$${QT_LIBINFIX}.dll\"" \
                     "ELSEIF package(0x102032BE)" \
-                    "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim.dll\"" \
+                    "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim$${QT_LIBINFIX}.dll\"" \
                     "ELSE" \
-                    "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim.dll\"" \
+                    "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtcontacts_symbiansim$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtcontacts_symbiansim$${QT_LIBINFIX}.dll\"" \
                     "ENDIF"
 
                 qtmobilitydeployment.pkg_postrules += symbiancntsim
@@ -380,82 +382,82 @@ isEmpty(QT_LIBINFIX):symbian {
         }
      contains(QT_CONFIG, declarative):contains(mobility_modules,versit)  {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_contacts.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_contacts$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\contacts\\qmakepluginstubs\\declarative_contacts.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\contacts\\declarative_contacts.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\contacts\\qmakepluginstubs\\declarative_contacts$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\contacts\\declarative_contacts$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\contacts\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\contacts\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\contacts\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\contacts\\qmldir\""
         }
     }
 
     contains(mobility_modules, multimedia) {
 
         qtmobilitydeployment.sources += \
-            $$(EPOCROOT50)epoc32/release/$(PLATFORM)/$(TARGET)/QtMultimediaKit.dll \
-            $$(EPOCROOT50)epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_m3u.dll
+            $$(EPOCROOT50)epoc32/release/$(PLATFORM)/$(TARGET)/QtMultimediaKit$${QT_LIBINFIX}.dll \
+            $$(EPOCROOT50)epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_m3u$${QT_LIBINFIX}.dll
 
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/m3u/qmakepluginstubs/qtmultimediakit_m3u.qtplugin\"     - \"!:\\resource\\qt\\plugins\\playlistformats\\qtmultimediakit_m3u.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/m3u/qmakepluginstubs/qtmultimediakit_m3u$${QT_LIBINFIX}.qtplugin\"     - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\playlistformats\\qtmultimediakit_m3u$${QT_LIBINFIX}.qtplugin\""
 
         contains(openmaxal_symbian_enabled, yes) {
             openmax = \
-                "\"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_openmaxalengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_openmaxalengine.dll\""
+                "\"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_openmaxalengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_openmaxalengine$${QT_LIBINFIX}.dll\""
 
             qtmobilitydeployment.pkg_postrules += openmax
 
             pluginstubs += \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/openmaxal/qmakepluginstubs/qtmultimediakit_openmaxalengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_openmaxalengine.qtplugin\""
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/openmaxal/qmakepluginstubs/qtmultimediakit_openmaxalengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_openmaxalengine$${QT_LIBINFIX}.qtplugin\""
         } else {
 
             multimedia = \
                 "IF package(0x1028315F)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x102752AE)" \
-                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine.dll\"" \
+                "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x102032BE)" \
-                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine.dll\"" \
+                "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\"" \
                 "ELSEIF package(0x20022E6D)" \
-                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine.dll\"" \
+                "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.dll\"" \
                 "ENDIF"
 
             qtmobilitydeployment.pkg_postrules += multimedia
 
             pluginstubs += \
                 "IF package(0x1028315F)" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_mmfengine.qtplugin\"" \
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\"" \
                 "ELSEIF package(0x102752AE)" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_mmfengine.qtplugin\"" \
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\"" \
                 "ELSEIF package(0x102032BE)" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_mmfengine.qtplugin\"" \
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\"" \
                 "ELSEIF package(0x20022E6D)" \
-                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_mmfengine.qtplugin\"" \
+                    "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/mmf/qmakepluginstubs/qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_mmfengine$${QT_LIBINFIX}.qtplugin\"" \
                 "ENDIF"
         }
 
         camera = \
             "IF package(0x1028315F)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102752AE)" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102032BE)" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x20022E6D)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.dll\"" \
             "ENDIF"
 
         qtmobilitydeployment.pkg_postrules += camera
 
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/ecam/qmakepluginstubs/qtmultimediakit_ecamengine.qtplugin\" - \"!:\\resource\\qt\\plugins\\mediaservice\\qtmultimediakit_ecamengine.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/multimedia/symbian/ecam/qmakepluginstubs/qtmultimediakit_ecamengine$${QT_LIBINFIX}.qtplugin\" - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\mediaservice\\qtmultimediakit_ecamengine$${QT_LIBINFIX}.qtplugin\""
 
 
     contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_multimedia.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_multimedia$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmakepluginstubs\\declarative_multimedia.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMultimediaKit\\declarative_multimedia.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmakepluginstubs\\declarative_multimedia$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMultimediaKit\\declarative_multimedia$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMultimediaKit\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\multimedia\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMultimediaKit\\qmldir\""
         }
     }
 
@@ -470,35 +472,35 @@ isEmpty(QT_LIBINFIX):symbian {
         }
 
         qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtSensors.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/QtSensors$${QT_LIBINFIX}.dll
 
         sensors = \
             "IF package(0x1028315F)" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_sym.dll\" - \"!:\\sys\\bin\\qtsensors_sym.dll\"" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic.dll\" - \"!:\\sys\\bin\\qtsensors_generic.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_sym$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtsensors_sym$${QT_LIBINFIX}.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtsensors_generic$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102752AE)" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_sym.dll\" - \"!:\\sys\\bin\\qtsensors_sym.dll\"" \
-            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic.dll\" - \"!:\\sys\\bin\\qtsensors_generic.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_sym$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtsensors_sym$${QT_LIBINFIX}.dll\"" \
+            "   \"$${EPOCROOT32}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtsensors_generic$${QT_LIBINFIX}.dll\"" \
             "ELSEIF package(0x102032BE)" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_sym.dll\" - \"!:\\sys\\bin\\qtsensors_sym.dll\"" \
-            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic.dll\" - \"!:\\sys\\bin\\qtsensors_generic.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_sym$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtsensors_sym$${QT_LIBINFIX}.dll\"" \
+            "   \"$${EPOCROOT31}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtsensors_generic$${QT_LIBINFIX}.dll\"" \
             "ELSE" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_sym.dll\" - \"!:\\sys\\bin\\qtsensors_sym.dll\"" \
-            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic.dll\" - \"!:\\sys\\bin\\qtsensors_generic.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_sym$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtsensors_sym$${QT_LIBINFIX}.dll\"" \
+            "   \"$${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/qtsensors_generic$${QT_LIBINFIX}.dll\" - \"!:\\sys\\bin\\qtsensors_generic$${QT_LIBINFIX}.dll\"" \
             "ENDIF"
 
         pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/$$sensorplugin/qmakepluginstubs/qtsensors_sym.qtplugin\"  - \"!:\\resource\\qt\\plugins\\sensors\\qtsensors_sym.qtplugin\"" \
-            "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/generic/qmakepluginstubs/qtsensors_generic.qtplugin\"  - \"!:\\resource\\qt\\plugins\\sensors\\qtsensors_generic.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/$$sensorplugin/qmakepluginstubs/qtsensors_sym$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\sensors\\qtsensors_sym$${QT_LIBINFIX}.qtplugin\"" \
+            "\"$$QT_MOBILITY_BUILD_TREE/plugins/sensors/generic/qmakepluginstubs/qtsensors_generic$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\plugins\\sensors\\qtsensors_generic$${QT_LIBINFIX}.qtplugin\""
 
         !isEmpty(sensors):qtmobilitydeployment.pkg_postrules += sensors
         contains(QT_CONFIG, declarative): {
             qtmobilitydeployment.sources += \
-            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_sensors.dll
+            $${EPOCROOT50}epoc32/release/$(PLATFORM)/$(TARGET)/declarative_sensors$${QT_LIBINFIX}.dll
             pluginstubs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\sensors\\qmakepluginstubs\\declarative_sensors.qtplugin\"  - \"!:\\resource\\qt\\imports\\QtMobility\\sensors\\declarative_sensors.qtplugin\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\sensors\\qmakepluginstubs\\declarative_sensors$${QT_LIBINFIX}.qtplugin\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\sensors\\declarative_sensors$${QT_LIBINFIX}.qtplugin\""
             qmldirs += \
-            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\sensors\\qmldir\"  - \"!:\\resource\\qt\\imports\\QtMobility\\sensors\\qmldir\""
+            "\"$$QT_MOBILITY_BUILD_TREE\\plugins\\declarative\\sensors\\qmldir\"  - \"!:\\resource\\qt$${QT_LIBINFIX}\\imports\\QtMobility\\sensors\\qmldir\""
         }
     }
 
@@ -513,6 +515,15 @@ isEmpty(QT_LIBINFIX):symbian {
 
     DEPLOYMENT += qtmobilitydeployment\
                 mobilitybackup
-} else {
-    message(Deployment of infixed library names not supported)
+
+    exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.3.sis) {
+        !exists($${EPOCROOT}epoc32/release/winscw/udeb/z/system/install/series60v5.4.sis) {
+            # Export qtmobilitycontactssrv.iby only in Belle not in future releases
+            # Iby file will be part of new contactsrv pkg after Belle
+            BLD_INF_RULES.prj_exports += \
+                "$${LITERAL_HASH}include <platform_paths.hrh>" \
+                "deviceconfiguration/qtmobilitycontactssrv.iby  CORE_MW_LAYER_IBY_EXPORT_PATH(qtmobilitycontactssrv.iby)"
+        }
+    }
 }
+
diff --git a/src/sensors/sensors.pro b/src/sensors/sensors.pro
index 8c7a3f9f7d..0c111b45b0 100644
--- a/src/sensors/sensors.pro
+++ b/src/sensors/sensors.pro
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 TARGET = QtSensors
 
@@ -6,11 +8,11 @@ include(../../common.pri)
 DEFINES += QT_BUILD_SENSORS_LIB QT_MAKEDLL
 symbian {
     TARGET.CAPABILITY = ALL -TCB
-    TARGET.UID3 = 0x2002BFC0
+    TARGET.UID3 = $$mobilityUID(0x2002BFC0)
 
     ### Sensors
     # Main library
-    SENSORS_DEPLOYMENT.sources = QtSensors.dll
+    SENSORS_DEPLOYMENT.sources = QtSensors$${QT_LIBINFIX}.dll
     SENSORS_DEPLOYMENT.path = /sys/bin
     DEPLOYMENT += SENSORS_DEPLOYMENT
     LIBS += -lefsrv
diff --git a/src/serviceframework/databasemanager.cpp b/src/serviceframework/databasemanager.cpp
index a723d8a321..64f583c461 100644
--- a/src/serviceframework/databasemanager.cpp
+++ b/src/serviceframework/databasemanager.cpp
@@ -230,7 +230,7 @@ bool lessThan(const QServiceInterfaceDescriptor &d1,
 
     If the system scope database cannot be opened when performing
     user scope operations.  The operations are carried out as per normal
-    but only acting on the user scope database.  Each operation invokation
+    but only acting on the user scope database.  Each operation invocation
     will try to open a connection with the system scope database.
 
     Terminology note:
@@ -659,7 +659,7 @@ QServiceInterfaceDescriptor DatabaseManager::interfaceDefault(const QString &int
 }
 
 /*
-    Sets the default interface implemenation for \a interfaceName to the matching
+    Sets the default interface implementation for \a interfaceName to the matching
     interface implementation provided by \a service.
 
     If \a service provides more than one interface implementation, the newest
diff --git a/src/serviceframework/databasemanager_symbian.cpp b/src/serviceframework/databasemanager_symbian.cpp
index 5d8b62bc2b..f05f5a6ad1 100644
--- a/src/serviceframework/databasemanager_symbian.cpp
+++ b/src/serviceframework/databasemanager_symbian.cpp
@@ -83,7 +83,7 @@ QTM_BEGIN_NAMESPACE
 
     If the system scope database cannot be opened when performing
     user scope operations.  The operations are carried out as per normal
-    but only acting on the user scope database.  Each operation invokation
+    but only acting on the user scope database.  Each operation invocation
     will try to open a connection with the system scope database.
 
     Terminology note:
@@ -207,7 +207,7 @@ QServiceInterfaceDescriptor DatabaseManager::interfaceDefault(const QString &int
 /*
     \fn  bool DatabaseManager::setInterfaceDefault(const QString &serviceName, const   QString &interfaceName, DbScope scope)
 
-    Sets the default interface implemenation for \a interfaceName to the matching
+    Sets the default interface implementation for \a interfaceName to the matching
     interface implementation provided by \a service.
 
     If \a service provides more than one interface implementation, the newest
diff --git a/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver.cpp b/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver.cpp
index 7b4e4094e6..8dd2afb0fc 100644
--- a/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver.cpp
+++ b/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver.cpp
@@ -153,9 +153,54 @@ void CDatabaseManagerServer::initDbPath()
       }
   }
   
+  //Merge the Db files,if there are multiple DB's.
+  mergeDbFiles(dir.path(), dbName);
+    
   iDb->open();
   }
 
+QStringList CDatabaseManagerServer::getExistingDbfiles(const QString &dirPath)
+{
+    QDir dir(dirPath);
+    QStringList filters;
+    dir.setSorting(QDir::Time);
+    
+    filters << "*.db";
+    dir.setNameFilters(filters);
+    
+    return (dir.entryList(QDir::Files));
+}
+
+void CDatabaseManagerServer::mergeDbFiles(const QString &dbDirPath, const QString &dbFileName)
+{
+    QStringList dbList = getExistingDbfiles(dbDirPath);
+    if(dbList.contains(dbFileName)) {
+        //Remove dstDb
+        dbList.removeAll(dbFileName);
+        int dbListCount = dbList.count();
+        if(dbListCount > 0) {
+            QString dstDbFileName = dbDirPath + QDir::separator() + dbFileName;          
+            ServiceDatabase *dstDatabase = new ServiceDatabase();
+            dstDatabase->setDatabasePath(dstDbFileName);
+            //Merge the DB's
+            QString srcDbFileName;
+            for(int i = 0; i < dbListCount; i++) {
+                srcDbFileName = dbDirPath + QDir::separator() + dbList[i];
+                //Merge the src DB with dst DB.
+                if(dstDatabase->mergeDatabase(srcDbFileName)) {
+  #ifdef QT_SFW_SERVICEDATABASE_DEBUG
+                  qDebug() << "CDatabaseManagerServer::initDbPath():-"
+                      << "dstDatabase->mergeDatabase Success";
+  #endif             
+                QFile::remove(srcDbFileName);
+                }
+            }
+            delete dstDatabase;            
+        }
+    }
+
+}
+        
 void CDatabaseManagerServer::DiscoverServices()
 {
   QString path = QDir::toNativeSeparators(QCoreApplication::applicationDirPath());
@@ -185,12 +230,12 @@ void CDatabaseManagerServer::DiscoverServices()
              continue;
          }           
       }
-      QFile *f = new QFile(imports + QDir::separator() + file);
+      QFile f(imports + QDir::separator() + file);
       // read contents, register
-      ServiceMetaData parser(f);
+      ServiceMetaData parser(&f);
       if (!parser.extractMetadata()) {
-          f->remove();
-          f->close();
+          f.remove();
+          f.close();
           continue;
       }
       const ServiceMetaDataResults data = parser.parseResults();
@@ -200,7 +245,7 @@ void CDatabaseManagerServer::DiscoverServices()
       if(iDb->registerService(results, tok)){
           iDb->serviceInitialized(results.name, tok);
       }
-      f->close();
+      f.close();
       settings.setValue(file, fileinfo.lastModified());
       settings.setValue(file + "/service_name", servicename);
   }
@@ -211,7 +256,7 @@ void CDatabaseManagerServer::DiscoverServices()
       if(old.contains('/'))
         continue;
       QString servicename = settings.value(old + "/service_name").toString();
-      iDb->unregisterService(servicename, QString("Auto Registration"));
+      iDb->unregisterService(servicename, tok);
       settings.remove(old);
   }
 }
diff --git a/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver.pro b/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver.pro
index d52d60ac0c..2da73554b7 100644
--- a/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver.pro
+++ b/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver.pro
@@ -1,7 +1,8 @@
+include(../../../features/utils.pri)
+
 TEMPLATE = app
-TARGET = qsfwdatabasemanagerserver
+TARGET = qsfwdatabasemanagerserver$${QT_LIBINFIX}
 QT = core sql
-TARGET.UID3 = 0x2002AC7F
 
 CONFIG += no_icon
 
@@ -12,6 +13,7 @@ SOURCES += databasemanagerservermain.cpp
 
 include(../../../common.pri)
 
+TARGET.UID3 = $$mobilityUID(0x2002AC7F)
 
 DEPENDPATH += ../
 INCLUDEPATH += ../
diff --git a/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver_p.h b/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver_p.h
index 2feaab13ed..3fc825b106 100644
--- a/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver_p.h
+++ b/src/serviceframework/databasemanagerserver_symbian/databasemanagerserver_p.h
@@ -77,6 +77,9 @@ class CDatabaseManagerServer : public CServer2
     private:
         void initDbPath();        
         
+        QStringList getExistingDbfiles(const QString &dirPath);
+        void mergeDbFiles(const QString &dbDirPath, const QString &dbFileName);
+        
         static const TInt timeoutInterval;
         int iSessionCount;        
         CPeriodic *iPeriodic;
diff --git a/src/serviceframework/ipc/objectendpoint.cpp b/src/serviceframework/ipc/objectendpoint.cpp
index 62d6bba535..127257aa5c 100644
--- a/src/serviceframework/ipc/objectendpoint.cpp
+++ b/src/serviceframework/ipc/objectendpoint.cpp
@@ -621,7 +621,7 @@ void ObjectEndPoint::waitForResponse(const QUuid& requestId)
     if (openRequests()->contains(requestId) ) {
         Response* response = openRequests()->value(requestId);
         QEventLoop* loop = new QEventLoop( this );
-        QTimer::singleShot(30000, loop, SLOT(quit()));
+        QTimer::singleShot(60000, loop, SLOT(quit()));
         connect(this, SIGNAL(pendingRequestFinished()), loop, SLOT(quit()));
         loop->exec();
         delete loop;
diff --git a/src/serviceframework/ipc/proxyobject.cpp b/src/serviceframework/ipc/proxyobject.cpp
index dcf598a4b4..aebc2dcee5 100644
--- a/src/serviceframework/ipc/proxyobject.cpp
+++ b/src/serviceframework/ipc/proxyobject.cpp
@@ -179,7 +179,7 @@ int QServiceProxy::qt_metacall(QMetaObject::Call c, int id, void **a)
                 if (pType == QVariant::Invalid && QByteArray(property.typeName()) == "QVariant")
                     arg =  *reinterpret_cast<const QVariant(*)>(a[0]);
                 else if (pType == 0) {
-                    qWarning("%s: property %s has unkown type", property.name(), property.typeName());
+                    qWarning("%s: property %s has unknown type", property.name(), property.typeName());
                     return id;
                 } else {
                     arg = QVariant(pType, a[0]);
diff --git a/src/serviceframework/ipc/qservicemetaobject_dbus.cpp b/src/serviceframework/ipc/qservicemetaobject_dbus.cpp
index 9d7a063a33..a02566fbb5 100644
--- a/src/serviceframework/ipc/qservicemetaobject_dbus.cpp
+++ b/src/serviceframework/ipc/qservicemetaobject_dbus.cpp
@@ -413,7 +413,7 @@ int QServiceMetaObjectDBus::qt_metacall(QMetaObject::Call c, int id, void **a)
                 count += replacement.size();
 
             } else {
-                // Supported type so skip this paramater
+                // Supported type so skip this parameter
                 count += t.size();
             }
 
diff --git a/src/serviceframework/qabstractsecuritysession.cpp b/src/serviceframework/qabstractsecuritysession.cpp
index d68a5c4011..0222fcc80d 100644
--- a/src/serviceframework/qabstractsecuritysession.cpp
+++ b/src/serviceframework/qabstractsecuritysession.cpp
@@ -55,8 +55,8 @@ QTM_BEGIN_NAMESPACE
     engines must implement in order to provide capability related functionality.
 
     A QAbstractSecuritySession encapsulates the service client's capabilities. QServiceManager
-    can match those capabilites with the capabilites required by a particular service.
-    Service capabilites are declared via the services XML description.
+    can match those capabilities with the capabilities required by a particular service.
+    Service capabilities are declared via the services XML description.
 
     The use of a security session is not mandated by the service manager. If the client
     is passing a security session object QServiceManager ensures that the permissions
diff --git a/src/serviceframework/qservicefilter.cpp b/src/serviceframework/qservicefilter.cpp
index fe0090fb03..37c9979284 100644
--- a/src/serviceframework/qservicefilter.cpp
+++ b/src/serviceframework/qservicefilter.cpp
@@ -130,7 +130,7 @@ public:
                             this rule is equivalent to Cap\sub{(Filter)} \\ Cap\sub{(Service)} = {}. This is the default matching rule.
     \value MatchLoadable    The filter matches any service that could be loaded by the client.
                             Using this matching rule guarantees that the returned services do not
-                            require more capabilites than specified by this rule. It includes services
+                            require more capabilities than specified by this rule. It includes services
                             with no capability requirements. If this rule
                             is provided alongside an empty capability search list the returned
                             services do not require any capabilities and thus can be accessed
diff --git a/src/serviceframework/qservicemanager.cpp b/src/serviceframework/qservicemanager.cpp
index 643c5b48d5..979279c80d 100644
--- a/src/serviceframework/qservicemanager.cpp
+++ b/src/serviceframework/qservicemanager.cpp
@@ -287,7 +287,7 @@ private slots:
 /*!
     \fn void QServiceManager::serviceAdded(const QString& serviceName, QService::Scope scope)
 
-    This signal is emited whenever a new service with the given
+    This signal is emitted whenever a new service with the given
     \a serviceName has been registered with the service manager.
     \a scope indicates where the service was added.
 
@@ -301,7 +301,7 @@ private slots:
 /*!
     \fn void QServiceManager::serviceRemoved(const QString& serviceName, QService::Scope scope)
 
-    This signal is emited whenever a service with the given
+    This signal is emitted whenever a service with the given
     \a serviceName has been deregistered with the service manager.
     \a scope indicates where the service was added.
 
@@ -580,7 +580,7 @@ QObject* QServiceManager::loadInterface(const QServiceInterfaceDescriptor& descr
     Registers the service defined by the XML file at \a xmlFilePath.
     Returns true if the registration succeeded, and false otherwise.
 
-    If a previously unkown interface is added the newly registered service automatically
+    If a previously unknown interface is added the newly registered service automatically
     becomes the new default service provider for the new interface.
 
     A service plugin cannot be added if another service is already registered
@@ -602,7 +602,7 @@ bool QServiceManager::addService(const QString& xmlFilePath)
 /*!
     Registers the service defined by the XML data from the given \a device.
     Returns true if the registration succeeded, and false otherwise. If a
-    previously unkown interface is added the newly registered service
+    previously unknown interface is added the newly registered service
     automatically becomes the new default service provider for the new
     interface.
 
diff --git a/src/serviceframework/servicedatabase.cpp b/src/serviceframework/servicedatabase.cpp
index a23e245c6b..9f7bacc876 100644
--- a/src/serviceframework/servicedatabase.cpp
+++ b/src/serviceframework/servicedatabase.cpp
@@ -187,7 +187,7 @@ bool ServiceDatabase::open()
     }
     m_isDatabaseOpen = true;
 
-    //Check database structure (tables) and recreate tables if neccessary
+    //Check database structure (tables) and recreate tables if necessary
     //If one of tables is missing remove all tables and recreate them
     //This operation is required in order to avoid data coruption
     if (!checkTables()) {
@@ -214,6 +214,233 @@ bool ServiceDatabase::open()
     return true;
 }
 
+#ifdef Q_OS_SYMBIAN
+
+bool ServiceDatabase::mergeDatabase(const QString &srcDbFileName)
+{
+    if(!open()) {
+#ifdef QT_SFW_SERVICEDATABASE_DEBUG
+                qDebug() << "ServiceDatabase::mergeDatabase():-"
+                    << "Database tables Open Failed";
+#endif
+        return false;
+    }
+    ServiceDatabase *srcDatabase = new ServiceDatabase();
+    srcDatabase->setDatabasePath(srcDbFileName);
+    
+    if(!srcDatabase->open()) {
+#ifdef QT_SFW_SERVICEDATABASE_DEBUG
+                qDebug() << "ServiceDatabase::mergeDatabase():-"
+                    << "SRC Database tables Open Failed";
+#endif  
+        delete srcDatabase;
+        close();
+        return false;
+    }
+    //Get DB Services.
+    QStringList dstServiceList = getServiceNames(QString());
+    //Get SRC DB Services.
+    QStringList srcServiceList = srcDatabase->getServiceNames(QString());
+    //Get the Unique Services to Add.
+    QStringList servicesToAdd = getServicesToAdd(dstServiceList, srcServiceList);
+    //Get ServiceMetaData for the services to be added.
+    QList<ServiceMetaDataDBResults> srcServiceData = srcDatabase->getServiceData(servicesToAdd);
+    
+    registerServiceList(srcServiceData);
+    
+    srcServiceData.clear();
+    delete srcDatabase;
+    
+    return true;
+}
+
+QStringList ServiceDatabase::getServicesToAdd(const QStringList &dstServiceList, const QStringList &srcServiceList)
+{
+    QStringList serviceList;
+    
+    foreach(const QString srcServiceName, srcServiceList) {
+        if(!dstServiceList.contains(srcServiceName)) {
+            //If not Exists in dstServiceList append srcServiceName.
+            serviceList.append(srcServiceName);
+        }
+    }
+    
+    return serviceList;
+}
+
+bool ServiceDatabase::isDefaultInterfaceExists(const QList<QServiceInterfaceDescriptor> &latestInterfaces, const QString &interfaceName)
+{
+    int listCount = latestInterfaces.count();
+    
+    for(int i = 0; i < listCount; i++) {
+        if(interfaceName == latestInterfaces[i].interfaceName())
+            return true;
+    }
+    return false;
+}
+
+
+QList<ServiceMetaDataDBResults> ServiceDatabase::getServiceData(const QStringList &serviceNameList)
+{
+    QList<ServiceMetaDataDBResults>serviceList;
+    
+    if(!open()) {
+#ifdef QT_SFW_SERVICEDATABASE_DEBUG
+                qDebug() << "ServiceDatabase::parseDatabase():-"
+                    << "Database tables Open failed";
+#endif
+        return serviceList;               
+    }
+    
+    foreach(const QString &serviceName, serviceNameList) {
+        ServiceMetaDataDBResults serviceData;
+        serviceData.dbServiceData.name = serviceName;
+        //Get Interfaces for each Service.
+        QServiceFilter filter;
+        filter.setServiceName(serviceName);
+        QList<QServiceInterfaceDescriptor> interfaceList = getInterfaces(filter);
+        serviceData.dbServiceData.interfaces = interfaceList;
+        //Get Defaullt interface List for each Service.
+        for(int i = 0; i < interfaceList.size(); i++) {
+            QString interfaceName = interfaceList.at(i).interfaceName();
+            if(!isDefaultInterfaceExists(serviceData.dbServiceData.latestInterfaces, interfaceName)) {
+                QServiceInterfaceDescriptor defaultInterface = getDefaultInterface(serviceName, interfaceName);
+                if(defaultInterface.isValid()) {
+                    serviceData.dbServiceData.latestInterfaces.append(defaultInterface);
+                }
+            }
+        }
+        if(interfaceList.count()) {
+            serviceData.dbServiceData.location = interfaceList.at(0).d->attributes[QServiceInterfaceDescriptor::Location].toString();
+            serviceData.dbServiceData.description = interfaceList.at(0).d->attributes[QServiceInterfaceDescriptor::ServiceDescription].toString();
+            serviceData.dbServiceData.type = interfaceList.at(0).d->attributes[QServiceInterfaceDescriptor::ServiceType].toInt();
+        }
+        //Get the SecurityToken for each Service.
+#ifdef QT_SFW_SERVICEDATABASE_USE_SECURITY_TOKEN
+        
+        serviceData.dbServiceSecurityToken = getServiceSecurityToken(serviceName);
+        
+#endif  //QT_SFW_SERVICEDATABASE_USE_SECURITY_TOKEN
+        
+        serviceList.append(serviceData);
+    }
+                   
+    return serviceList;
+}
+
+bool ServiceDatabase::lessThan(const QServiceInterfaceDescriptor &d1,
+                                const QServiceInterfaceDescriptor &d2) const
+{
+    return (d1.majorVersion() < d2.majorVersion())
+            || ( d1.majorVersion() == d2.majorVersion()
+                    && d1.minorVersion() < d2.minorVersion());
+
+}
+
+QServiceInterfaceDescriptor ServiceDatabase::getDefaultInterface(const QString &serviceName, const QString &interfaceName)
+{
+    
+    QServiceInterfaceDescriptor defaultInterface;
+    
+    defaultInterface = interfaceDefault(interfaceName);
+    if(serviceName == defaultInterface.serviceName()) {
+        //Returns default interface if serviceName is matching
+        //with the serviceName of defaultInterface.
+        return defaultInterface;
+    }
+    
+    //If different Services are there with same interface names returns 
+    //defaultInterface with improper QServiceInterfaceDescriptor, 
+    //in this case just return the interface with latest version.
+    
+    QList<QServiceInterfaceDescriptor> descriptors;
+    QServiceFilter filter;
+    
+    filter.setServiceName(serviceName);
+    filter.setInterface(interfaceName);
+    
+    descriptors = getInterfaces(filter);
+
+    //find the descriptor with the latest version
+    int latestIndex = 0;
+        for (int i = 1; i < descriptors.count(); ++i) {
+            if (lessThan(descriptors[latestIndex], descriptors[i]))
+                latestIndex = i;
+    }
+
+    if (!descriptors.isEmpty()) {
+        return (descriptors[latestIndex]);     
+    }
+
+    return defaultInterface;
+}
+
+QString ServiceDatabase::getServiceSecurityToken(const QString &serviceName)
+{
+    QString serviceToken;
+    
+#ifdef QT_SFW_SERVICEDATABASE_USE_SECURITY_TOKEN
+    
+    if(!checkConnection()) {
+#ifdef QT_SFW_SERVICEDATABASE_DEBUG
+        qWarning() << "ServiceDatabase::getServiceSecurityToken():-"
+                    << "Problem:" << qPrintable(m_lastError.text());
+#endif
+        return serviceToken;
+    }
+
+    QSqlDatabase database = QSqlDatabase::database(m_connectionName);
+    QSqlQuery query(database);
+
+    if (!beginTransaction(&query, Read)) {
+#ifdef QT_SFW_SERVICEDATABASE_DEBUG
+        qWarning() << "ServiceDatabase::getServiceSecurityToken():-"
+                    << "Unable to begin transaction,"
+                    << "reason:" << qPrintable(m_lastError.text());
+#endif
+        return serviceToken;
+    }
+
+    QString statement = "SELECT DISTINCT ServiceProperty.Value FROM Service, ServiceProperty "
+                "WHERE Service.ID = ServiceProperty.ServiceID "
+                "AND ServiceProperty.Key = ? "
+                "AND Service.Name = ?";
+    QList<QVariant> bindValues;
+    
+    bindValues.append(SECURITY_TOKEN_KEY);
+    bindValues.append(serviceName);
+    if (!executeQuery(&query, statement, bindValues)) {
+        rollbackTransaction(&query);
+#ifdef QT_SFW_SERVICEDATABASE_DEBUG
+        qWarning() << "ServiceDatabase::getServiceSecurityToken():-"
+                   << qPrintable(m_lastError.text());
+#endif
+        return serviceToken;
+    }
+    if (query.next()) {
+        serviceToken = query.value(EBindIndex).toString();
+    }  
+    rollbackTransaction(&query);//read only operation so just rollback
+    m_lastError.setError(DBError::NoError);
+
+#endif  //QT_SFW_SERVICEDATABASE_USE_SECURITY_TOKEN
+    
+    return serviceToken;
+}
+
+
+bool ServiceDatabase::registerServiceList(const QList<ServiceMetaDataDBResults> &serviceList)
+{
+    for(int i = 0; i < serviceList.count(); i++) {
+        //Database Write & Commit happens for every service, is Commit Operation Costlier ? 
+        registerService(serviceList[i].dbServiceData, serviceList[i].dbServiceSecurityToken);
+    }
+    return true;
+}
+        
+#endif //End Q_OS_SYMBIAN
+
+
 /*
    Adds a \a service into the database.
 
@@ -1143,7 +1370,7 @@ QStringList ServiceDatabase::getServiceNames(const QString &interfaceName)
     The last error set to DBError::ExternalIfaceIDFound
 
     If this function is called within a transaction, \a inTransaction
-    must be set to true.  If \a inTransaction is false, this fuction
+    must be set to true.  If \a inTransaction is false, this function
     will begin and end its own transaction.
 
     The last error may be set to one of the following error codes:
@@ -1281,7 +1508,7 @@ QServiceInterfaceDescriptor ServiceDatabase::interfaceDefault(const QString &int
 
    For a user scope database an \a externalInterfaceID can be provided
    so that the Defaults table will contain a "link" to an interface
-   implmentation provided in the system scope database.
+   implementation provided in the system scope database.
 
    May set the last error to one of the following error codes:
    DBError::NoError
@@ -1422,7 +1649,7 @@ bool ServiceDatabase::setInterfaceDefault(const QServiceInterfaceDescriptor &int
    provides same the highest version number, an arbitrary choice is made
    between them.
 
-   May set the last error to the folowing error codes:
+   May set the last error to the following error codes:
    DBError::NoError
    DBError::NotFound
    DBError::SqlError
diff --git a/src/serviceframework/servicedatabase_p.h b/src/serviceframework/servicedatabase_p.h
index 03b03a85bf..0fc395abfa 100644
--- a/src/serviceframework/servicedatabase_p.h
+++ b/src/serviceframework/servicedatabase_p.h
@@ -66,6 +66,17 @@ QTM_BEGIN_NAMESPACE
 
 class QServiceInterfaceDescriptor;
 
+#ifdef Q_OS_SYMBIAN
+
+class ServiceMetaDataDBResults
+{
+public:
+    ServiceMetaDataResults dbServiceData;
+    QString dbServiceSecurityToken;
+};
+
+#endif //End Q_OS_SYMBIAN
+
 class QM_AUTOTEST_EXPORT ServiceDatabase : public QObject
 {
     Q_OBJECT
@@ -82,6 +93,20 @@ class QM_AUTOTEST_EXPORT ServiceDatabase : public QObject
         void setDatabasePath(const QString &databasePath);
         QString databasePath() const;
 
+#ifdef Q_OS_SYMBIAN
+        
+        bool mergeDatabase(const QString &srcDbFileName);
+        QList<ServiceMetaDataDBResults> getServiceData(const QStringList &serviceNameList);
+        bool registerServiceList(const QList<ServiceMetaDataDBResults> &serviceList);
+        QString getServiceSecurityToken(const QString &serviceName);
+        QStringList getServicesToAdd(const QStringList &dstServiceList, const QStringList &srcServiceList);
+        bool lessThan(const QServiceInterfaceDescriptor &d1,
+                        const QServiceInterfaceDescriptor &d2) const;
+        QServiceInterfaceDescriptor getDefaultInterface(const QString &serviceName, const QString &interfaceName);
+        bool isDefaultInterfaceExists(const QList<QServiceInterfaceDescriptor> &latestInterfaces, const QString &interfaceName);
+        
+#endif //End Q_OS_SYMBIAN
+        
         bool registerService(const ServiceMetaDataResults &service, const QString &securityToken = QString());
         bool unregisterService(const QString &serviceName, const QString &securityToken = QString());
         bool serviceInitialized(const QString &serviceName, const QString &securityToken = QString());
diff --git a/src/serviceframework/serviceframework.pro b/src/serviceframework/serviceframework.pro
index 34badba910..f260a058f2 100644
--- a/src/serviceframework/serviceframework.pro
+++ b/src/serviceframework/serviceframework.pro
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 TARGET = QtServiceFramework
 QT = core \
@@ -46,9 +48,9 @@ symbian {
 
     TARGET.CAPABILITY = ALL \
         -TCB
-    TARGET.UID3 = 0x2002AC84
-    QtServiceFrameworkDeployment.sources = QtServiceFramework.dll \
-        qsfwdatabasemanagerserver.exe
+    TARGET.UID3 = $$mobilityUID(0x2002AC84)
+    QtServiceFrameworkDeployment.sources = QtServiceFramework$${QT_LIBINFIX}.dll \
+        qsfwdatabasemanagerserver$${QT_LIBINFIX}.exe
     QtServiceFrameworkDeployment.path = /sys/bin
     DEPLOYMENT += QtServiceFrameworkDeployment
 }
diff --git a/src/systeminfo/qsystemalignedtimer_symbian.cpp b/src/systeminfo/qsystemalignedtimer_symbian.cpp
index 12bbf57cdf..f77161abce 100644
--- a/src/systeminfo/qsystemalignedtimer_symbian.cpp
+++ b/src/systeminfo/qsystemalignedtimer_symbian.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -120,6 +120,7 @@ void QSystemAlignedTimerPrivate::singleShot(int minimumTime, int maximumTime, QO
         TRACES(qDebug() << "QSystemAlignedTimerPrivate::singleShot--Issuing request,Wait for SingleShot() callback");
         alignedTimer->m_singleShotReceiver = receiver;
         alignedTimer->m_singleShotMember = member;
+        alignedTimer->setSingleShot(true);
         alignedTimer->start(minimumTime, maximumTime);
        }
 }
diff --git a/src/systeminfo/qsysteminfo_s60.cpp b/src/systeminfo/qsysteminfo_s60.cpp
index 49b4ac9374..cdf47f207b 100644
--- a/src/systeminfo/qsysteminfo_s60.cpp
+++ b/src/systeminfo/qsysteminfo_s60.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010-2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -98,19 +98,9 @@ const float KMMPerTwip  = 0.0177f; //Milimeter Per Twip
 
 QTM_BEGIN_NAMESPACE
 
-QSystemInfoPrivateBase::QSystemInfoPrivateBase(QObject *parent)
-    : QObject(parent)
-{
-    m_deviceInfo = new DeviceInfo();
-}
-
-QSystemInfoPrivateBase::~QSystemInfoPrivateBase()
-{
-    delete m_deviceInfo;
-}
 
 QSystemInfoPrivate::QSystemInfoPrivate(QObject *parent)
-    : QSystemInfoPrivateBase(parent)
+    : QObject(parent)
 {
 }
 
@@ -221,6 +211,13 @@ QString QSystemInfoPrivate::TLanguageToISO639_1(TLanguage language) const
         case ELangInternationalEnglish:
         case ELangSouthAfricanEnglish:
         case ELangAustralian:
+        case 129: /*ELangEnglish_Apac*/
+        case 157: /*ELangEnglish_Taiwan*/
+        case 158: /*ELangEnglish_HongKong*/
+        case 159: /*ELangEnglish_Prc*/
+        case 160: /*ELangEnglish_Japan*/
+        case 161: /*ELangEnglish_Thailand*/
+        case 230: /*ELangEnglish_India*/
         case ELangEnglish: return "en";
         case ELangSwissFrench:
         case ELangInternationalFrench:
@@ -280,6 +277,7 @@ QString QSystemInfoPrivate::TLanguageToISO639_1(TLanguage language) const
         case ELangGujarati: return "gu";
         case ELangHebrew: return "he";
         case ELangHindi: return "hi";
+        case 327: /*ELangIndonesian_Apac*/
         case ELangIndonesian: return "id";
         case ELangIrish: return "ga";
         case ELangKannada: return "kn";
@@ -290,6 +288,7 @@ QString QSystemInfoPrivate::TLanguageToISO639_1(TLanguage language) const
         case ELangLatvian: return "lv";
         case ELangLithuanian: return "lt";
         case ELangMacedonian: return "mk";
+        case 326: /*ELangMalay_Apac*/
         case ELangMalay: return "ms";
         case ELangMalayalam: return "ml";
         case ELangMarathi: return "mr";
@@ -312,6 +311,8 @@ QString QSystemInfoPrivate::TLanguageToISO639_1(TLanguage language) const
         case ELangWelsh: return "cy";
         case ELangZulu: return "zu";
         case ELangSinhalese: return "si";
+        case 102: /*ELangBasque*/ return "eu";
+        case 103: /*ELangGalician*/ return "gl";
         case ELangTest:
         case ELangReserved1:
         case ELangReserved2:
@@ -428,25 +429,25 @@ bool QSystemInfoPrivate::hasFeatureSupported(QSystemInfo::Feature feature)
 }
 
 QSystemNetworkInfoPrivate::QSystemNetworkInfoPrivate(QObject *parent)
-    : QSystemInfoPrivateBase(parent)
+    : QObject(parent)
 {
  TRACES(qDebug() << "QSystemNetworkInfoPrivate::QSystemNetworkInfoPrivate<---");
-    m_deviceInfo->cellSignalStrenghtInfo()->addObserver(this);
-    m_deviceInfo->cellNetworkInfo()->addObserver(this);
-    m_deviceInfo->cellNetworkRegistrationInfo()->addObserver(this);
+    DeviceInfo::instance()->cellSignalStrenghtInfo()->addObserver(this);
+    DeviceInfo::instance()->cellNetworkInfo()->addObserver(this);
+    DeviceInfo::instance()->cellNetworkRegistrationInfo()->addObserver(this);
 #ifdef ETELMM_SUPPORTED
-    m_deviceInfo->networkInfo()->addObserver(this);
+    DeviceInfo::instance()->networkInfo()->addObserver(this);
 #endif
-    m_deviceInfo->wlanInfo()->addObserver(this);
-    /*connect(m_deviceInfo->wlanInfo(), SIGNAL(wlanNetworkNameChanged()),
+    DeviceInfo::instance()->wlanInfo()->addObserver(this);
+    /*connect(DeviceInfo::instance()->wlanInfo(), SIGNAL(wlanNetworkNameChanged()),
         this, SLOT(wlanNetworkNameChanged()));
-    connect(m_deviceInfo->wlanInfo(), SIGNAL(wlanNetworkSignalStrengthChanged()),
+    connect(DeviceInfo::instance()->wlanInfo(), SIGNAL(wlanNetworkSignalStrengthChanged()),
         this, SLOT(wlanNetworkSignalStrengthChanged()));
-    connect(m_deviceInfo->wlanInfo(), SIGNAL(wlanNetworkStatusChanged()),
+    connect(DeviceInfo::instance()->wlanInfo(), SIGNAL(wlanNetworkStatusChanged()),
         this, SLOT(wlanNetworkStatusChanged()));*/
-    m_deviceInfo->subscriberInfo();
+    DeviceInfo::instance()->subscriberInfo();
 #ifdef NETWORKHANDLER_SYMBIAN_SUPPORTED
-    m_deviceInfo->networkInfoListener()->addObserver(this);
+    DeviceInfo::instance()->networkInfoListener()->addObserver(this);
 #endif
  TRACES(qDebug() << "QSystemNetworkInfoPrivate::QSystemNetworkInfoPrivate--->");
 }
@@ -455,15 +456,15 @@ QSystemNetworkInfoPrivate::~QSystemNetworkInfoPrivate()
 {
   TRACES(qDebug() << "QSystemNetworkInfoPrivate::~QSystemNetworkInfoPrivate<--");
 
-    m_deviceInfo->cellSignalStrenghtInfo()->removeObserver(this);
-    m_deviceInfo->cellNetworkInfo()->removeObserver(this);
-    m_deviceInfo->cellNetworkRegistrationInfo()->removeObserver(this);
+    DeviceInfo::instance()->cellSignalStrenghtInfo()->removeObserver(this);
+    DeviceInfo::instance()->cellNetworkInfo()->removeObserver(this);
+    DeviceInfo::instance()->cellNetworkRegistrationInfo()->removeObserver(this);
 #ifdef ETELMM_SUPPORTED
-    m_deviceInfo->networkInfo()->removeObserver(this);
+    DeviceInfo::instance()->networkInfo()->removeObserver(this);
 #endif
-    m_deviceInfo->wlanInfo()->removeObserver(this);
+    DeviceInfo::instance()->wlanInfo()->removeObserver(this);
 #ifdef NETWORKHANDLER_SYMBIAN_SUPPORTED
-    m_deviceInfo->networkInfoListener()->removeObserver(this);
+    DeviceInfo::instance()->networkInfoListener()->removeObserver(this);
 #endif
   TRACES(qDebug() << "QSystemNetworkInfoPrivate::~QSystemNetworkInfoPrivate-->");
 }
@@ -477,8 +478,8 @@ QSystemNetworkInfo::NetworkStatus QSystemNetworkInfoPrivate::networkStatus(QSyst
         case QSystemNetworkInfo::LteMode:
         {
         #ifndef ETELMM_SUPPORTED
-            CTelephony::TRegistrationStatus networkStatus = m_deviceInfo->cellNetworkRegistrationInfo()->cellNetworkStatus();
-            CTelephony::TNetworkMode networkMode = m_deviceInfo->cellNetworkInfo()->networkMode();
+            CTelephony::TRegistrationStatus networkStatus = DeviceInfo::instance()->cellNetworkRegistrationInfo()->cellNetworkStatus();
+            CTelephony::TNetworkMode networkMode = DeviceInfo::instance()->cellNetworkInfo()->networkMode();
             if (networkMode == CTelephony::ENetworkModeGsm && mode != QSystemNetworkInfo::GsmMode)
                 return QSystemNetworkInfo::NoNetworkAvailable;
 
@@ -507,7 +508,7 @@ QSystemNetworkInfo::NetworkStatus QSystemNetworkInfoPrivate::networkStatus(QSyst
            QSystemNetworkInfo::NetworkMode currMode =currentMode();
            if (currMode == mode)
             {
-                nStatus = m_deviceInfo->networkInfo()->GetStatus();
+                nStatus = DeviceInfo::instance()->networkInfo()->GetStatus();
             }
            switch (nStatus) {
            case RMobilePhone::ERegistrationUnknown : return QSystemNetworkInfo::UndefinedStatus;
@@ -525,7 +526,7 @@ QSystemNetworkInfo::NetworkStatus QSystemNetworkInfoPrivate::networkStatus(QSyst
         }
         case QSystemNetworkInfo::WlanMode:
         {
-            if (m_deviceInfo->wlanInfo()->wlanNetworkConnectionStatus())
+            if (DeviceInfo::instance()->wlanInfo()->wlanNetworkConnectionStatus())
                 return QSystemNetworkInfo::Connected;
             else
                 return QSystemNetworkInfo::NoNetworkAvailable;
@@ -546,7 +547,7 @@ int QSystemNetworkInfoPrivate::networkSignalStrength(QSystemNetworkInfo::Network
         case QSystemNetworkInfo::CdmaMode:
         case QSystemNetworkInfo::WcdmaMode:
         {
-            CTelephony::TNetworkMode networkMode = m_deviceInfo->cellNetworkInfo()->networkMode();
+            CTelephony::TNetworkMode networkMode = DeviceInfo::instance()->cellNetworkInfo()->networkMode();
             if (networkMode == CTelephony::ENetworkModeGsm && mode != QSystemNetworkInfo::GsmMode)
                 return -1;
 
@@ -557,11 +558,11 @@ int QSystemNetworkInfoPrivate::networkSignalStrength(QSystemNetworkInfo::Network
             if (networkMode == CTelephony::ENetworkModeWcdma && mode != QSystemNetworkInfo::WcdmaMode)
                 return -1;
 
-            return m_deviceInfo->cellSignalStrenghtInfo()->cellNetworkSignalStrength();
+            return DeviceInfo::instance()->cellSignalStrenghtInfo()->cellNetworkSignalStrength();
         }
 
         case QSystemNetworkInfo::WlanMode:
-            return m_deviceInfo->wlanInfo()->wlanNetworkSignalStrength();
+            return DeviceInfo::instance()->wlanInfo()->wlanNetworkSignalStrength();
         case QSystemNetworkInfo::EthernetMode:
         case QSystemNetworkInfo::BluetoothMode:
         case QSystemNetworkInfo::WimaxMode:
@@ -573,27 +574,27 @@ int QSystemNetworkInfoPrivate::networkSignalStrength(QSystemNetworkInfo::Network
 
 int QSystemNetworkInfoPrivate::cellId()
 {
-    return m_deviceInfo->cellNetworkInfo()->cellId();
+    return DeviceInfo::instance()->cellNetworkInfo()->cellId();
 }
 
 int QSystemNetworkInfoPrivate::locationAreaCode()
 {
-    return m_deviceInfo->cellNetworkInfo()->locationAreaCode();
+    return DeviceInfo::instance()->cellNetworkInfo()->locationAreaCode();
 }
 
 QString QSystemNetworkInfoPrivate::currentMobileCountryCode()
 {
-    return m_deviceInfo->cellNetworkInfo()->countryCode();
+    return DeviceInfo::instance()->cellNetworkInfo()->countryCode();
 }
 
 QString QSystemNetworkInfoPrivate::currentMobileNetworkCode()
 {
-    return m_deviceInfo->cellNetworkInfo()->networkCode();
+    return DeviceInfo::instance()->cellNetworkInfo()->networkCode();
 }
 
 QString QSystemNetworkInfoPrivate::homeMobileCountryCode()
 {
-    QString imsi = m_deviceInfo->subscriberInfo()->imsi();
+    QString imsi = DeviceInfo::instance()->subscriberInfo()->imsi();
     if (imsi.length() >= 3) {
         return imsi.left(3);
     }
@@ -603,7 +604,7 @@ QString QSystemNetworkInfoPrivate::homeMobileCountryCode()
 QString QSystemNetworkInfoPrivate::homeMobileNetworkCode()
 {
 
-        return m_deviceInfo->cellNetworkInfo()->homeNetworkCode();
+        return DeviceInfo::instance()->cellNetworkInfo()->homeNetworkCode();
 
 }
 
@@ -615,7 +616,7 @@ QString QSystemNetworkInfoPrivate::networkName(QSystemNetworkInfo::NetworkMode m
         case QSystemNetworkInfo::CdmaMode:
         case QSystemNetworkInfo::WcdmaMode:
         {
-            CTelephony::TNetworkMode networkMode = m_deviceInfo->cellNetworkInfo()->networkMode();
+            CTelephony::TNetworkMode networkMode = DeviceInfo::instance()->cellNetworkInfo()->networkMode();
             if (networkMode == CTelephony::ENetworkModeGsm && mode != QSystemNetworkInfo::GsmMode)
                 return QString();
 
@@ -627,13 +628,13 @@ QString QSystemNetworkInfoPrivate::networkName(QSystemNetworkInfo::NetworkMode m
                 return QString();
 
 #ifndef NETWORKHANDLER_SYMBIAN_SUPPORTED
-            return m_deviceInfo->cellNetworkInfo()->networkName();
+            return DeviceInfo::instance()->cellNetworkInfo()->networkName();
 #else
-            return m_deviceInfo->networkInfoListener()->networkName();
+            return DeviceInfo::instance()->networkInfoListener()->networkName();
 #endif
         }
         case QSystemNetworkInfo::WlanMode:
-            return m_deviceInfo->wlanInfo()->wlanNetworkName();
+            return DeviceInfo::instance()->wlanInfo()->wlanNetworkName();
         case QSystemNetworkInfo::EthernetMode:
         case QSystemNetworkInfo::BluetoothMode:
         case QSystemNetworkInfo::WimaxMode:
@@ -692,20 +693,20 @@ QNetworkInterface QSystemNetworkInfoPrivate::interfaceForMode(QSystemNetworkInfo
 
 void QSystemNetworkInfoPrivate::countryCodeChanged()
 {
-    emit currentMobileCountryCodeChanged(m_deviceInfo->cellNetworkInfo()->countryCode());
+    emit currentMobileCountryCodeChanged(DeviceInfo::instance()->cellNetworkInfo()->countryCode());
 }
 
 void QSystemNetworkInfoPrivate::networkCodeChanged()
 {
-    emit currentMobileNetworkCodeChanged(m_deviceInfo->cellNetworkInfo()->networkCode());
+    emit currentMobileNetworkCodeChanged(DeviceInfo::instance()->cellNetworkInfo()->networkCode());
 }
 
 void QSystemNetworkInfoPrivate::networkNameChanged()
 {
 #ifndef NETWORKHANDLER_SYMBIAN_SUPPORTED
-    emit networkNameChanged(currentMode(), m_deviceInfo->cellNetworkInfo()->networkName());
+    emit networkNameChanged(currentMode(), DeviceInfo::instance()->cellNetworkInfo()->networkName());
 #else
-    emit networkNameChanged(currentMode(), m_deviceInfo->networkInfoListener()->networkName());
+    emit networkNameChanged(currentMode(), DeviceInfo::instance()->networkInfoListener()->networkName());
 #endif
 }
 
@@ -738,7 +739,7 @@ void QSystemNetworkInfoPrivate::changedCellId(int cellIdTel)
 void QSystemNetworkInfoPrivate::cellNetworkSignalStrengthChanged()
 {
     emit networkSignalStrengthChanged(currentMode(),
-        m_deviceInfo->cellSignalStrenghtInfo()->cellNetworkSignalStrength());
+        DeviceInfo::instance()->cellSignalStrenghtInfo()->cellNetworkSignalStrength());
 }
 
 void QSystemNetworkInfoPrivate::cellNetworkStatusChanged()
@@ -749,9 +750,9 @@ void QSystemNetworkInfoPrivate::cellNetworkStatusChanged()
 
 void QSystemNetworkInfoPrivate::wlanNetworkNameChanged()
 {
-    bool status = m_deviceInfo->wlanInfo()->wlanNetworkConnectionStatus();
+    bool status = DeviceInfo::instance()->wlanInfo()->wlanNetworkConnectionStatus();
         if (status)
-            emit networkNameChanged(QSystemNetworkInfo::WlanMode,m_deviceInfo->wlanInfo()->wlanNetworkName());
+            emit networkNameChanged(QSystemNetworkInfo::WlanMode,DeviceInfo::instance()->wlanInfo()->wlanNetworkName());
         else
             networkNameChanged();//Restore default network name, as WLAN will leave name as blank
 }
@@ -759,13 +760,13 @@ void QSystemNetworkInfoPrivate::wlanNetworkNameChanged()
 void QSystemNetworkInfoPrivate::wlanNetworkSignalStrengthChanged()
 {
     emit networkSignalStrengthChanged(QSystemNetworkInfo::WlanMode,
-        m_deviceInfo->wlanInfo()->wlanNetworkSignalStrength());
+        DeviceInfo::instance()->wlanInfo()->wlanNetworkSignalStrength());
 }
 
 //TODO: There are no WLAN specific modes (Not connected, Infrastructure, Adhoc, Secure Infrastructure and Searching)
 void QSystemNetworkInfoPrivate::wlanNetworkStatusChanged()
 {
-    bool status = m_deviceInfo->wlanInfo()->wlanNetworkConnectionStatus();
+    bool status = DeviceInfo::instance()->wlanInfo()->wlanNetworkConnectionStatus();
     if (status)
         emit networkStatusChanged(QSystemNetworkInfo::WlanMode, QSystemNetworkInfo::Connected);
     else
@@ -786,7 +787,7 @@ QSystemNetworkInfo::NetworkMode QSystemNetworkInfoPrivate::currentMode()
 {
     QSystemNetworkInfo::NetworkMode mode = QSystemNetworkInfo::UnknownMode;
 #ifndef ETELMM_SUPPORTED
-    CTelephony::TNetworkMode networkMode = m_deviceInfo->cellNetworkInfo()->networkMode();
+    CTelephony::TNetworkMode networkMode = DeviceInfo::instance()->cellNetworkInfo()->networkMode();
     switch (networkMode) {
         case CTelephony::ENetworkModeGsm: mode = QSystemNetworkInfo::GsmMode; break;
         case CTelephony::ENetworkModeCdma95:
@@ -797,7 +798,7 @@ QSystemNetworkInfo::NetworkMode QSystemNetworkInfoPrivate::currentMode()
     }
 #else
     RMobilePhone::TMobilePhoneNetworkMode nMode = RMobilePhone::ENetworkModeUnknown;
-    nMode = m_deviceInfo->networkInfo()->GetMode();
+    nMode = DeviceInfo::instance()->networkInfo()->GetMode();
     if (nMode != RMobilePhone::ENetworkModeUnknown) {
         switch (nMode) {
             case RMobilePhone::ENetworkModeGsm : mode = QSystemNetworkInfo::GsmMode;
@@ -821,7 +822,7 @@ QSystemNetworkInfo::NetworkMode QSystemNetworkInfoPrivate::currentMode()
 QSystemNetworkInfo::CellDataTechnology QSystemNetworkInfoPrivate::cellDataTechnology()
 {
 #ifdef ETELPACKETSERVICE_SUPPORTED
-  TUint celldatatechnology = m_deviceInfo->networkInfo()->CellDataTechnology();
+  TUint celldatatechnology = DeviceInfo::instance()->networkInfo()->CellDataTechnology();
   switch (celldatatechnology )
    {
     case KHsdpaBearer:
@@ -1074,13 +1075,13 @@ QSystemDisplayInfo::BacklightState  QSystemDisplayInfoPrivate::backlightStatus(i
 }
 
 QSystemStorageInfoPrivate::QSystemStorageInfoPrivate(QObject *parent)
-    : QSystemInfoPrivateBase(parent)
+    : QObject(parent)
 {
     iFs.Connect();
-    m_deviceInfo->mmcStorageStatus()->addObserver(this);
+    DeviceInfo::instance()->mmcStorageStatus()->addObserver(this);
 
 #ifdef DISKNOTIFY_SUPPORTED
-    CStorageDiskNotifier* storageNotifier = m_deviceInfo->storagedisknotifier();
+    CStorageDiskNotifier* storageNotifier = DeviceInfo::instance()->storagedisknotifier();
     if (storageNotifier != NULL){
         storageNotifier->AddObserver(this);
         }
@@ -1090,9 +1091,9 @@ QSystemStorageInfoPrivate::QSystemStorageInfoPrivate(QObject *parent)
 QSystemStorageInfoPrivate::~QSystemStorageInfoPrivate()
 {
     iFs.Close();
-    m_deviceInfo->mmcStorageStatus()->removeObserver(this);
+    DeviceInfo::instance()->mmcStorageStatus()->removeObserver(this);
 #ifdef DISKNOTIFY_SUPPORTED
-    CStorageDiskNotifier* storageNotifier = m_deviceInfo->storagedisknotifier();
+    CStorageDiskNotifier* storageNotifier = DeviceInfo::instance()->storagedisknotifier();
     if (storageNotifier != NULL){
         storageNotifier->RemoveObserver(this);
         }
@@ -1270,34 +1271,34 @@ QSystemStorageInfo::StorageState QSystemStorageInfoPrivate::CheckDiskSpaceThresh
 }
 
 QSystemDeviceInfoPrivate::QSystemDeviceInfoPrivate(QObject *parent)
-    : QSystemInfoPrivateBase(parent), m_profileEngine(NULL), m_proEngNotifyHandler(NULL),
+    : QObject(parent), m_profileEngine(NULL), m_proEngNotifyHandler(NULL),
     m_bluetoothRepository(NULL), m_bluetoothNotifyHandler(NULL)
 {
-    m_deviceInfo->batteryInfo()->addObserver(this);
-    m_deviceInfo->chargingStatus()->addObserver(this);
+    DeviceInfo::instance()->batteryInfo()->addObserver(this);
+    DeviceInfo::instance()->chargingStatus()->addObserver(this);
     m_previousBatteryStatus = QSystemDeviceInfo::NoBatteryLevel;
 #ifdef LOCKANDFLIP_SUPPORTED
-    m_deviceInfo->keylockStatus()->addObserver(this);
-    m_deviceInfo->flipStatus()->addObserver(this);
+    DeviceInfo::instance()->keylockStatus()->addObserver(this);
+    DeviceInfo::instance()->flipStatus()->addObserver(this);
 #endif
 
 #ifdef THERMALSTATUS_SUPPORTED
-    m_deviceInfo->thermalStatus()->addObserver(this);
+    DeviceInfo::instance()->thermalStatus()->addObserver(this);
 #endif
-    m_deviceInfo->phoneInfo();
-    m_deviceInfo->subscriberInfo();
+    DeviceInfo::instance()->phoneInfo();
+    DeviceInfo::instance()->subscriberInfo();
 }
 
 QSystemDeviceInfoPrivate::~QSystemDeviceInfoPrivate()
 {
-    m_deviceInfo->chargingStatus()->removeObserver(this);
-    m_deviceInfo->batteryInfo()->removeObserver(this);
+    DeviceInfo::instance()->chargingStatus()->removeObserver(this);
+    DeviceInfo::instance()->batteryInfo()->removeObserver(this);
 #ifdef LOCKANDFLIP_SUPPORTED
-    m_deviceInfo->keylockStatus()->removeObserver(this);
-    m_deviceInfo->flipStatus()->removeObserver(this);
+    DeviceInfo::instance()->keylockStatus()->removeObserver(this);
+    DeviceInfo::instance()->flipStatus()->removeObserver(this);
 #endif
 #ifdef THERMALSTATUS_SUPPORTED
-    m_deviceInfo->thermalStatus()->removeObserver(this);
+    DeviceInfo::instance()->thermalStatus()->removeObserver(this);
 #endif
     if (m_proEngNotifyHandler) {
         m_proEngNotifyHandler->CancelProfileActivationNotifications();
@@ -1427,7 +1428,7 @@ QSystemDeviceInfo::InputMethodFlags QSystemDeviceInfoPrivate::inputMethodType()
 
 QSystemDeviceInfo::PowerState QSystemDeviceInfoPrivate::currentPowerState()
 {
-    switch (m_deviceInfo->chargingStatus()->chargingStatus()) {
+    switch (DeviceInfo::instance()->chargingStatus()->chargingStatus()) {
     case EChargingStatusNotConnected:
     case EChargingStatusNotCharging:
     case EChargingStatusError:
@@ -1446,7 +1447,7 @@ QSystemDeviceInfo::PowerState QSystemDeviceInfoPrivate::currentPowerState()
 QSystemDeviceInfo::ThermalState QSystemDeviceInfoPrivate::currentThermalState()
 {
 #ifdef THERMALSTATUS_SUPPORTED
-    TUint8 thermalstate = m_deviceInfo->thermalStatus()->getThermalStatus();
+    TUint8 thermalstate = DeviceInfo::instance()->thermalStatus()->getThermalStatus();
     switch ( thermalstate ) {
       case ENormal:
        return QSystemDeviceInfo::NormalThermal;
@@ -1492,7 +1493,7 @@ void QSystemDeviceInfoPrivate::NotiftythermalStateChanged(TUint8 thermalstate)
 
 QString QSystemDeviceInfoPrivate::imei()
 {
-    return m_deviceInfo->phoneInfo()->imei();
+    return DeviceInfo::instance()->phoneInfo()->imei();
 }
 
 QString QSystemDeviceInfoPrivate::imsi()
@@ -1500,17 +1501,17 @@ QString QSystemDeviceInfoPrivate::imsi()
     if (simStatus() == QSystemDeviceInfo::SimNotAvailable)
         return QString();
     else
-        return m_deviceInfo->subscriberInfo()->imsi();
+        return DeviceInfo::instance()->subscriberInfo()->imsi();
 }
 
 QString QSystemDeviceInfoPrivate::manufacturer()
 {
-    return m_deviceInfo->phoneInfo()->manufacturer();
+    return DeviceInfo::instance()->phoneInfo()->manufacturer();
 }
 
 QString QSystemDeviceInfoPrivate::model()
 {
-    return m_deviceInfo->phoneInfo()->model();
+    return DeviceInfo::instance()->phoneInfo()->model();
 }
 
 QString QSystemDeviceInfoPrivate::productName()
@@ -1525,12 +1526,12 @@ QString QSystemDeviceInfoPrivate::productName()
 
 int QSystemDeviceInfoPrivate::batteryLevel() const
 {
-    return m_deviceInfo->batteryInfo()->batteryLevel();
+    return DeviceInfo::instance()->batteryInfo()->batteryLevel();
 }
 
 QSystemDeviceInfo::BatteryStatus QSystemDeviceInfoPrivate::batteryStatus()
 {
-    int batteryLevel = m_deviceInfo->batteryInfo()->batteryLevel();
+    int batteryLevel = DeviceInfo::instance()->batteryInfo()->batteryLevel();
     QSystemDeviceInfo::PowerState currentpwrstate = currentPowerState();
     if (batteryLevel < 15 ) {
         if ( (currentpwrstate == QSystemDeviceInfo::WallPowerChargingBattery) || (currentpwrstate == QSystemDeviceInfo::WallPower) ) {
@@ -1556,7 +1557,7 @@ QSystemDeviceInfo::BatteryStatus QSystemDeviceInfoPrivate::batteryStatus()
 QSystemDeviceInfo::SimStatus QSystemDeviceInfoPrivate::simStatus()
 {
 #ifdef SYMBIAN_3_1
-    if (!m_deviceInfo->subscriberInfo()->imsi().isEmpty())
+    if (!DeviceInfo::instance()->subscriberInfo()->imsi().isEmpty())
         return QSystemDeviceInfo::SingleSimAvailable;
 #else //SYMBIAN_3_1
     TInt lockStatus = 0;
@@ -1642,7 +1643,7 @@ QSystemDeviceInfo::KeyboardTypeFlags QSystemDeviceInfoPrivate::keyboardTypes()
         default:
                 break;
                 }
-        bool filpKbStatus = m_deviceInfo->flipStatus()->IsFlipSupported();
+        bool filpKbStatus = DeviceInfo::instance()->flipStatus()->IsFlipSupported();
         if ( filpKbStatus ) {
              if ( keyboardFlags == QSystemDeviceInfo::UnknownKeyboard)
                 keyboardFlags = QSystemDeviceInfo::FlipKeyboard;
@@ -1683,8 +1684,8 @@ bool QSystemDeviceInfoPrivate::isKeyboardFlippedOpen()
 {
 #ifdef LOCKANDFLIP_SUPPORTED
     // It is functional only for the Grip open devices
-    // TBD Remove : (m_deviceInfo->flipStatus()->IsFlipSupported())
-    return ( m_deviceInfo->flipStatus()->getFlipStatus() );
+    // TBD Remove : (DeviceInfo::instance()->flipStatus()->IsFlipSupported())
+    return ( DeviceInfo::instance()->flipStatus()->getFlipStatus() );
 #else
     return false;
 #endif
@@ -1739,7 +1740,7 @@ QSystemDeviceInfo::LockTypeFlags QSystemDeviceInfoPrivate::lockStatus()
     QSystemDeviceInfo::LockTypeFlags status = QSystemDeviceInfo::UnknownLock;
 
 #ifdef LOCKANDFLIP_SUPPORTED
-    int value = m_deviceInfo->keylockStatus()->getLockStatus();
+    int value = DeviceInfo::instance()->keylockStatus()->getLockStatus();
     switch ( value ){
              /*case EKeyguardNotActive:
                 status = QSystemDeviceInfo::DeviceUnlocked;
@@ -1853,11 +1854,11 @@ void QSystemScreenSaverPrivate::setScreenSaverInhibited(bool on)
 }
 
 QSystemBatteryInfoPrivate::QSystemBatteryInfoPrivate(QObject *parent)
-: QSystemInfoPrivateBase(parent) , m_batteryHWRM(NULL)
+: QObject(parent) , m_batteryHWRM(NULL)
 {
     m_batteryHWRM = CBatteryHWRM::New();
     bool chargestate,usbstate;
-    m_deviceInfo->batteryCommonInfo()->ChargerType(chargestate,usbstate);
+    DeviceInfo::instance()->batteryCommonInfo()->ChargerType(chargestate,usbstate);
     if (chargestate) {
         if (usbstate)
             m_charger = QSystemBatteryInfo::USBCharger;
@@ -1866,12 +1867,12 @@ QSystemBatteryInfoPrivate::QSystemBatteryInfoPrivate(QObject *parent)
     } else
         m_charger = QSystemBatteryInfo::NoCharger;
     m_previousChagrger = m_charger ;
-    m_deviceInfo->batteryCommonInfo()->AddObserver(this);
+    DeviceInfo::instance()->batteryCommonInfo()->AddObserver(this);
 }
 
 QSystemBatteryInfoPrivate::~QSystemBatteryInfoPrivate()
 {
-    m_deviceInfo->batteryCommonInfo()->RemoveObserver(this);
+    DeviceInfo::instance()->batteryCommonInfo()->RemoveObserver(this);
     if (m_batteryHWRM)
     {
         delete(m_batteryHWRM);
@@ -1883,7 +1884,7 @@ QSystemBatteryInfoPrivate::~QSystemBatteryInfoPrivate()
 QSystemBatteryInfo::ChargerType QSystemBatteryInfoPrivate::chargerType() const
 {
     bool chargestate,usbstate;
-    m_deviceInfo->batteryCommonInfo()->ChargerType(chargestate,usbstate);
+    DeviceInfo::instance()->batteryCommonInfo()->ChargerType(chargestate,usbstate);
     QSystemBatteryInfo::ChargerType result = QSystemBatteryInfo::UnknownCharger;
     if (chargestate) {
         if (usbstate)
@@ -1897,7 +1898,7 @@ QSystemBatteryInfo::ChargerType QSystemBatteryInfoPrivate::chargerType() const
 
 QSystemBatteryInfo::ChargingState QSystemBatteryInfoPrivate::chargingState() const
 {
-    bool batteryChargingState = m_deviceInfo->batteryCommonInfo()->ChargingState();
+    bool batteryChargingState = DeviceInfo::instance()->batteryCommonInfo()->ChargingState();
     QSystemBatteryInfo::ChargingState result = QSystemBatteryInfo::ChargingError;
     if (batteryChargingState)
         result = QSystemBatteryInfo::Charging;
@@ -1909,23 +1910,23 @@ QSystemBatteryInfo::ChargingState QSystemBatteryInfoPrivate::chargingState() con
 
 int QSystemBatteryInfoPrivate::nominalCapacity() const
 {
-    return m_deviceInfo->batteryCommonInfo()->NominalCapacity();
+    return DeviceInfo::instance()->batteryCommonInfo()->NominalCapacity();
 }
 
 int QSystemBatteryInfoPrivate::remainingCapacityPercent() const
 {
-    return m_deviceInfo->batteryCommonInfo()->RemainingCapacityPercent();
+    return DeviceInfo::instance()->batteryCommonInfo()->RemainingCapacityPercent();
 }
 
 int QSystemBatteryInfoPrivate::remainingCapacity() const
 {
-    return m_deviceInfo->batteryCommonInfo()->RemainingCapacity();
+    return DeviceInfo::instance()->batteryCommonInfo()->RemainingCapacity();
 }
 
 
 int QSystemBatteryInfoPrivate::voltage() const
 {
-    return m_deviceInfo->batteryCommonInfo()->Voltage();
+    return DeviceInfo::instance()->batteryCommonInfo()->Voltage();
 }
 
 int QSystemBatteryInfoPrivate::remainingChargingTime() const
@@ -1936,14 +1937,14 @@ int QSystemBatteryInfoPrivate::remainingChargingTime() const
 int QSystemBatteryInfoPrivate::currentFlow() const
 {
     if ( m_batteryHWRM )
-        return m_batteryHWRM->GetAvergaeCurrent( );
+        return m_batteryHWRM->GetAverageCurrent( );
     else
         return -1;
 }
 
 int QSystemBatteryInfoPrivate::remainingCapacityBars() const
 {
-    return m_deviceInfo->batteryCommonInfo()->RemainingCapacityBars();
+    return DeviceInfo::instance()->batteryCommonInfo()->RemainingCapacityBars();
 }
 
 int QSystemBatteryInfoPrivate::maxBars() const
@@ -1954,7 +1955,7 @@ int QSystemBatteryInfoPrivate::maxBars() const
 QSystemBatteryInfo::BatteryStatus QSystemBatteryInfoPrivate::batteryStatus() const
 {
     QString logString;
-    int batteryStatusVal = m_deviceInfo->batteryCommonInfo()->BatteryStatus();
+    int batteryStatusVal = DeviceInfo::instance()->batteryCommonInfo()->BatteryStatus();
     QSystemBatteryInfo::BatteryStatus result = QSystemBatteryInfo::BatteryUnknown;
     switch (batteryStatusVal) {
                 case EBatteryStatusOk : result = QSystemBatteryInfo:: BatteryOk ;
@@ -2044,7 +2045,7 @@ void QSystemBatteryInfoPrivate::changedChargingState() {
 
 void QSystemBatteryInfoPrivate::changedChargerType() {
     bool chargestate,usbstate;
-    m_deviceInfo->batteryCommonInfo()->ChargerType(chargestate,usbstate);
+    DeviceInfo::instance()->batteryCommonInfo()->ChargerType(chargestate,usbstate);
     if (chargestate) {
         if (usbstate)
             m_charger = QSystemBatteryInfo::USBCharger;
diff --git a/src/systeminfo/qsysteminfo_s60_p.h b/src/systeminfo/qsysteminfo_s60_p.h
index cbca8c0b5f..9a1aa99890 100644
--- a/src/systeminfo/qsysteminfo_s60_p.h
+++ b/src/systeminfo/qsysteminfo_s60_p.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -89,30 +89,15 @@
 #include "networkoperatornamelistener_s60.h"
 #endif
 
+#include <QThread>
 QT_BEGIN_HEADER
 
 QTM_BEGIN_NAMESPACE
 
 const int KMaxBatteryBars = 7; //Max number of battery bars (7 is fixed for all symbian devices now)
 
-class DeviceInfo;
-
-//////// QSystemInfoPrivateBase
-class QSystemInfoPrivateBase : public QObject
-{
-    Q_OBJECT
-
-public:
-
-    QSystemInfoPrivateBase(QObject *parent = 0);
-    virtual ~QSystemInfoPrivateBase();
-
-protected:
-    DeviceInfo* m_deviceInfo;
-};
-
 //////// QSystemInfo
-class QSystemInfoPrivate : public QSystemInfoPrivateBase
+class QSystemInfoPrivate : public QObject
 {
     Q_OBJECT
 
@@ -137,7 +122,7 @@ private:
 };
 
 //////// QSystemNetworkInfo
-class QSystemNetworkInfoPrivate : public QSystemInfoPrivateBase, public MTelephonyInfoObserver, public MNetworkInfoObserver, public MWlanInfoObserver
+class QSystemNetworkInfoPrivate : public QObject, public MTelephonyInfoObserver, public MNetworkInfoObserver, public MWlanInfoObserver
 #ifdef NETWORKHANDLER_SYMBIAN_SUPPORTED
 , public MNetworkOperatorNameObserver
 #endif
@@ -245,7 +230,7 @@ private:
 };
 
 //////// QSystemStorageInfo
-class QSystemStorageInfoPrivate : public QSystemInfoPrivateBase,
+class QSystemStorageInfoPrivate : public QObject,
     public MStorageStatusObserver
 #ifdef DISKNOTIFY_SUPPORTED
     ,public MStorageSpaceNotifyObserver
@@ -295,7 +280,7 @@ class MProEngNotifyHandler;
 
 QTM_BEGIN_NAMESPACE
 
-class QSystemDeviceInfoPrivate : public QSystemInfoPrivateBase,
+class QSystemDeviceInfoPrivate : public QObject,
     public MTelephonyInfoObserver,
     public MProEngProfileActivationObserver,
     public MCenRepNotifyHandlerCallback,
@@ -435,18 +420,112 @@ private:    //data
 class DeviceInfo
 {
 public:
+    static DeviceInfo *instance()
+      {
+      TRACES( qDebug() << "DeviceInfo::instance()"
+              << ": QThread id = " << QThread::currentThread()
+              << "Symbian thread id = " << RThread().Id().Id());
+      if (!Dll::Tls())
+        {
+           Dll::SetTls(new DeviceInfo);
+        TRACES( qDebug() << "DeviceInfo::instance() CREATED!"
+               << ": QThread id = " << QThread::currentThread()
+               << "Symbian thread id = " << RThread().Id().Id());
+        }
+      return static_cast<DeviceInfo *>(Dll::Tls());
+    }
+
+  void initMobilePhonehandleL()
+    {
+  #ifdef ETELMM_SUPPORTED
+        if (m_rmobilePhoneInitialised)
+          return;
+
+        TInt err = KErrNone;
+        err = m_etelServer.Connect();
+        if ( err != KErrNone ) {
+          TRACES (qDebug() << "DeviceInfo:: InitMobilePhonehandle err code RTelServer::Connect" << err);
+          User::Leave(err);
+        }
+
+        //Eumerate legal phone
+        // Get number of phones
+        TInt phones(0);
+        User::LeaveIfError(m_etelServer.EnumeratePhones(phones));
+
+        // Get phone info of first legal phone.
+        TInt legalPhoneIndex = KErrNotFound;
+        for (TInt i=0; i<phones && legalPhoneIndex == KErrNotFound; i++)
+        {
+          if (m_etelServer.GetPhoneInfo(i, m_etelphoneInfo) == KErrNone)
+            {
+            if (m_etelphoneInfo.iNetworkType == RTelServer::ENetworkTypeMobileDigital)
+              {
+                legalPhoneIndex = i;
+              }
+            }
+        }
+        User::LeaveIfError(legalPhoneIndex);
+
+        err = m_rmobilePhone.Open(m_etelServer,m_etelphoneInfo.iName);
+        if (err != KErrNone) {
+          TRACES (qDebug() << "DeviceInfo:: InitMobilePhonehandle err code RMobilePhone::Open =" << err);
+          User::Leave(err);
+        }
+
+        err = m_rmobilePhone.Initialise();
+        if (err != KErrNone) {
+            TRACES (qDebug() << "DeviceInfo:: InitMobilePhonehandle err val for RMobilePhone::Initialise =" << err);
+            User::Leave(err);
+        }
+
+        TRACES (qDebug() << "InitMobilePhonehandleL- successful");
+        m_rmobilePhoneInitialised = true;
+  #endif
+    }
+
+  void initRmobilePhone()
+    {
+  #ifdef ETELMM_SUPPORTED
+        TRAPD ( err,initMobilePhonehandleL());
+        if (err ) {
+           m_rmobilePhone.Close();
+               m_etelServer.Close();
+              }
+  #endif
+    }
+
+    bool etelmmSupported()
+      {
+      #ifdef ETELMM_SUPPORTED
+            return true;
+      #else
+            return false;
+      #endif
+      }
+
     CPhoneInfo *phoneInfo()
     {
+      if (etelmmSupported() && !m_rmobilePhoneInitialised) initRmobilePhone();
         if (!m_phoneInfo) {
-            m_phoneInfo = new CPhoneInfo(*m_telephony);
+#ifdef ETELMM_SUPPORTED
+        m_phoneInfo = new CPhoneInfo(m_rmobilePhone);
+#else
+        m_phoneInfo = new CPhoneInfo(*m_telephony);
+#endif
         }
         return m_phoneInfo;
     }
 
     CSubscriberInfo *subscriberInfo()
     {
+      if (etelmmSupported() && !m_rmobilePhoneInitialised) initRmobilePhone();
         if (!m_subscriberInfo) {
-            m_subscriberInfo = new CSubscriberInfo(*m_telephony);
+#ifdef ETELMM_SUPPORTED
+         m_subscriberInfo = new CSubscriberInfo(m_rmobilePhone);
+#else
+         m_subscriberInfo = new CSubscriberInfo(*m_telephony);
+#endif
         }
         return m_subscriberInfo;
     }
@@ -461,32 +540,52 @@ public:
 
     CBatteryInfo *batteryInfo()
     {
+      if (etelmmSupported() && !m_rmobilePhoneInitialised) initRmobilePhone();
         if (!m_batteryInfo) {
-            m_batteryInfo = new CBatteryInfo(*m_telephony);
+#ifdef ETELMM_SUPPORTED
+         m_batteryInfo = new CBatteryInfo(m_rmobilePhone);
+#else
+         m_batteryInfo = new CBatteryInfo(*m_telephony);
+#endif
         }
         return m_batteryInfo;
     }
 
     CCellNetworkInfo *cellNetworkInfo()
     {
+      if (etelmmSupported() && !m_rmobilePhoneInitialised) initRmobilePhone();
         if (!m_cellNetworkInfo) {
-            m_cellNetworkInfo = new CCellNetworkInfo(*m_telephony);
+#ifdef ETELMM_SUPPORTED
+         m_cellNetworkInfo = new CCellNetworkInfo(m_rmobilePhone);
+#else
+         m_cellNetworkInfo = new CCellNetworkInfo(*m_telephony);
+#endif
         }
         return m_cellNetworkInfo;
     }
 
     CCellNetworkRegistrationInfo *cellNetworkRegistrationInfo()
     {
+      if (etelmmSupported() && !m_rmobilePhoneInitialised) initRmobilePhone();
         if (!m_cellNetworkRegistrationInfo) {
-            m_cellNetworkRegistrationInfo = new CCellNetworkRegistrationInfo(*m_telephony);
+#ifdef ETELMM_SUPPORTED
+        m_cellNetworkRegistrationInfo = new CCellNetworkRegistrationInfo(m_rmobilePhone);
+#else
+        m_cellNetworkRegistrationInfo = new CCellNetworkRegistrationInfo(*m_telephony);
+#endif
         }
         return m_cellNetworkRegistrationInfo;
     }
 
     CCellSignalStrengthInfo *cellSignalStrenghtInfo()
     {
+      if (etelmmSupported() && !m_rmobilePhoneInitialised) initRmobilePhone();
         if (!m_cellSignalStrengthInfo) {
-            m_cellSignalStrengthInfo = new CCellSignalStrengthInfo(*m_telephony);
+#ifdef ETELMM_SUPPORTED
+        m_cellSignalStrengthInfo = new CCellSignalStrengthInfo(m_rmobilePhone);
+#else
+        m_cellSignalStrengthInfo = new CCellSignalStrengthInfo(*m_telephony);
+#endif
         }
         return m_cellSignalStrengthInfo;
     }
@@ -567,9 +666,10 @@ public:
 
     CNetworkInfo* networkInfo ()
     {
-        if (!m_networkInfo) {
-           m_networkInfo = new  CNetworkInfo();
-        }
+        if (!m_networkInfo)
+            m_networkInfo = new CNetworkInfo();
+        if (!m_networkInfo->IsInitialised())
+            m_networkInfo->Initialise();
         return m_networkInfo;
     }
 
@@ -588,6 +688,7 @@ public:
 #ifdef NETWORKHANDLER_SYMBIAN_SUPPORTED
         ,m_networkinfolistener(NULL)
 #endif
+    ,m_rmobilePhoneInitialised(false)
     {
         TRACES(qDebug() << "DeviceInfo():Constructor");
         m_telephony = CTelephony::NewL();
@@ -623,6 +724,11 @@ public:
 #ifdef NETWORKHANDLER_SYMBIAN_SUPPORTED
         delete m_networkinfolistener;
 #endif
+
+#ifdef ETELMM_SUPPORTED
+    m_etelServer.Close();
+    m_rmobilePhone.Close();
+#endif
     }
 
 private:
@@ -656,9 +762,15 @@ private:
    CNetworkOperatorNameListener* m_networkinfolistener;
 #endif
 
+#ifdef ETELMM_SUPPORTED
+    RTelServer m_etelServer;
+    RMobilePhone m_rmobilePhone;
+    RTelServer::TPhoneInfo m_etelphoneInfo;
+#endif
+  bool m_rmobilePhoneInitialised;
 };
 
-class QSystemBatteryInfoPrivate : public QSystemInfoPrivateBase, public MBatteryInfoObserver, public MBatteryHWRMObserver
+class QSystemBatteryInfoPrivate : public QObject, public MBatteryInfoObserver, public MBatteryHWRMObserver
 {
     Q_OBJECT
 public:
diff --git a/src/systeminfo/qsysteminfo_win.cpp b/src/systeminfo/qsysteminfo_win.cpp
index 7e5be53fbf..16e28a97b4 100644
--- a/src/systeminfo/qsysteminfo_win.cpp
+++ b/src/systeminfo/qsysteminfo_win.cpp
@@ -1737,7 +1737,7 @@ bool qax_winEventFilter(void *message)
 
         qDebug() << Q_FUNC_INFO;
         POWERBROADCAST_SETTING* pps = (POWERBROADCAST_SETTING*) pMsg->lParam;
-        if ( sizeof(int) == pps->DataLength &&
+        if ( pps && sizeof(int) == pps->DataLength &&
                 pps->PowerSetting == GUID_BATTERY_PERCENTAGE_REMAINING ) {
             int nPercentLeft = *(int*)(DWORD_PTR) pps->Data;
 
diff --git a/src/systeminfo/qsystemstorageinfo.cpp b/src/systeminfo/qsystemstorageinfo.cpp
index 3211e8d1fb..143629df63 100644
--- a/src/systeminfo/qsystemstorageinfo.cpp
+++ b/src/systeminfo/qsystemstorageinfo.cpp
@@ -107,6 +107,82 @@ QSystemStorageInfoPrivate *getSystemStorageInfoPrivate() { return storageInfoPri
 */
 
 /*!
+    \qmlclass StorageInfo
+    \brief The StorageInfo element provides access to disk storage information from the system.
+
+    \ingroup qml-systeminfo
+    \since Mobility 1.2
+
+    This element is part of the \bold{QtMobility.systeminfo 1.2} module.
+    It is a convience class to make QML usage easier.
+
+    \sa QSystemStorageInfo
+*/
+
+/*!
+  \qmlproperty list StorageInfo::logicalDrives
+  \since Mobility 1.2
+
+  Returns list of logical drives.
+  */
+
+/*!
+  \qmlmethod long StorageInfo::totalDiskSpace(string drive)
+  \since Mobility 1.2
+
+  Returns the amount of total space on the given drive, in bytes.
+  */
+
+/*!
+  \qmlmethod long StorageInfo::availableDiskSpace(string drive)
+  \since Mobility 1.2
+
+  Returns the available disk space on the given drive, in bytes.
+*/
+
+/*!
+    \qmlmethod string StorageInfo::uriForDrive(string drive)
+    \since Mobility 1.2
+
+    Returns the URI, or unique identifier for the given drive.
+*/
+
+/*!
+    \qmlmethod StorageState StorageInfo::getStorageState(string drive)
+    \since Mobility 1.2
+
+    Returns the storage state of the given drive.
+
+    \sa QSystemStorageInfo::StorageState
+*/
+
+/*!
+    \qmlmethod DriveType StorageInfo::typeForDrive(string drive)
+    \since Mobility 1.2
+
+    Returns the type of the given drive.
+
+    \sa QSystemStorageInfo::DriveType
+*/
+
+/*!
+    \qmlsignal StorageInfo::logicalDriveChanged(bool added, string drive)
+    \since Mobility 1.2
+
+    This signal gets emitted when a new drive storage has been added or removed. If \a bool is true,
+    it means a new drive is found, otherwise a drive is removed.
+ */
+
+/*!
+    \qmlsignal StorageInfo::storageStateChanged(string drive, QSystemStorageInfo::StorageState state)
+    \since Mobility 1.2
+
+    This signal gets emitted when the storage state of a drive has changed to state. Note that the
+    polling time may be different for different platforms.
+ */
+
+
+/*!
     Constructs a QSystemStorageInfo with the given \a parent.
 */
 QSystemStorageInfo::QSystemStorageInfo(QObject *parent)
diff --git a/src/systeminfo/symbian/batterystatus_s60.cpp b/src/systeminfo/symbian/batterystatus_s60.cpp
index 4b5e1a5178..7bd241392c 100644
--- a/src/systeminfo/symbian/batterystatus_s60.cpp
+++ b/src/systeminfo/symbian/batterystatus_s60.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "batterystatus_s60.h"
+#include "trace.h"
 
 CBatteryCommonInfo::CBatteryCommonInfo() : iBatteryStatus(NULL), iBatteryChargingStatus(NULL), iCapacityBars(NULL), iUsbConnected(EFalse),iChargingON(EFalse)
     {
@@ -290,17 +291,29 @@ CBatteryHWRM::~CBatteryHWRM()
         iHwrmPower = NULL;
         }
     #endif
+        delete iEventLoop;
     }
+
 #ifdef SYMBIAN_3_PLATFORM
 void CBatteryHWRM::PowerMeasurement(TInt aErr, CHWRMPower::TBatteryPowerMeasurementData& aMeasurement)
     {
+    TRACES (qDebug() << "CBatteryHWRM::PowerMeasurement received error code:" << aErr);
     if ( KErrNone == aErr)
         {
         if ( iAverageCurrent != aMeasurement.iAverageCurrent )
             {
+            TRACES (qDebug() << "Average current changed");
             //currentFlowChanged SIGNAL
             iAverageCurrent = aMeasurement.iAverageCurrent;
-            iObserver->changedCurrentFlow(iAverageCurrent);
+            if ( iObserver ){
+                iObserver->changedCurrentFlow(iAverageCurrent);
+                }
+
+            if ( iEventLoop ) //for initializing average current
+                {
+                TRACES (qDebug() << "EventLoop::exiting");
+                if ( iEventLoop->isRunning()) iEventLoop->exit();
+                }
             }
         }
     else if (iPowerReportingON)
@@ -308,18 +321,31 @@ void CBatteryHWRM::PowerMeasurement(TInt aErr, CHWRMPower::TBatteryPowerMeasurem
     }
 #endif
 
-TInt CBatteryHWRM::GetAvergaeCurrent() const
+TInt CBatteryHWRM::GetAverageCurrent()
     {
+#ifdef SYMBIAN_3_PLATFORM
+    TInt result = StartCurrentFlowMeasurement();
+    if ( !iEventLoop ) //Wait until PowerMeasurement callback is received
+            {
+            iEventLoop = new QEventLoop();
+            TRACES ( qDebug() << "started event loop...");
+            }
+
+    iEventLoop->exec();
+    StopCurrentFlowMeasurement();
+#endif
     return iAverageCurrent;
     }
 
 TInt CBatteryHWRM::StartCurrentFlowMeasurement()
     {
+    TRACES (qDebug() << "CBatteryHWRM::StartCurrentFlowMeasurement");
     TRequestStatus status;
     iPowerReportingON = ETrue;
     #ifdef SYMBIAN_3_PLATFORM
     if ( iHwrmPower )
         {
+        TRACES (qDebug() << "Start Average power state reporting");
         iHwrmPower->StartAveragePowerReporting(status, 1);
         User::WaitForRequest(status);
         return (status.Int());
@@ -338,6 +364,7 @@ TInt CBatteryHWRM::StartMeasurementAndSetObserver(MBatteryHWRMObserver* aObserve
 
 void CBatteryHWRM::StopCurrentFlowMeasurement()
     {
+    TRACES (qDebug() << "CBatteryHWRM::StopCurrentFlowMeasurement");
     #ifdef SYMBIAN_3_PLATFORM
     if ( iHwrmPower )
         TRAP_IGNORE(iHwrmPower->StopAveragePowerReportingL() );
diff --git a/src/systeminfo/symbian/batterystatus_s60.h b/src/systeminfo/symbian/batterystatus_s60.h
index 475596b683..400d96f14d 100644
--- a/src/systeminfo/symbian/batterystatus_s60.h
+++ b/src/systeminfo/symbian/batterystatus_s60.h
@@ -47,6 +47,7 @@
 #endif
 #include <e32debug.h>
 #include <QList>
+#include <QEventLoop>
 //#include <QtDebug>
 
 #ifndef BATTERYCOMMONINFO_H
@@ -124,7 +125,7 @@ private :
     CBatteryHWRM();
 public:
     static CBatteryHWRM* New( );
-    TInt GetAvergaeCurrent() const;
+    TInt GetAverageCurrent();
     ~CBatteryHWRM();
     TInt StartMeasurementAndSetObserver(MBatteryHWRMObserver* );
     void StopCurrentFlowMeasurement();
@@ -143,6 +144,7 @@ private:
     CHWRMPower *iHwrmPower;
     #endif
     TBool iPowerReportingON;
+    QEventLoop* iEventLoop;
     };
 
 #endif //BATTERYCOMMONINFO_H
diff --git a/src/systeminfo/symbian/chargingstatus_s60.cpp b/src/systeminfo/symbian/chargingstatus_s60.cpp
index fa1e8dc046..bc49387c6b 100644
--- a/src/systeminfo/symbian/chargingstatus_s60.cpp
+++ b/src/systeminfo/symbian/chargingstatus_s60.cpp
@@ -85,15 +85,17 @@ void CChargingStatus::RunL()
     int status = EChargingStatusError;
     m_chargingProperty.Get(status);
     m_currentStatus = (EPSHWRMChargingStatus)status;
-    
+
     foreach (MChargingStatusObserver *observer, m_observers)
         observer->chargingStatusChanged();
-    
+
     startMonitoring();
 }
 
 void CChargingStatus::startMonitoring()
 {
+  if (!IsActive()) {
     m_chargingProperty.Subscribe(iStatus);
     SetActive();
+  }
 }
diff --git a/src/systeminfo/symbian/lockandflipstatus_s60.cpp b/src/systeminfo/symbian/lockandflipstatus_s60.cpp
index 78dcd72ca9..49af8cf0ce 100644
--- a/src/systeminfo/symbian/lockandflipstatus_s60.cpp
+++ b/src/systeminfo/symbian/lockandflipstatus_s60.cpp
@@ -189,8 +189,10 @@ void CFlipStatus::RunL()
 
 void CFlipStatus::startMonitoring()
 {
+  if (!IsActive()) {
     m_FlipProperty.Subscribe(iStatus);
     SetActive();
+    }
 }
 
 bool CFlipStatus::getFlipStatus()
diff --git a/src/systeminfo/symbian/networkinfo_s60.cpp b/src/systeminfo/symbian/networkinfo_s60.cpp
index ecc95b8c72..3084cd0676 100644
--- a/src/systeminfo/symbian/networkinfo_s60.cpp
+++ b/src/systeminfo/symbian/networkinfo_s60.cpp
@@ -40,308 +40,311 @@
 ****************************************************************************/
 #include "networkinfo_s60.h"
 #include "trace.h"
+
 //This const is added as alternative for EPacketNotifyDynamicCapsChange in pcktcs.h
 const TInt KPacketNofityDynamicCapsChange = 40021;
 
-
-CNetworkBase::CNetworkBase() : CActive(EPriorityNormal),
-iConstructed(EFalse), iObserver(NULL),iDynCaps(0),iPacketdataserviceCaps(true)
-    {
-    TInt err = 0;
-    TRACES(qDebug() << "CNetworkBase::CNetworkBase<---");
+#ifdef ETELMM_SUPPORTED
+CNetworkMode::CNetworkMode(MNetworkObserver *aObserver, RMobilePhone &aMobilePhone)
+    : CActive(EPriorityNormal),
+      iNetworkMode(RMobilePhone::ENetworkModeUnknown),
+      iObserver(aObserver),
+      iMobilePhone(aMobilePhone)
+{
     CActiveScheduler::Add(this);
 
-    TRAP_IGNORE(
-        err = iTelServer.Connect();
-        TRACES(qDebug() << "Err val for RTelServer::Connect" << err);
-        User::LeaveIfError(err);
-    )
-
-    CleanupClosePushL(iTelServer);
+    TInt err = iMobilePhone.GetCurrentMode(iNetworkMode);
+    TRACES(qDebug() << "Current Network mode in ctr" <<  iNetworkMode);
 
-    TRAP_IGNORE(
-        err = iTelServer.GetPhoneInfo( 0, iPhoneInfo );
-        TRACES(qDebug() << "Err val for RTelServer::GetPhoneInfo =" << err);
-        User::LeaveIfError(err);
-        err = iMobilePhone.Open(iTelServer,iPhoneInfo.iName);
-        TRACES(qDebug() << "Err val for RMobilePhone::Open =" << err);
-        User::LeaveIfError(err);
-        err = iMobilePhone.Initialise();
-        TRACES(qDebug() << "Err val for RMobilePhone::Initialise =" << err);
-        User::LeaveIfError(err);
-    )
-
-    CleanupClosePushL(iMobilePhone);
-
-#ifdef ETELPACKETSERVICE_SUPPORTED
-    TRAP_IGNORE(
-        TInt packetserviceerr = iPacketService.Open(iMobilePhone);
-        if ( packetserviceerr != KErrNone ) iPacketdataserviceCaps = false;
-        TRACES(qDebug() << "Err val for iPacketService.Open =" << packetserviceerr);
-        if ( iPacketdataserviceCaps ) {
-         err = iPacketService.GetStatus(iPacketServiceStatus);
-         TRACES(qDebug() << "Err val for iPacketService.GetStatus =" << err);
-        }
-    )
-#endif
     if (!err)
-        {
-        iConstructed = ETrue;
-        }
-    CleanupStack::Pop(&iMobilePhone);
-    CleanupStack::Pop(&iTelServer);
-    TRACES(qDebug() << "CNetworkBase::CNetworkBase--->");
-    }
-
-CNetworkBase::~CNetworkBase()
-    {
-#ifdef ETELPACKETSERVICE_SUPPORTED
-    iPacketService.Close();
-#endif
-    iMobilePhone.Close();
-    iTelServer.Close();
-    }
-
-void CNetworkBase::AddObserver(MNetworkObserver *aObserver)
-    {
-    iObserver = aObserver;
-    }
-
-void CNetworkBase::RemoveObserver()
-    {
-    iObserver = NULL;
-    }
+        StartMonitoring();
+}
 
-CNetworkMode::CNetworkMode()
-    {
-#ifdef ETELMM_SUPPORTED
-    TRACES(qDebug() << "CNetworkMode::CNetworkMode--Start");
-    if (iConstructed)
-        {
-        TInt err = iMobilePhone.GetCurrentMode( iNetworkMode );
-        TRACES(qDebug() << "Current Network mode in ctr" <<  iNetworkMode);
-
-        if (!err)
-            {
-            StartMonitoring();
-            }
-        else
-            iConstructed = EFalse;
-        }
-#endif
-    }
 CNetworkMode::~CNetworkMode()
-    {
-        Cancel();
-    }
+{
+    Cancel();
+}
 
 void CNetworkMode::DoCancel()
-    {
-#ifdef ETELMM_SUPPORTED
+{
     TRACES ( qDebug() << "CNetworkMode::DoCancel<--" );
     iMobilePhone.CancelAsyncRequest(EMobilePhoneNotifyModeChange);
     TRACES ( qDebug() << "CNetworkMode::DoCancel-->" );
-#endif
-    }
+}
 
 void CNetworkMode::RunL()
-    {
+{
     TRACES(qDebug() << "CNetworkMode::RunL-Networkmode is<--:" << iNetworkMode);
-    User::LeaveIfError(iStatus.Int());
-    iObserver->ChangedNetworkMode();
+    if (iStatus.Int() == KErrNone)
+        iObserver->ChangedNetworkMode();
     StartMonitoring();
     TRACES(qDebug() << "CNetworkMode::RunL()--->");
-    }
+}
 
 void CNetworkMode::StartMonitoring()
-    {
-#ifdef ETELMM_SUPPORTED
-    iMobilePhone.NotifyModeChange ( iStatus,iNetworkMode);
-    SetActive();
-    TRACES(qDebug() << "CNetworkMode::StartMonitoring--End");
-#endif
+{
+    if (!IsActive()) {
+        iMobilePhone.NotifyModeChange(iStatus, iNetworkMode);
+        SetActive();
     }
+    TRACES(qDebug() << "CNetworkMode::StartMonitoring--End");
+}
 
 RMobilePhone::TMobilePhoneNetworkMode CNetworkMode::GetMode() const
-    {
+{
     return iNetworkMode;
-    }
+}
 
-CNetworkStatus::CNetworkStatus()
-   {
+CNetworkStatus::CNetworkStatus(MNetworkObserver *aObserver, RMobilePhone &aMobilePhone)
+    : CActive(EPriorityNormal),
+      iNetStatus(RMobilePhone::ERegistrationUnknown),
+      iObserver(aObserver),
+      iMobilePhone(aMobilePhone)
+{
+    TRACES (qDebug() << "CNetworkStatus::CNetworkStatus<----");
+    CActiveScheduler::Add(this);
 
-#ifdef ETELMM_SUPPORTED
-   TRACES (qDebug() << "CNetworkStatus::CNetworkStatus<----");
-      if (iConstructed)
-        {
-        TInt err = iMobilePhone.GetMultimodeCaps( iCapsPhone );
-        if (!err)
-            {
-            TRequestStatus reqStatus;
-            iMobilePhone.GetNetworkRegistrationStatus (reqStatus,iNetStatus);
-            User::WaitForRequest(reqStatus);
-            //CActiveScheduler::Add(this);
-            StartMonitoring();
-            }
-        else
-            iConstructed = EFalse;
-        }
-   TRACES (qDebug() << "CNetworkStatus::CNetworkStatus---->");
-#endif
+    TInt err = iMobilePhone.GetMultimodeCaps(iCapsPhone);
+    if (!err) {
+        TRequestStatus reqStatus;
+        iMobilePhone.GetNetworkRegistrationStatus(reqStatus, iNetStatus);
+        User::WaitForRequest(reqStatus);
+        StartMonitoring();
     }
+    TRACES (qDebug() << "CNetworkStatus::CNetworkStatus---->");
+}
+
 CNetworkStatus::~CNetworkStatus()
-    {
-     TRACES (qDebug() << "CNetworkStatus::~CNetworkStatus");
-      Cancel();
-    }
+{
+    TRACES (qDebug() << "CNetworkStatus::~CNetworkStatus");
+    Cancel();
+}
 
 void CNetworkStatus::DoCancel()
-    {
-#ifdef ETELMM_SUPPORTED
+{
     TRACES (qDebug() << "CNetworkStatus::DoCancel");
     iMobilePhone.CancelAsyncRequest(EMobilePhoneNotifyNetworkRegistrationStatusChange);
-#endif
-    }
+}
 
 void CNetworkStatus::RunL()
-    {
+{
     TRACES (qDebug() << "CNetworkStatus::RunL()<---");
-    User::LeaveIfError(iStatus.Int());
-    iObserver->ChangedNetworkStatus();
+    if (iStatus.Int() == KErrNone)
+        iObserver->ChangedNetworkStatus();
     StartMonitoring();
     TRACES (qDebug() << "CNetworkStatus::RunL()--->");
-    }
+}
 
 void CNetworkStatus::StartMonitoring()
-    {
-#ifdef ETELMM_SUPPORTED
+{
     TRACES (qDebug() << "CNetworkStatus::StartMonitoring");
-    iMobilePhone.NotifyNetworkRegistrationStatusChange ( iStatus,iNetStatus);
-    SetActive();
-#endif
+    if (!IsActive()) {
+        iMobilePhone.NotifyNetworkRegistrationStatusChange(iStatus,iNetStatus);
+        SetActive();
     }
+}
 
-TUint32 CNetworkStatus::GetCapability () const
-    {
+TUint32 CNetworkStatus::GetCapability() const
+{
     return iCapsPhone;
-    }
+}
 
-#ifdef ETELMM_SUPPORTED
-RMobilePhone::TMobilePhoneRegistrationStatus CNetworkStatus::GetStatus () const
-    {
+RMobilePhone::TMobilePhoneRegistrationStatus CNetworkStatus::GetStatus() const
+{
     return iNetStatus;
-    }
-#endif
+}
 
-CPacketDataStatus::CPacketDataStatus()
-   {
 #ifdef ETELPACKETSERVICE_SUPPORTED
+CPacketDataStatus::CPacketDataStatus(MNetworkObserver *aObserver, RPacketService &aPacketService)
+    : CActive(EPriorityNormal),
+      iObserver(aObserver),
+      iPacketService(aPacketService),
+      iPacketServiceStatus(RPacketService::EStatusUnattached),
+      iDynCaps(0)
+{
+    CActiveScheduler::Add(this);
+
     TRACES (qDebug() << "CPacketDataStatus::CPacketDataStatus");
+
+    iPacketService.GetStatus(iPacketServiceStatus);
     if (iPacketServiceStatus == RPacketService::EStatusActive)
-      {
         iPacketService.GetDynamicCaps(iDynCaps); //Initialize dynamic caps
-      }
     StartMonitoring();
-#endif
-    }
+}
 
 CPacketDataStatus::~CPacketDataStatus()
-    {
-     TRACES (qDebug() << "CPacketDataStatus::~CPacketDataStatus");
-     Cancel();
-    }
+{
+    TRACES (qDebug() << "CPacketDataStatus::~CPacketDataStatus");
+    Cancel();
+}
 
 TBool CPacketDataStatus::IsDynamicCapsSupported()
-  {
-#ifdef ETELPACKETSERVICE_SUPPORTED
-   TInt err = iPacketService.GetStatus(iPacketServiceStatus);
-   if (iPacketServiceStatus == RPacketService::EStatusActive)
-    {
-     if (iPacketService.GetDynamicCaps(iDynCaps) == KErrNone) //other than KErrNotSupported
-      {
-       return ETrue;
-      }
+{
+    iPacketService.GetStatus(iPacketServiceStatus);
+    if (iPacketServiceStatus == RPacketService::EStatusActive) {
+        if (iPacketService.GetDynamicCaps(iDynCaps) == KErrNone) //other than KErrNotSupported
+            return ETrue;
     }
-#endif
-   return EFalse;
-  }
+    return EFalse;
+}
 
 TUint CPacketDataStatus::DynamicCaps()
- {
-  TRACES (qDebug() << "CPacketDataStatus::DynamicCaps value:" << iDynCaps);
-  return iDynCaps;
- }
+{
+    TRACES (qDebug() << "CPacketDataStatus::DynamicCaps value:" << iDynCaps);
+    return iDynCaps;
+}
 
 void CPacketDataStatus::DoCancel()
- {
-#ifdef ETELPACKETSERVICE_SUPPORTED
-  TRACES (qDebug() << "CPacketDataStatus::DoCancel<---");
-  iPacketService.CancelAsyncRequest(KPacketNofityDynamicCapsChange);
-  TRACES (qDebug() << "CPacketDataStatus::DoCancel--->");
-#endif
- }
+{
+    TRACES (qDebug() << "CPacketDataStatus::DoCancel<---");
+    iPacketService.CancelAsyncRequest(KPacketNofityDynamicCapsChange);
+    TRACES (qDebug() << "CPacketDataStatus::DoCancel--->");
+}
 
 void CPacketDataStatus::RunL()
- {
-#ifdef ETELPACKETSERVICE_SUPPORTED
- TRACES (qDebug() << "CPacketDataStatus::RunL()<---");
- TRACES (qDebug() << "iStatus code:" << iStatus.Int());
- User::LeaveIfError(iStatus.Int());
- iObserver->ChangedCellDataTechnology();
- StartMonitoring();
- TRACES(qDebug() << "CPacketDataStatus::RunL()--->");
-#endif
- }
+{
+    TRACES (qDebug() << "CPacketDataStatus::RunL()<---");
+    TRACES (qDebug() << "iStatus code:" << iStatus.Int());
+    if (iStatus.Int() == KErrNone)
+        iObserver->ChangedCellDataTechnology();
+    StartMonitoring();
+    TRACES(qDebug() << "CPacketDataStatus::RunL()--->");
+}
 
 void CPacketDataStatus::StartMonitoring()
- {
-#ifdef ETELPACKETSERVICE_SUPPORTED
- TRACES (qDebug() << "CPacketDataStatus::StartMonitoring<---");
- if ( NetworkCtrlCapsenabled() == false) return;
- if (!IsActive())
-  {
-    iPacketService.NotifyDynamicCapsChange(iStatus,iDynCaps);
-    SetActive();
-  }
- TRACES (qDebug() << "CPacketDataStatus::StartMonitoring--->");
-#endif
- }
-
- bool CPacketDataStatus::NetworkCtrlCapsenabled()
-  {
-   return (iPacketdataserviceCaps == true );
-  }
-
-CNetworkInfo::CNetworkInfo():iCellDataTechnology(KDefaultBearer)
-    {
-     //Add observers
-    iNetMode.Add(this);
-    iNetStat.Add(this);
-    if ( iPacketDataStatus.NetworkCtrlCapsenabled() == true ) iPacketDataStatus.Add(this);
+{
+    TRACES (qDebug() << "CPacketDataStatus::StartMonitoring<---");
+    if (!IsActive()) {
+        iPacketService.NotifyDynamicCapsChange(iStatus,iDynCaps);
+        SetActive();
     }
+    TRACES (qDebug() << "CPacketDataStatus::StartMonitoring--->");
+}
+#endif //ETELPACKETSERVICE_SUPPORTED
+#endif //ETELMM_SUPPORTED
+
+CNetworkInfo::CNetworkInfo()
+    : iConstructed(false),
+      iCellDataTechnology(KDefaultBearer),
+      iPacketdataserviceCaps(true)
+{
+    Initialise();
+}
 
 CNetworkInfo::~CNetworkInfo()
-    {
-    iNetMode.Remove();
-    iNetStat.Remove();
-    iPacketDataStatus.Remove();
+{
+#ifdef ETELMM_SUPPORTED
+    delete iNetMode;
+    delete iNetStat;
+#ifdef ETELPACKETSERVICE_SUPPORTED
+    delete iPacketDataStatus;
+    iPacketService.Close();
+#endif //ETELPACKETSERVICE_SUPPORTED
+    iMobilePhone.Close();
+    iTelServer.Close();
+#endif //ETELMM_SUPPORTED
+}
+
+void CNetworkInfo::Initialise()
+{
+#ifdef ETELMM_SUPPORTED
+    TRAPD(err, InitialiseL());
+    if (err) {
+        delete iNetMode;
+        iNetMode = 0;
+        delete iNetStat;
+        iNetStat = 0;
+#ifdef ETELPACKETSERVICE_SUPPORTED
+        delete iPacketDataStatus;
+        iPacketDataStatus = 0;
+        iPacketService.Close();
+#endif //ETELPACKETSERVICE_SUPPORTED
+        iMobilePhone.Close();
+        iTelServer.Close();
+    } else {
+        iConstructed = true;
     }
+#else
+    iConstructed = true;
+#endif
+}
+
+void CNetworkInfo::InitialiseL()
+{
+    TInt err = 0;
+    TRACES(qDebug() << "CNetworkInfo::ConstructL<---");
+
+    if (iConstructed)
+        return;
+
+#ifdef ETELMM_SUPPORTED
+    err = iTelServer.Connect();
+    TRACES(qDebug() << "Err val for RTelServer::Connect" << err);
+    User::LeaveIfError(err);
+
+    err = iTelServer.GetPhoneInfo( 0, iPhoneInfo );
+    TRACES(qDebug() << "Err val for RTelServer::GetPhoneInfo =" << err);
+    User::LeaveIfError(err);
 
+    err = iMobilePhone.Open(iTelServer,iPhoneInfo.iName);
+    TRACES(qDebug() << "Err val for RMobilePhone::Open =" << err);
+    User::LeaveIfError(err);
+
+    err = iMobilePhone.Initialise();
+    TRACES(qDebug() << "Err val for RMobilePhone::Initialise =" << err);
+    User::LeaveIfError(err);
+
+    // Create active objects for monitoring statuses
+    iNetMode = new (ELeave) CNetworkMode(this, iMobilePhone);
+    iNetStat = new (ELeave) CNetworkStatus(this, iMobilePhone);
+
+#ifdef ETELPACKETSERVICE_SUPPORTED
+    TInt packetserviceerr = iPacketService.Open(iMobilePhone);
+    if (packetserviceerr != KErrNone)
+        iPacketdataserviceCaps = false;
+    TRACES(qDebug() << "Err val for iPacketService.Open =" << packetserviceerr);
+
+    if (iPacketdataserviceCaps)
+        iPacketDataStatus = new (ELeave) CPacketDataStatus(this, iPacketService);
+
+#endif //ETELPACKETSERVICE_SUPPORTED
+#endif //ETELMM_SUPPORTED
+    TRACES(qDebug() << "CNetworkInfo::ConstructL--->");
+}
+
+bool CNetworkInfo::IsInitialised()
+{
+    return iConstructed;
+}
+
+#ifdef ETELMM_SUPPORTED
 RMobilePhone::TMobilePhoneNetworkMode CNetworkInfo::GetMode() const
-    {
-    return iNetMode.GetMode();
-    }
-TUint32 CNetworkInfo::GetCapability () const
-    {
-    return iNetStat.GetCapability();
-    }
+{
+    if (iConstructed)
+        return iNetMode->GetMode();
+    else
+        return RMobilePhone::ENetworkModeUnknown;
+}
+
+RMobilePhone::TMobilePhoneRegistrationStatus CNetworkInfo::GetStatus() const
+{
+    if (iConstructed)
+        return iNetStat->GetStatus();
+    else
+        return RMobilePhone::ERegistrationUnknown;
+}
+#endif
 
+TUint32 CNetworkInfo::GetCapability() const
+{
 #ifdef ETELMM_SUPPORTED
-RMobilePhone::TMobilePhoneRegistrationStatus CNetworkInfo::GetStatus () const
-    {
-    return iNetStat.GetStatus();
-    }
+    if (iConstructed)
+        return iNetStat->GetCapability();
 #endif
+
+    return 0;
+}
+
 void CNetworkInfo::addObserver(MNetworkInfoObserver *aObserver)
 {
     iObservers.append(aObserver);
@@ -353,72 +356,60 @@ void CNetworkInfo::removeObserver(MNetworkInfoObserver *aObserver)
 }
 
 void CNetworkInfo::ChangedNetworkMode()
-    {
+{
     foreach (MNetworkInfoObserver *observer, iObservers)
         observer->changedNetworkMode();
-    }
+}
+
 void CNetworkInfo::ChangedNetworkStatus()
-    {
+{
     foreach (MNetworkInfoObserver *observer, iObservers)
         observer->changedNetworkStatus();
-    }
+}
 
 void CNetworkInfo::ChangedCellDataTechnology()
- {
-  TRACES (qDebug() << "CNetworkInfo::ChangedCellDataTechnology");
-  TUint celldatatech = CellDataTechnology();
-  if ( celldatatech != iCellDataTechnology )
-   {
-    TRACES (qDebug() << "Notify observers");
-     foreach (MNetworkInfoObserver *observer, iObservers)
-        observer->changedCellDataTechnology();
-   }
-   iCellDataTechnology = celldatatech;
- }
-
- TUint CNetworkInfo::CellDataTechnology()
-  {
-#ifdef ETELPACKETSERVICE_SUPPORTED
-   TRACES (qDebug() << "CNetworkInfo::CellDataTechnology<---");
-   if ( iPacketDataStatus.NetworkCtrlCapsenabled() == false ) return KDefaultBearer;
-   TUint dynamicCaps = 0;
-   if (iPacketDataStatus.IsDynamicCapsSupported())
-    {
-     dynamicCaps = iPacketDataStatus.DynamicCaps();
+{
+    TRACES (qDebug() << "CNetworkInfo::ChangedCellDataTechnology");
+    TUint celldatatech = CellDataTechnology();
+    if (celldatatech != iCellDataTechnology) {
+        TRACES (qDebug() << "Notify observers");
+        foreach (MNetworkInfoObserver *observer, iObservers)
+            observer->changedCellDataTechnology();
     }
+    iCellDataTechnology = celldatatech;
+}
 
-   RMobilePhone::TMobilePhoneNetworkMode networkMode = iNetMode.GetMode();
-
-   if ((dynamicCaps & RPacketService::KCapsHSUPA) || (dynamicCaps & RPacketService::KCapsHSDPA))
-    {
-     TRACES ( qDebug() << "KHsdpaBearer" );
-     return KHsdpaBearer;
-    }
-   else
-    if ( dynamicCaps & RPacketService::KCapsEGPRS )
-       {
+TUint CNetworkInfo::CellDataTechnology()
+{
+#if defined(ETELMM_SUPPORTED) && defined(ETELPACKETSERVICE_SUPPORTED)
+    TRACES (qDebug() << "CNetworkInfo::CellDataTechnology<---");
+    if (!iConstructed || !iPacketdataserviceCaps)
+        return KDefaultBearer;
+    TUint dynamicCaps = 0;
+    if (iPacketDataStatus->IsDynamicCapsSupported())
+        dynamicCaps = iPacketDataStatus->DynamicCaps();
+
+    RMobilePhone::TMobilePhoneNetworkMode networkMode = iNetMode->GetMode();
+
+    if ((dynamicCaps & RPacketService::KCapsHSUPA) || (dynamicCaps & RPacketService::KCapsHSDPA)) {
+        TRACES ( qDebug() << "KHsdpaBearer" );
+        return KHsdpaBearer;
+    } else if ( dynamicCaps & RPacketService::KCapsEGPRS ) {
         TRACES ( qDebug() << "KEGprsBearer" );
         return KEGprsBearer;
-       }
-   else
-       {
-        if (networkMode == RMobilePhone::ENetworkModeGsm)
-          {
-           TRACES ( qDebug() << "KGprsBearer" );
-           return KGprsBearer;
-          }
-        else if (networkMode == RMobilePhone::ENetworkModeWcdma)
-          {
-           TRACES ( qDebug() << "KUmtsBearer" );
-           return KUmtsBearer;
-          }
-        else
-          {
-           TRACES ( qDebug() << "KDefaultBearer" );
-           return KDefaultBearer;
-          }
-       }
+    } else {
+        if (networkMode == RMobilePhone::ENetworkModeGsm) {
+            TRACES ( qDebug() << "KGprsBearer" );
+            return KGprsBearer;
+        } else if (networkMode == RMobilePhone::ENetworkModeWcdma) {
+            TRACES ( qDebug() << "KUmtsBearer" );
+            return KUmtsBearer;
+        } else {
+            TRACES ( qDebug() << "KDefaultBearer" );
+            return KDefaultBearer;
+        }
+    }
 #else
-     return KDefaultBearer;
+    return KDefaultBearer;
 #endif
-  }
+}
diff --git a/src/systeminfo/symbian/networkinfo_s60.h b/src/systeminfo/symbian/networkinfo_s60.h
index 645b445a14..079e1d2da1 100644
--- a/src/systeminfo/symbian/networkinfo_s60.h
+++ b/src/systeminfo/symbian/networkinfo_s60.h
@@ -44,8 +44,12 @@
 
 #include <e32base.h>
 #include <e32debug.h>
+#ifdef ETELMM_SUPPORTED
 #include <etelmm.h>
+#endif
+#ifdef ETELPACKETSERVICE_SUPPORTED
 #include <etelpckt.h>
+#endif
 #include <etel.h>
 #include <QList>
 
@@ -57,66 +61,39 @@ const TUint KHsdpaBearer = 23;
 const TUint KDefaultBearer = 24;
 
 class MNetworkObserver
-    {
+{
 public:
     virtual void ChangedNetworkMode() = 0;
     virtual void ChangedNetworkStatus() = 0;
     virtual void ChangedCellDataTechnology() = 0;
-    };
+};
 
 class MNetworkInfoObserver
-    {
+{
 public:
     virtual void changedNetworkStatus() = 0;
     virtual void changedNetworkMode() = 0;
     virtual void changedCellDataTechnology() = 0;
-    };
+};
 
-class CNetworkBase : public CActive
-    {
+#ifdef ETELMM_SUPPORTED
+class CNetworkMode : public CActive
+{
 public:
-    CNetworkBase();
-    ~CNetworkBase();
-
-    void AddObserver(MNetworkObserver *aObserver);
-    void RemoveObserver();
-
-protected:  //from CActive
-    virtual void DoCancel() =0; //To Make the class abstract
-    virtual void RunL() = 0;
-    virtual void StartMonitoring() = 0;
-
-protected:
-    RTelServer iTelServer;
-    RMobilePhone iMobilePhone;
-    RTelServer::TPhoneInfo iPhoneInfo;
-    TBool iConstructed;
-    MNetworkObserver *iObserver;
-    //For CellData Technology
-    RPacketService::TDynamicCapsFlags iDynCaps;
-#ifdef ETELPACKETSERVICE_SUPPORTED
-    RPacketService iPacketService;
-#endif
-    RPacketService::TStatus iPacketServiceStatus;
-    bool iPacketdataserviceCaps;
-    };
-
-class CNetworkMode : private CNetworkBase
-    {
-public :
-    CNetworkMode ();
-    ~CNetworkMode ();
+    CNetworkMode(MNetworkObserver *aObserver, RMobilePhone &aMobilePhone);
+    ~CNetworkMode();
     RMobilePhone::TMobilePhoneNetworkMode GetMode() const;
-    void Add(MNetworkObserver *aObserver) { AddObserver(aObserver);} ;
-    void Remove() {RemoveObserver();};
 
-protected: //From CNetworkBase
+protected: //From CActive
     virtual void DoCancel();
     virtual void RunL() ;
     virtual void StartMonitoring();
 
-private :
+private: //data
     RMobilePhone::TMobilePhoneNetworkMode iNetworkMode;
+    MNetworkObserver *iObserver;
+    RMobilePhone &iMobilePhone;
+
     /*
     enum TMobilePhoneNetworkMode
         {
@@ -131,31 +108,26 @@ private :
         };
         */
 
-    };
+};
 
-class CNetworkStatus : private CNetworkBase
-    {
+class CNetworkStatus : public CActive
+{
 public:
-    CNetworkStatus();
+    CNetworkStatus(MNetworkObserver *aObserver, RMobilePhone &aMobilePhone);
     ~CNetworkStatus();
     TUint32 GetCapability () const;
-#ifdef ETELMM_SUPPORTED
     RMobilePhone::TMobilePhoneRegistrationStatus GetStatus() const;
-#endif
-    void Add(MNetworkObserver *aObserver) { AddObserver(aObserver);} ;
-    void Remove() {RemoveObserver();};
 
-protected : //From CNetworkBase
+protected : //From CActive
     virtual void DoCancel();
     virtual void RunL() ;
     virtual void StartMonitoring();
 
-
 private:
-#ifdef ETELMM_SUPPORTED
     RMobilePhone::TMobilePhoneRegistrationStatus iNetStatus;
-#endif
     TUint32 iCapsPhone;
+    MNetworkObserver *iObserver;
+    RMobilePhone &iMobilePhone;
     /*
     BITWISE OR of
     enum TMobilePhoneModeCaps
@@ -170,50 +142,73 @@ private:
                     KCapsEapSupported=0x00000080 //Phone can access Smart Card functionality required for an EAP. @deprecated 9.3
                     };
     */
-    };
+};
 
-class CPacketDataStatus : private CNetworkBase
- {
- public:
-    CPacketDataStatus();
+#ifdef ETELPACKETSERVICE_SUPPORTED
+class CPacketDataStatus : public CActive
+{
+public:
+    CPacketDataStatus(MNetworkObserver *aObserver, RPacketService &aPacketService);
     ~CPacketDataStatus();
     TBool IsDynamicCapsSupported();
     TUint DynamicCaps();
-    void Add(MNetworkObserver *aObserver) { AddObserver(aObserver);} ;
-    void Remove() {RemoveObserver();};
-    bool NetworkCtrlCapsenabled();
- protected: //From CNetworkBase
+
+protected: //From CActive
     virtual void DoCancel();
     virtual void RunL() ;
     virtual void StartMonitoring();
- };
+
+private: //data
+    MNetworkObserver *iObserver;
+    RPacketService &iPacketService;
+    RPacketService::TStatus iPacketServiceStatus;
+    RPacketService::TDynamicCapsFlags iDynCaps;
+};
+#endif //ETELPACKETSERVICE_SUPPORTED
+#endif //ETELMM_SUPPORTED
 
 class CNetworkInfo : public CBase, public MNetworkObserver
 {
-protected :
+protected:
     virtual void ChangedNetworkMode() ;
     virtual void ChangedNetworkStatus();
     virtual void ChangedCellDataTechnology();
 
-public :
-        CNetworkInfo();
-        ~CNetworkInfo();
-        void addObserver(MNetworkInfoObserver *aObserver);
-        void removeObserver(MNetworkInfoObserver *aObserver);
-        RMobilePhone::TMobilePhoneNetworkMode GetMode() const;
+public:
+    CNetworkInfo();
+    ~CNetworkInfo();
+    void Initialise();
+    bool IsInitialised();
+    void addObserver(MNetworkInfoObserver *aObserver);
+    void removeObserver(MNetworkInfoObserver *aObserver);
 #ifdef ETELMM_SUPPORTED
-        RMobilePhone::TMobilePhoneRegistrationStatus GetStatus() const;
+    RMobilePhone::TMobilePhoneNetworkMode GetMode() const;
+    RMobilePhone::TMobilePhoneRegistrationStatus GetStatus() const;
 #endif
-       TUint32 GetCapability () const;
-       TUint CellDataTechnology();
-
-private :
-        CNetworkMode iNetMode;
-        CNetworkStatus iNetStat;
-        CPacketDataStatus iPacketDataStatus;
-        QList<MNetworkInfoObserver *> iObservers;
-        TUint32 iCellDataTechnology;
-};
+    TUint32 GetCapability () const;
+    TUint CellDataTechnology();
+
+private:
+    void InitialiseL();
 
+private:
+    QList<MNetworkInfoObserver *> iObservers;
+    bool iConstructed;
+#ifdef ETELMM_SUPPORTED
+    CNetworkMode *iNetMode;
+    CNetworkStatus *iNetStat;
+    RTelServer iTelServer;
+    RMobilePhone iMobilePhone;
+    RTelServer::TPhoneInfo iPhoneInfo;
+    MNetworkObserver *iObserver;
+    //For CellData Technology
+#ifdef ETELPACKETSERVICE_SUPPORTED
+    CPacketDataStatus *iPacketDataStatus;
+    RPacketService iPacketService;
+#endif //ETELPACKETSERVICE_SUPPORTED
+#endif //ETELMM_SUPPORTED
+    TUint32 iCellDataTechnology;
+    bool iPacketdataserviceCaps;
+};
 
 #endif // NETWORKSTATUS_S60_H
diff --git a/src/systeminfo/symbian/networkoperatornamelistener_s60.cpp b/src/systeminfo/symbian/networkoperatornamelistener_s60.cpp
index 30eabbba21..af66a3867b 100644
--- a/src/systeminfo/symbian/networkoperatornamelistener_s60.cpp
+++ b/src/systeminfo/symbian/networkoperatornamelistener_s60.cpp
@@ -51,7 +51,7 @@
 #include <featmgr.h>*/
 #include "trace.h"
 #include <QString>
-#include <Qlist>
+#include <QList>
 
 #include "networkoperatornamelistener_s60.h"
 
diff --git a/src/systeminfo/symbian/pubandsubkey_s60.cpp b/src/systeminfo/symbian/pubandsubkey_s60.cpp
index e494889c37..5a3a7d5f1a 100644
--- a/src/systeminfo/symbian/pubandsubkey_s60.cpp
+++ b/src/systeminfo/symbian/pubandsubkey_s60.cpp
@@ -84,6 +84,8 @@ TInt CPubSubKeyHandler::GetValue() const
 
 void CPubSubKeyHandler::StartMonitoring()
     {
-    iProperty.Subscribe(iStatus);
-    SetActive();
+      if (!IsActive()) {
+      iProperty.Subscribe(iStatus);
+      SetActive();
+      }
     }
diff --git a/src/systeminfo/symbian/storagestatus_s60.cpp b/src/systeminfo/symbian/storagestatus_s60.cpp
index 0546b80787..96526fc4e5 100644
--- a/src/systeminfo/symbian/storagestatus_s60.cpp
+++ b/src/systeminfo/symbian/storagestatus_s60.cpp
@@ -183,6 +183,8 @@ void CMMCStorageStatus::RunL()
 
 void CMMCStorageStatus::startMonitoring()
 {
+  if (!IsActive()) {
     iFs.NotifyChange(ENotifyDisk, iStatus);
     SetActive();
+  }
 }
diff --git a/src/systeminfo/symbian/telephonyinfo_s60.cpp b/src/systeminfo/symbian/telephonyinfo_s60.cpp
index 6d4dcc72f4..942a2db36c 100644
--- a/src/systeminfo/symbian/telephonyinfo_s60.cpp
+++ b/src/systeminfo/symbian/telephonyinfo_s60.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010-2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -45,17 +45,21 @@
 #include <mmtsy_names.h>
 #endif
 
+#ifndef ETELMM_SUPPORTED
+// number of nested event loops allowed to avoid stackoverflow
+const int KMaxLoops = 25;
+
 
 CTelephonyInfo::CTelephonyInfo(CTelephony &telephony) : CActive(EPriorityStandard),
-    m_telephony(telephony)
+    m_telephony(telephony), m_loops()
 {
     CActiveScheduler::Add(this);
-    m_wait = new CActiveSchedulerWait();
 }
 
 CTelephonyInfo::~CTelephonyInfo()
 {
-    delete m_wait;
+  //Cancel();
+  exitWait();
 }
 
 void CTelephonyInfo::addObserver(MTelephonyInfoObserver *observer)
@@ -68,29 +72,65 @@ void CTelephonyInfo::removeObserver(MTelephonyInfoObserver *observer)
     m_observers.removeOne(observer);
 }
 
-void CTelephonyInfo::RunL()
+void CTelephonyInfo::waitForRequest() const
 {
-    m_wait->AsyncStop();
+ TRACES (qDebug() << "CTelephonyInfo::waitForRequest<---");
+
+    //Restricing number of blocking loops
+    //Each call to api's e.g. IMSI must be blocked until they are initialized
+    //But we cannot maintain infinite number of blocked calls as stack is limited
+    //So restrict the number of loops after which we return uninitialized values
+    if (m_loops.size() <= KMaxLoops) {
+      QEventLoop* loop = NULL;
+      loop = new QEventLoop();
+      if ( loop != NULL ) {
+        m_loops.push(loop);
+        loop->exec();
+        delete loop;
+      }
+    } else {
+      qDebug() << "Blocked calls loop count exceeded";
+      }
+
+ TRACES (qDebug() << "CTelephonyInfo::waitForRequest--->");
 }
 
-void CTelephonyInfo::makeRequest()
+void CTelephonyInfo::exitWait() const
 {
-    if (!IsActive())
-        SetActive();
+ TRACES (qDebug() << "CTelephonyInfo::ExitWait<---");
 
-    if (!m_wait->IsStarted()) {
-        m_wait->Start();
-    }
+  while (!m_loops.isEmpty())
+      {
+        QEventLoop* loop = m_loops.pop();
+        loop->quit();
+      }
+
+ TRACES (qDebug() << "CTelephonyInfo::ExitWait--->");
 }
 
-CPhoneInfo::CPhoneInfo(CTelephony &telephony) : CTelephonyInfo(telephony),
-    m_phoneIdV1Pckg(m_phoneIdV1)
+CPhoneInfo::CPhoneInfo(CTelephony &telephony) : CTelephonyInfo(telephony),m_initializing(true)
+    ,m_phoneIdV1Pckg(m_phoneIdV1)
 {
  TRACES (qDebug() << "CPhoneInfo::CPhoneInfo<---");
+  makeRequest();
+ TRACES (qDebug() << "CPhoneInfo::CPhoneInfo--->");
+}
+
+void CPhoneInfo::makeRequest()
+{
+  TRACES (qDebug() << "CPhoneInfo::makeRequest<--");
+  if (!IsActive()){
     m_telephony.GetPhoneId(iStatus, m_phoneIdV1Pckg);
+    SetActive();
+    }
+  TRACES (qDebug() << "CPhoneInfo::makeRequest-->");
+}
 
-    makeRequest();
+void CPhoneInfo::RunL()
+{
+ TRACES (qDebug() << "CPhoneInfo::RunL<---");
 
+  if (iStatus == KErrNone) {
     TBuf<CTelephony::KPhoneSerialNumberSize> imei = m_phoneIdV1.iSerialNumber;
     m_imei = QString::fromUtf16(imei.Ptr(), imei.Length());
 
@@ -99,7 +139,14 @@ CPhoneInfo::CPhoneInfo(CTelephony &telephony) : CTelephonyInfo(telephony),
 
     TBuf<CTelephony::KPhoneModelIdSize> model = m_phoneIdV1.iModel;
     m_model = QString::fromUtf16(model.Ptr(), model.Length());
- TRACES (qDebug() << "CPhoneInfo::CPhoneInfo--->");
+
+    m_initializing = false;
+  }
+
+  if (iStatus == KErrPermissionDenied) m_initializing =false;
+  exitWait();
+
+ TRACES (qDebug() << "CPhoneInfo::RunL--->");
 }
 
 CPhoneInfo::~CPhoneInfo()
@@ -109,34 +156,81 @@ CPhoneInfo::~CPhoneInfo()
 
 void CPhoneInfo::DoCancel()
 {
-   m_telephony.CancelAsync(CTelephony::EGetPhoneIdCancel);
+ TRACES (qDebug() << "CPhoneInfo::DoCancel<---");
+   if (m_initializing) {
+       m_telephony.CancelAsync(CTelephony::EGetPhoneIdCancel);
+      }
+ TRACES (qDebug() << "CPhoneInfo::DoCancel--->");
 }
 
-QString CPhoneInfo::imei() const
+QString CPhoneInfo::imei()
 {
-    return m_imei;
+  TRACES (qDebug() << "CPhoneInfo::imei:" << m_imei);
+
+  if (m_initializing) {
+        makeRequest();
+        waitForRequest();
+      }
+
+  return m_imei;
 }
 
-QString CPhoneInfo::manufacturer() const
+QString CPhoneInfo::manufacturer()
 {
-    return m_manufacturer;
+  TRACES (qDebug() << "CPhoneInfo::manufacturer:" << m_manufacturer);
+
+   if (m_initializing) {
+        makeRequest();
+        waitForRequest();
+      }
+
+  return m_manufacturer;
 }
 
-QString CPhoneInfo::model() const
+QString CPhoneInfo::model()
 {
-    return m_model;
+  TRACES (qDebug() << "CPhoneInfo::model:" << m_model);
+
+   if (m_initializing) {
+        makeRequest();
+        waitForRequest();
+      }
+
+  return m_model;
 }
 
-CSubscriberInfo::CSubscriberInfo(CTelephony &telephony) : CTelephonyInfo(telephony),
-    m_subscriberIdV1Pckg(m_subscriberIdV1)
+CSubscriberInfo::CSubscriberInfo(CTelephony &telephony) : CTelephonyInfo(telephony),m_initializing(true)
+        ,m_subscriberIdV1Pckg(m_subscriberIdV1)
 {
  TRACES (qDebug() << "CSubscriberInfo::CSubscriberInfo<---");
+  makeRequest();
+ TRACES (qDebug() << "CSubscriberInfo::CSubscriberInfo--->");
+}
+
+void CSubscriberInfo::makeRequest()
+{
+  TRACES (qDebug() << "CSubscriberInfo::MakeRequest<---");
+  if (!IsActive()) {
     m_telephony.GetSubscriberId(iStatus, m_subscriberIdV1Pckg);
-    makeRequest();
+    SetActive();
+  }
+  TRACES (qDebug() << "CSubscriberInfo::MakeRequest--->");
+}
 
+void CSubscriberInfo::RunL()
+{
+ TRACES (qDebug() << "CSubscriberInfo::RunL<---");
+
+  if (iStatus == KErrNone) {
     TBuf<CTelephony::KIMSISize> imsi = m_subscriberIdV1.iSubscriberId;
     m_imsi = QString::fromUtf16(imsi.Ptr(), imsi.Length());
- TRACES (qDebug() << "CSubscriberInfo::CSubscriberInfo--->");
+    m_initializing = false;
+  }
+
+  if (iStatus == KErrPermissionDenied ) m_initializing = false;
+  exitWait();
+
+ TRACES (qDebug() << "CSubscriberInfo::RunL--->");
 }
 
 CSubscriberInfo::~CSubscriberInfo()
@@ -146,26 +240,31 @@ CSubscriberInfo::~CSubscriberInfo()
 
 void CSubscriberInfo::DoCancel()
 {
-    m_telephony.CancelAsync(CTelephony::EGetSubscriberIdCancel);
+ TRACES (qDebug() << "CSubscriberInfo::DoCancel<---");
+ if (m_initializing) {
+     m_telephony.CancelAsync(CTelephony::EGetSubscriberIdCancel);
+  }
+ TRACES (qDebug() << "CSubscriberInfo::DoCancel--->");
 }
 
-QString CSubscriberInfo::imsi() const
+QString CSubscriberInfo::imsi()
 {
-    return m_imsi;
+  TRACES (qDebug() << "CSubscriberInfo::imsi:" << m_imsi);
+    if (m_initializing) {
+        makeRequest();
+        waitForRequest();
+      }
+  return m_imsi;
 }
 
 CBatteryInfo::CBatteryInfo(CTelephony &telephony) : CTelephonyInfo(telephony),
     m_initializing(true), m_batteryInfoV1Pckg(m_batteryInfoV1)
 {
  TRACES (qDebug() << "CBatteryInfo::CBatteryInfo<---");
-    m_telephony.GetBatteryInfo(iStatus, m_batteryInfoV1Pckg);
-
-    makeRequest();
 
-    m_batteryLevel = m_batteryInfoV1.iChargeLevel;
-    m_previousBatteryLevel = m_batteryLevel;
+  m_telephony.GetBatteryInfo(iStatus, m_batteryInfoV1Pckg);
+  SetActive();
 
-    startMonitoring();
  TRACES (qDebug() << "CBatteryInfo::CBatteryInfo--->");
 }
 
@@ -177,46 +276,64 @@ CBatteryInfo::~CBatteryInfo()
 void CBatteryInfo::RunL()
 {
  TRACES (qDebug() << "CBatteryInfo::RunL<---");
-    if (m_initializing) {
-         CTelephonyInfo::RunL();
-         m_initializing = false;
-    } else {
-        m_batteryLevel = m_batteryInfoV1.iChargeLevel;
+
+    if (iStatus == KErrNone) {
+      m_batteryLevel = m_batteryInfoV1.iChargeLevel;
+
+      if (!m_initializing) {
         foreach (MTelephonyInfoObserver *observer, m_observers) {
-            if (m_batteryLevel != m_previousBatteryLevel) {
-                observer->batteryLevelChanged();
-            }
-        }
+              if (m_batteryLevel != m_previousBatteryLevel)
+                  observer->batteryLevelChanged();
+          }
+      }
+      m_previousBatteryLevel = m_batteryLevel;
+    }
+
+    if (m_initializing) {
+      m_initializing = false;
+      exitWait();
+      if (iStatus == KErrPermissionDenied) {
+        return; //No monitoring required
+      }
     }
-    m_previousBatteryLevel = m_batteryLevel;
+
     startMonitoring();
+
  TRACES (qDebug() << "CBatteryInfo::RunL--->");
 }
 
 void CBatteryInfo::DoCancel()
 {
  TRACES (qDebug() << "CBatteryInfo::DoCancel<---");
-    if (m_initializing) {
-        m_telephony.CancelAsync(CTelephony::EGetBatteryInfoCancel);
-    } else {
-        m_telephony.CancelAsync(CTelephony::EBatteryInfoChangeCancel);
+  if (m_initializing) {
+      m_telephony.CancelAsync(CTelephony::EGetBatteryInfoCancel);
+    }
+    else
+    {
+      m_telephony.CancelAsync(CTelephony::EBatteryInfoChangeCancel);
     }
  TRACES (qDebug() << "CBatteryInfo::DoCancel--->");
 }
 
-
 int CBatteryInfo::batteryLevel() const
 {
-    return m_batteryLevel;
+  TRACES (qDebug() << "CBatteryInfo::batteryLevel:" << m_batteryLevel);
+
+  if (m_initializing)
+    waitForRequest();
+
+  return m_batteryLevel;
 }
 
 void CBatteryInfo::startMonitoring()
 {
  TRACES (qDebug() << "CBatteryInfo::startMonitoring<---");
+
     if (!IsActive()) {
         m_telephony.NotifyChange(iStatus, CTelephony::EBatteryInfoChange, m_batteryInfoV1Pckg);
         SetActive();
     }
+
  TRACES (qDebug() << "CBatteryInfo::startMonitoring--->");
 }
 
@@ -224,35 +341,10 @@ CCellNetworkInfo::CCellNetworkInfo(CTelephony &telephony) : CTelephonyInfo(telep
     m_initializing(true), m_networkInfoV1Pckg(m_networkInfoV1)
 {
  TRACES (qDebug() << "CCellNetworkInfo::CCellNetworkInfo<---");
-    m_telephony.GetCurrentNetworkInfo(iStatus, m_networkInfoV1Pckg);
-    makeRequest();
-
-    m_cellId = m_networkInfoV1.iCellId;
-    m_previouscellId = m_cellId;
-    m_locationAreaCode = m_networkInfoV1.iLocationAreaCode;
-
-    TBuf<CTelephony::KNetworkIdentitySize> networkId = m_networkInfoV1.iNetworkId;
-    m_networkId = QString::fromUtf16(networkId.Ptr(), networkId.Length());
-    m_previousNetworkId = m_networkId;
-
-    TBuf<CTelephony::KNetworkCountryCodeSize> countryCode = m_networkInfoV1.iCountryCode;
-    m_countryCode = QString::fromUtf16(countryCode.Ptr(), countryCode.Length());
-    m_previousCountryCode = m_countryCode;
-    TBuf<CTelephony::KNetworkLongNameSize> longName = m_networkInfoV1.iLongName;
-    if (longName.Length() > 0) {
-        m_networkName = QString::fromUtf16(longName.Ptr(), longName.Length());
-    } else {
-        TBuf<CTelephony::KNetworkDisplayTagSize> displayTag = m_networkInfoV1.iDisplayTag;
-        m_networkName = QString::fromUtf16(displayTag.Ptr(), displayTag.Length());
-    }
-    m_previousNetworkName = m_networkName;
-
-    m_networkMode = m_networkInfoV1.iMode;
-    m_previousNetworkMode = m_networkMode;
 
-    m_initializing = false;
+    m_telephony.GetCurrentNetworkInfo(iStatus, m_networkInfoV1Pckg);
+    SetActive();
 
-    startMonitoring();
  TRACES (qDebug() << "CCellNetworkInfo::CCellNetworkInfo--->");
 }
 
@@ -264,95 +356,130 @@ CCellNetworkInfo::~CCellNetworkInfo()
 void CCellNetworkInfo::RunL()
 {
  TRACES (qDebug() << "CCellNetworkInfo::RunL<---");
-    if (m_initializing) {
-        CTelephonyInfo::RunL();
-        m_initializing = false;
-    } else {
-        if (iStatus != KErrNone) return; //To avoid looping if app doesn't have ReadDeviceData caps
-        m_cellId = m_networkInfoV1.iCellId;
-        m_locationAreaCode = m_networkInfoV1.iLocationAreaCode;
 
-        TBuf<CTelephony::KNetworkIdentitySize> networkId = m_networkInfoV1.iNetworkId;
-            m_networkId = QString::fromUtf16(networkId.Ptr(), networkId.Length());
+    if (iStatus == KErrNone) {
+      m_cellId = m_networkInfoV1.iCellId;
+      m_locationAreaCode = m_networkInfoV1.iLocationAreaCode;
 
-        TBuf<CTelephony::KNetworkCountryCodeSize> countryCode = m_networkInfoV1.iCountryCode;
-            m_countryCode = QString::fromUtf16(countryCode.Ptr(), countryCode.Length());
+      TBuf<CTelephony::KNetworkIdentitySize> networkId = m_networkInfoV1.iNetworkId;
+      m_networkId = QString::fromUtf16(networkId.Ptr(), networkId.Length());
 
-        TBuf<CTelephony::KNetworkLongNameSize> longName = m_networkInfoV1.iLongName;
-        if (longName.Length() > 0) {
-            m_networkName = QString::fromUtf16(longName.Ptr(), longName.Length());
-        } else {
-            TBuf<CTelephony::KNetworkDisplayTagSize> displayTag = m_networkInfoV1.iDisplayTag;
-            m_networkName = QString::fromUtf16(displayTag.Ptr(), displayTag.Length());
-        }
+      TBuf<CTelephony::KNetworkCountryCodeSize> countryCode = m_networkInfoV1.iCountryCode;
+      m_countryCode = QString::fromUtf16(countryCode.Ptr(), countryCode.Length());
 
-        m_networkMode = m_networkInfoV1.iMode;
+      TBuf<CTelephony::KNetworkLongNameSize> longName = m_networkInfoV1.iLongName;
+      if (longName.Length() > 0) {
+              m_networkName = QString::fromUtf16(longName.Ptr(), longName.Length());
+          } else {
+              TBuf<CTelephony::KNetworkDisplayTagSize> displayTag = m_networkInfoV1.iDisplayTag;
+              m_networkName = QString::fromUtf16(displayTag.Ptr(), displayTag.Length());
+          }
 
-        foreach (MTelephonyInfoObserver *observer, m_observers) {
-            if (m_networkId != m_previousNetworkId) {
-                observer->networkCodeChanged();
-            }
-            if (m_countryCode != m_previousCountryCode) {
-                observer->countryCodeChanged();
-            }
-            if (m_networkName != m_previousNetworkName) {
-                observer->networkNameChanged();
-            }
-            if (m_networkMode != m_previousNetworkMode) {
-                observer->networkModeChanged();
-            }
-            if (m_cellId != m_previouscellId) {
-                observer->changedCellId(m_cellId);
-            }
-        }
-        m_previousNetworkId = m_networkId;
-        m_previousCountryCode = m_countryCode;
-        m_previousNetworkName = m_networkName;
-        m_previousNetworkMode = m_networkMode;
-        m_previouscellId = m_cellId;
-        startMonitoring();
+      m_networkMode = m_networkInfoV1.iMode;
+
+      if (!m_initializing) {
+          foreach (MTelephonyInfoObserver *observer, m_observers) {
+              if (m_networkId != m_previousNetworkId) {
+                  observer->networkCodeChanged();
+              }
+              if (m_countryCode != m_previousCountryCode) {
+                  observer->countryCodeChanged();
+              }
+              if (m_networkName != m_previousNetworkName) {
+                  observer->networkNameChanged();
+              }
+              if (m_networkMode != m_previousNetworkMode) {
+                  observer->networkModeChanged();
+              }
+              if (m_cellId != m_previouscellId) {
+                  observer->changedCellId(m_cellId);
+              }
+          }
+      }
+
+      m_previouscellId = m_cellId;
+      m_previousNetworkId = m_networkId;
+      m_previousCountryCode = m_countryCode;
+      m_previousNetworkName = m_networkName;
+      m_previousNetworkMode = m_networkMode;
     }
+
+    if (m_initializing) {
+      m_initializing = false;
+      exitWait();
+      if (iStatus == KErrPermissionDenied) {
+        return; //No monitoring required
+      }
+    }
+
+  startMonitoring();
  TRACES (qDebug() << "CCellNetworkInfo::RunL--->");
 }
 
 void CCellNetworkInfo::DoCancel()
 {
- TRACES (qDebug() << "CCellNetworkInfo::DoCancel--->");
+ TRACES (qDebug() << "CCellNetworkInfo::DoCancel<---");
     if (m_initializing) {
         m_telephony.CancelAsync(CTelephony::EGetCurrentNetworkInfoCancel);
     } else {
         m_telephony.CancelAsync(CTelephony::ECurrentNetworkInfoChangeCancel);
     }
- TRACES (qDebug() << "CCellNetworkInfo::DoCancel<---");
+ TRACES (qDebug() << "CCellNetworkInfo::DoCancel--->");
 }
 
 int CCellNetworkInfo::cellId() const
 {
-    return m_cellId;
+  TRACES (qDebug() << "CCellNetworkInfo::cellId:" << m_cellId);
+
+    if (m_initializing)
+        waitForRequest();
+
+  return m_cellId;
 }
 
 int CCellNetworkInfo::locationAreaCode() const
 {
-    return m_locationAreaCode;
+  TRACES (qDebug() << "CCellNetworkInfo::locationAreaCode:" << m_locationAreaCode);
+
+    if (m_initializing)
+        waitForRequest();
+
+  return m_locationAreaCode;
 }
 
 QString CCellNetworkInfo::countryCode() const
 {
-    return m_countryCode;
+  TRACES (qDebug() << "CCellNetworkInfo::countryCode:" << m_countryCode);
+
+    if (m_initializing)
+        waitForRequest();
+
+  return m_countryCode;
 }
 
 QString CCellNetworkInfo::networkCode() const
 {
-    return m_networkId;
+  TRACES (qDebug() << "CCellNetworkInfo::networkCode:" << m_networkId);
+
+    if (m_initializing)
+        waitForRequest();
+
+  return m_networkId;
 }
 
 QString CCellNetworkInfo::networkName() const
 {
-    return m_networkName;
+  TRACES (qDebug() << "CCellNetworkInfo::networkName<---");
+
+    if (m_initializing)
+        waitForRequest();
+
+  return m_networkName;
 }
 
 QString CCellNetworkInfo::homeNetworkCode()
     {
+      TRACES (qDebug() << "CCellNetworkInfo::homeNetworkCode<---");
 #ifdef ETELMM_SUPPORTED
         RTelServer telServer;
         RMobilePhone mobilePhone;
@@ -402,14 +529,23 @@ QString CCellNetworkInfo::homeNetworkCode()
 
 CTelephony::TNetworkMode CCellNetworkInfo::networkMode() const
 {
-    return m_networkMode;
+  TRACES (qDebug() << "CCellNetworkInfo::networkMode:" << m_networkMode);
+
+    if (m_initializing)
+        waitForRequest();
+
+  return m_networkMode;
 }
 
 void CCellNetworkInfo::startMonitoring()
 {
  TRACES (qDebug() << "CCellNetworkInfo::startMonitoring<---");
+
+ if (!IsActive()) {
     m_telephony.NotifyChange(iStatus, CTelephony::ECurrentNetworkInfoChange, m_networkInfoV1Pckg);
     SetActive();
+  }
+
  TRACES (qDebug() << "CCellNetworkInfo::startMonitoring--->");
 }
 
@@ -417,15 +553,10 @@ CCellNetworkRegistrationInfo::CCellNetworkRegistrationInfo(CTelephony &telephony
     m_initializing(true), m_networkRegistrationV1Pckg(m_networkRegistrationV1)
 {
  TRACES (qDebug() << "CCellNetworkRegistrationInfo::CCellNetworkRegistrationInfo--->");
-    m_telephony.GetNetworkRegistrationStatus(iStatus, m_networkRegistrationV1Pckg);
-    makeRequest();
-
-    m_networkStatus = m_networkRegistrationV1.iRegStatus;
-    m_previousNetworkStatus = m_networkStatus;
 
-    m_initializing = false;
+    m_telephony.GetNetworkRegistrationStatus(iStatus, m_networkRegistrationV1Pckg);
+    SetActive();
 
-    startMonitoring();
  TRACES (qDebug() << "CCellNetworkRegistrationInfo::CCellNetworkRegistrationInfo<---");
 }
 
@@ -437,21 +568,27 @@ CCellNetworkRegistrationInfo::~CCellNetworkRegistrationInfo()
 void CCellNetworkRegistrationInfo::RunL()
 {
  TRACES (qDebug() << "CCellNetworkRegistrationInfo::RunL<---");
-    if (m_initializing) {
-        CTelephonyInfo::RunL();
-        m_initializing = false;
-    } else {
-        if (iStatus != KErrNone) return; //To avoid looping if app doesn't have ReadDeviceData caps
-        m_networkStatus = m_networkRegistrationV1.iRegStatus;
-
+    if (iStatus == KErrNone) {
+    m_networkStatus = m_networkRegistrationV1.iRegStatus;
+      if (!m_initializing) {
         foreach (MTelephonyInfoObserver *observer, m_observers) {
             if (m_networkStatus != m_previousNetworkStatus) {
                 observer->cellNetworkStatusChanged();
             }
         }
-        m_previousNetworkStatus = m_networkStatus;
-        startMonitoring();
+      }
+    m_previousNetworkStatus = m_networkStatus;
+    }
+
+    if (m_initializing) {
+      m_initializing = false;
+      exitWait();
+      if (iStatus == KErrPermissionDenied) {
+        return; //No monitoring required
+      }
     }
+
+    startMonitoring();
  TRACES (qDebug() << "CCellNetworkRegistrationInfo::RunL--->");
 }
 
@@ -468,14 +605,23 @@ void CCellNetworkRegistrationInfo::DoCancel()
 
 CTelephony::TRegistrationStatus CCellNetworkRegistrationInfo::cellNetworkStatus() const
 {
-    return m_networkStatus;
+  TRACES (qDebug() << "CCellNetworkRegistrationInfo::cellNetworkStatus:" << m_networkStatus);
+
+    if (m_initializing)
+        waitForRequest();
+
+  return m_networkStatus;
 }
 
 void CCellNetworkRegistrationInfo::startMonitoring()
 {
  TRACES (qDebug() << "CCellNetworkRegistrationInfo::startMonitoring<---");
+
+ if (!IsActive()) {
     m_telephony.NotifyChange(iStatus, CTelephony::ENetworkRegistrationStatusChange, m_networkRegistrationV1Pckg);
     SetActive();
+  }
+
 TRACES (qDebug() << "CCellNetworkRegistrationInfo::startMonitoring--->");
 }
 
@@ -483,18 +629,10 @@ CCellSignalStrengthInfo::CCellSignalStrengthInfo(CTelephony &telephony) : CTelep
     m_initializing(true), m_signalStrengthV1Pckg(m_signalStrengthV1)
 {
  TRACES (qDebug() << "CCellSignalStrengthInfo::CCellSignalStrengthInfo<---");
-    m_telephony.GetSignalStrength(iStatus, m_signalStrengthV1Pckg);
-    makeRequest();
-
-    m_cellNetworkSignalStrength = m_signalStrengthV1.iSignalStrength;
-    m_previousCellNetworkSignalStrength = m_cellNetworkSignalStrength;
 
-    m_signalBar = m_signalStrengthV1.iBar;
-    m_previousSignalBar = m_signalBar;
-
-    m_initializing = false;
+    m_telephony.GetSignalStrength(iStatus, m_signalStrengthV1Pckg);
+    SetActive();
 
-    startMonitoring();
  TRACES (qDebug() << "CCellSignalStrengthInfo::CCellSignalStrengthInfo--->");
 }
 
@@ -506,21 +644,33 @@ CCellSignalStrengthInfo::~CCellSignalStrengthInfo()
 void CCellSignalStrengthInfo::RunL()
 {
  TRACES (qDebug() << "CCellSignalStrengthInfo::RunL<---");
-    if (m_initializing) {
-        CTelephonyInfo::RunL();
-    } else {
-        if (iStatus != KErrNone) return; //To avoid looping if app doesn't have ReadDeviceData caps
-        m_cellNetworkSignalStrength = m_signalStrengthV1.iSignalStrength;
-        m_signalBar = m_signalStrengthV1.iBar;
 
-        if (m_signalBar != m_previousSignalBar) {
-            foreach (MTelephonyInfoObserver *observer, m_observers) {
-                observer->cellNetworkSignalStrengthChanged();
-            }
-        }
-        m_previousSignalBar = m_signalBar;
-        startMonitoring();
+    if (iStatus == KErrNone) {
+      m_cellNetworkSignalStrength = m_signalStrengthV1.iSignalStrength;
+      m_signalBar = m_signalStrengthV1.iBar;
+
+      if (!m_initializing) {
+          if (m_signalBar != m_previousSignalBar) {
+              foreach (MTelephonyInfoObserver *observer, m_observers) {
+                  observer->cellNetworkSignalStrengthChanged();
+              }
+          }
+      }
+
+      m_previousCellNetworkSignalStrength = m_cellNetworkSignalStrength;
+      m_previousSignalBar = m_signalBar;
     }
+
+    if (m_initializing) {
+      m_initializing = false;
+      exitWait();
+      if (iStatus == KErrPermissionDenied) {
+        return; //No monitoring required
+      }
+    }
+
+    startMonitoring();
+
  TRACES (qDebug() << "CCellSignalStrengthInfo::RunL--->");
 }
 
@@ -537,6 +687,9 @@ void CCellSignalStrengthInfo::DoCancel()
 
 int CCellSignalStrengthInfo::cellNetworkSignalStrength() const
 {
+  TRACES (qDebug() << "CCellSignalStrengthInfo::cellNetworkSignalStrength<---");
+    if (m_initializing)
+        waitForRequest();
     //Workaround solution based on the number of signal bars (max. 7)
     return int((TReal(m_signalBar) * 100.0 + 0.5) / 7.0);
 }
@@ -544,7 +697,650 @@ int CCellSignalStrengthInfo::cellNetworkSignalStrength() const
 void CCellSignalStrengthInfo::startMonitoring()
 {
  TRACES (qDebug() << "CCellSignalStrengthInfo::startMonitoring<---");
+ if (!IsActive()) {
     m_telephony.NotifyChange(iStatus, CTelephony::ESignalStrengthChange, m_signalStrengthV1Pckg);
     SetActive();
+  }
  TRACES (qDebug() << "CCellSignalStrengthInfo::startMonitoring--->");
 }
+#else //ETELMM_SUPPORTED
+CPhoneInfo::CPhoneInfo(RMobilePhone &aMobilePhone):
+      m_rmobilePhone(aMobilePhone),m_phoneInfoinitialised(false)
+{
+  TRACES (qDebug() << "CPhoneInfov2::Constructor<--");
+  TRACES (qDebug() << "CPhoneInfov2::Constructor-->");
+}
+
+CPhoneInfo::~CPhoneInfo()
+{
+ TRACES (qDebug() << "CPhoneInfov2::Destructor<--");
+ TRACES (qDebug() << "CPhoneInfov2::Destructor-->");
+}
+
+void CPhoneInfo::initialise()
+{
+  TRACES (qDebug() << "CPhoneInfov2::Initialise<--");
+
+  if (m_phoneInfoinitialised)
+    {
+      TRACES(qDebug() << "CPhoneInfov2 already initialised, return");
+      return;
+    }
+
+  //RMobilePhone implementation
+  //check for identity capabilities
+  TUint32 identityCaps;
+  TInt capabilityErr = m_rmobilePhone.GetIdentityCaps(identityCaps);
+  if (capabilityErr != KErrNone)
+    {
+    TRACES ( qDebug() << "CPhoneInfo::initialise-capability error:" << capabilityErr);
+    return;
+    }
+
+  //Initialize imei,imsi, manufacturer
+  TRequestStatus phoneInforeqstatus;
+  RMobilePhone::TMobilePhoneIdentityV1 mobilePhoneIdentity;
+  m_rmobilePhone.GetPhoneId(phoneInforeqstatus, mobilePhoneIdentity);
+  User::WaitForRequest(phoneInforeqstatus);
+  if ( phoneInforeqstatus == KErrNone ) {
+    m_model = QString::fromUtf16(mobilePhoneIdentity.iModel.Ptr(), mobilePhoneIdentity.iModel.Length());
+    m_manufacturer = QString::fromUtf16(mobilePhoneIdentity.iManufacturer.Ptr(), mobilePhoneIdentity.iManufacturer.Length());
+    m_imei = QString::fromUtf16(mobilePhoneIdentity.iSerialNumber.Ptr(), mobilePhoneIdentity.iSerialNumber.Length());
+    TRACES ( qDebug() << "CPhoneInfov2::Model:" << m_model);
+    TRACES ( qDebug() << "CPhoneInfov2::Manufacturer:" << m_manufacturer);
+    TRACES ( qDebug() << "CPhoneInfov2::Imei:" << m_imei);
+    m_phoneInfoinitialised = true;
+    }
+
+  TRACES (qDebug() << "CPhoneInfov2::Initialise-->");
+}
+
+QString CPhoneInfo::imei()
+{
+  TRACES (qDebug() << "query CPhoneInfov2::IMEI" << m_imei);
+  initialise();
+  return m_imei;
+}
+
+QString CPhoneInfo::manufacturer()
+{
+  TRACES (qDebug() << "query CPhoneInfov2::manufacturer" << m_manufacturer);
+  initialise();
+  return m_manufacturer;
+}
+
+QString CPhoneInfo::model()
+{
+  TRACES (qDebug() << "query CPhoneInfov2::model" << m_model);
+  initialise();
+  return m_model;
+}
+
+CSubscriberInfo::CSubscriberInfo(RMobilePhone &aMobilePhone):
+          m_rmobilePhone(aMobilePhone),m_subscriberInfoinitialised(false)
+{
+  TRACES (qDebug() << "CSubscriberInfov2::Constructor<--");
+  TRACES (qDebug() << "CSubscriberInfov2::Constructor-->");
+}
+
+CSubscriberInfo::~CSubscriberInfo()
+{
+ TRACES (qDebug() << "CSubscriberInfov2::Destructor<--");
+ TRACES (qDebug() << "CSubscriberInfo2::Destructor-->");
+}
+
+void CSubscriberInfo::initialise()
+{
+  TRACES (qDebug() << "CSubscriberInfov2::Initialise<--");
+
+  if (m_subscriberInfoinitialised)
+    {
+      TRACES(qDebug() << "CSubscriberInfov2 already initialised, return");
+      return;
+    }
+
+  //RMobilePhone implementation
+  //check for identity capabilities
+  TUint32 identityCaps;
+  TInt capabilityErr = m_rmobilePhone.GetIdentityCaps(identityCaps);
+  if (capabilityErr != KErrNone)
+    {
+    TRACES ( qDebug() << "CSubscriberInfo::initialise-capability error:" << capabilityErr);
+    return;
+    }
+
+  //Initialize imei,imsi, manufacturer
+  TRequestStatus  subscriberInforeqstatus;
+  RMobilePhone::TMobilePhoneSubscriberId subscriberId;
+  m_rmobilePhone.GetSubscriberId(subscriberInforeqstatus, subscriberId);
+  User::WaitForRequest(subscriberInforeqstatus);
+  if ( subscriberInforeqstatus == KErrNone ) {
+    m_imsi = QString::fromUtf16(subscriberId.Ptr(), subscriberId.Length());
+    TRACES ( qDebug() << "CSubscriberInfov2::Initialise.Imsi:" << m_imsi);
+    m_subscriberInfoinitialised = true;
+    }
+
+  TRACES (qDebug() << "CSubscriberInfov2::Initialise-->");
+}
+
+QString CSubscriberInfo::imsi()
+{
+  TRACES (qDebug() << "query CSubscriberInfov2::IMSI" << m_imsi);
+  initialise();
+  return m_imsi;
+}
+
+CEtelInfo::CEtelInfo(RMobilePhone &aMobilePhone):CActive(EPriorityStandard),
+                m_rmobilePhone(aMobilePhone),m_initialised(false)
+{
+  CActiveScheduler::Add(this);
+}
+
+CEtelInfo::~CEtelInfo()
+{
+}
+
+void CEtelInfo::addObserver(MTelephonyInfoObserver *observer)
+{
+    m_observers.append(observer);
+}
+
+void CEtelInfo::removeObserver(MTelephonyInfoObserver *observer)
+{
+    m_observers.removeOne(observer);
+}
+
+CBatteryInfo::CBatteryInfo(RMobilePhone &aMobilePhone)
+    : CEtelInfo(aMobilePhone),m_batteryLevel(0)
+{
+  TRACES ( qDebug() << "CBatteryInfov2::constructor<--" );
+  initialise();
+  TRACES ( qDebug() << "CBatteryInfov2::constructor-->" );
+}
+
+void CBatteryInfo::initialise()
+{
+  TRACES (qDebug() << "CBatteryInfov2::initialise<--");
+  if (m_initialised)
+    {
+      TRACES (qDebug() << "CBatteryInfov2 already initialised,return");
+      return;
+    }
+  //Check BatteryCaps
+  TUint32 batteryCaps;
+  TInt batteryCapserror = m_rmobilePhone.GetBatteryCaps(batteryCaps);
+  if ( batteryCapserror != KErrNone) TRACES ( qDebug() << "CBatteryInfo::initialise-capability error:" << batteryCapserror);
+
+  if ( batteryCapserror == KErrNone && (batteryCaps & RMobilePhone::KCapsGetBatteryInfo) ) {
+      TRequestStatus batterystatus;
+      m_rmobilePhone.GetBatteryInfo(batterystatus, m_batteryinfo);
+      User::WaitForRequest(batterystatus);
+      if (batterystatus == KErrNone){
+          m_batteryLevel = m_batteryinfo.iChargeLevel;
+          TRACES(qDebug() << "CBatteryInfov2:Initial chargelevel:" << m_batteryLevel);
+          m_initialised = true;
+        }
+    }
+
+  if ( batteryCapserror == KErrPermissionDenied)
+    {
+      m_initialised = true;
+      return;
+    }
+
+  if (batteryCaps & RMobilePhone::KCapsNotifyBatteryInfoChange) startMonitoring();
+
+  TRACES (qDebug() << "CBatteryInfov2::initialise-->");
+}
+
+CBatteryInfo::~CBatteryInfo()
+{
+    Cancel();
+}
+
+void CBatteryInfo::DoCancel()
+{
+    TRACES ( qDebug() << "CBatteryInfov2::DoCancel<--" );
+    if (IsActive())
+      m_rmobilePhone.CancelAsyncRequest(EMobilePhoneNotifyBatteryInfoChange);
+    TRACES ( qDebug() << "CBatteryInfov2::DoCancel-->" );
+}
+
+void CBatteryInfo::RunL()
+{
+    TRACES(qDebug() << "CBatteryInfov2::RunL()<---");
+    if (iStatus == KErrNone)
+      {
+        if ( m_batteryLevel != m_batteryinfo.iChargeLevel ) {
+            foreach (MTelephonyInfoObserver *observer, m_observers) {
+                  TRACES (qDebug() << "Notifying batteryLevelChanged");
+                  observer->batteryLevelChanged();
+                }
+          }
+        m_batteryLevel = m_batteryinfo.iChargeLevel;
+      }
+    startMonitoring();
+    TRACES(qDebug() << "CBatteryInfov2::RunL()--->");
+}
+
+void CBatteryInfo::startMonitoring()
+{
+  TRACES(qDebug() << "CBatteryInfov2::StartMonitoring--start");
+    if (!IsActive()) {
+        m_rmobilePhone.NotifyBatteryInfoChange(iStatus, m_batteryinfo);
+        SetActive();
+    }
+    TRACES(qDebug() << "CBatteryInfov2::StartMonitoring--End");
+}
+
+int CBatteryInfo::batteryLevel() const
+{
+  TRACES (qDebug() << "CBatteryInfov2::batteryLevel:" << m_batteryLevel);
+  return m_batteryLevel;
+}
+
+//Signal Strength
+CCellSignalStrengthInfo::CCellSignalStrengthInfo(RMobilePhone &aMobilePhone)
+    :CEtelInfo(aMobilePhone)
+{
+  TRACES(qDebug() << "CCellSignalStrengthInfov2::CCellSignalStrengthInfov2<---");
+  initialise();
+  TRACES(qDebug() << "CCellSignalStrengthInfov2::CCellSignalStrengthInfov2--->");
+}
+
+void CCellSignalStrengthInfo::initialise()
+{
+  TRACES (qDebug() << "CCellSignalStrengthInfov2::initialise<--");
+  if (m_initialised)
+    {
+      TRACES (qDebug() << "CCellSignalStrengthInfov2 already initialised,return");
+      return;
+    }
+  //Check Signal related Caps
+  TUint32 signalCaps;
+  TInt signalCapserror = m_rmobilePhone.GetSignalCaps(signalCaps);
+  if ( signalCapserror != KErrNone) TRACES ( qDebug() << "CCellSignalStrengthInfo::initialise-capability error:" << signalCapserror);
+
+  if (signalCapserror == KErrNone)
+    {
+      TRequestStatus signalstatus;
+      if (signalCaps & RMobilePhone::KCapsGetSignalStrength)
+        {
+          m_rmobilePhone.GetSignalStrength(signalstatus, m_cellNetworkSignalStrength, m_signalBar);
+          User::WaitForRequest(signalstatus);
+          if ( signalstatus == KErrNone ) {
+            //m_prevcellNetworkSignalStrength = m_cellNetworkSignalStrength;
+            m_prevsignalBar = m_signalBar;
+            m_initialised = true;
+          }
+        }
+    }
+
+  if ( signalCapserror == KErrPermissionDenied)
+    {
+      m_initialised = true;
+      return;
+    }
+
+  if (signalCaps & RMobilePhone::KCapsNotifySignalStrengthChange) startMonitoring();
+  TRACES (qDebug() << "CCellSignalStrengthInfov2::initialise-->");
+}
+
+CCellSignalStrengthInfo::~CCellSignalStrengthInfo()
+{
+    Cancel();
+}
+
+void CCellSignalStrengthInfo::DoCancel()
+{
+    TRACES ( qDebug() << "CCellSignalStrengthInfov2::DoCancel<--" );
+    if (IsActive())
+      m_rmobilePhone.CancelAsyncRequest(EMobilePhoneNotifySignalStrengthChange);
+    TRACES ( qDebug() << "CCellSignalStrengthInfov2::DoCancel-->" );
+}
+
+void CCellSignalStrengthInfo::RunL()
+{
+    TRACES(qDebug() << "CCellSignalStrengthInfov2::RunL()<---");
+    if (iStatus == KErrNone)
+      {
+        if ( m_signalBar != m_prevsignalBar ) {
+            foreach (MTelephonyInfoObserver *observer, m_observers) {
+                  TRACES (qDebug() << "Notifying cellNetworkSignalStrengthChanged");
+                  observer->cellNetworkSignalStrengthChanged();
+                }
+        }
+        m_prevsignalBar = m_signalBar;
+      }
+    startMonitoring();
+    TRACES(qDebug() << "CCellSignalStrengthInfov2::RunL()--->");
+}
+
+void CCellSignalStrengthInfo::startMonitoring()
+{
+  TRACES(qDebug() << "CCellSignalStrengthInfov2::StartMonitoring--start");
+    if (!IsActive()) {
+        m_rmobilePhone.NotifySignalStrengthChange(iStatus, m_cellNetworkSignalStrength, m_signalBar);
+        SetActive();
+    }
+    TRACES(qDebug() << "CCellSignalStrengthInfov2::StartMonitoring--End");
+}
+
+int CCellSignalStrengthInfo::cellNetworkSignalStrength() const
+{
+  TRACES(qDebug() << "CCellsignalstrengthv2::cellNetworkSignalStrength");
+  return int((TReal(m_signalBar) * 100.0 + 0.5) / 7.0);
+}
+
+CCellNetworkRegistrationInfo::CCellNetworkRegistrationInfo(RMobilePhone &aMobilePhone):CEtelInfo(aMobilePhone)
+{
+  TRACES(qDebug() << "CCellNetworkRegistrationInfov2::CCellNetworkRegistrationInfov2<---");
+  initialise();
+  TRACES(qDebug() << "CCellNetworkRegistrationInfov2::CCellNetworkRegistrationInfov2--->");
+}
+
+CCellNetworkRegistrationInfo::~CCellNetworkRegistrationInfo()
+{
+    Cancel();
+}
+
+void CCellNetworkRegistrationInfo::initialise()
+{
+  TRACES (qDebug() << "CCellNetworkRegistrationInfov2::initialise<--");
+  if (m_initialised)
+    {
+      TRACES (qDebug() << "CCellNetworkRegistrationInfov2 already initialised,return");
+      return;
+    }
+
+  TUint32 capsPhone;
+  TInt capserror = m_rmobilePhone.GetMultimodeCaps(capsPhone);
+  if ( capserror != KErrNone) TRACES ( qDebug() << "CCellNetworkRegistrationInfo::initialise-capability error:" << capserror);
+    if (!capserror) {
+        TRequestStatus reqStatus;
+        m_rmobilePhone.GetNetworkRegistrationStatus(reqStatus, m_networkStatus);
+        User::WaitForRequest(reqStatus);
+        m_previousNetworkStatus = m_networkStatus;
+        m_initialised = true;
+    }
+
+ if ( capserror == KErrPermissionDenied)
+    {
+      m_initialised = true;
+      return;
+    }
+
+  startMonitoring();
+ TRACES (qDebug() << "CCellNetworkRegistrationInfov2::initialise-->");
+}
+
+void CCellNetworkRegistrationInfo::RunL()
+{
+    TRACES (qDebug() << "CCellNetworkRegistrationInfov2::RunL()<---");
+    if (iStatus == KErrNone)
+      {
+        if ( m_networkStatus != m_previousNetworkStatus) {
+          foreach (MTelephonyInfoObserver *observer, m_observers) {
+                  TRACES (qDebug() << "Notifying cellnetworkstatusChanged");
+                  observer->cellNetworkStatusChanged();
+                }
+         }
+        m_previousNetworkStatus = m_networkStatus;
+      }
+    startMonitoring();
+    TRACES (qDebug() << "CCellNetworkRegistrationInfov2::RunL()--->");
+}
+
+void CCellNetworkRegistrationInfo::startMonitoring()
+{
+    TRACES (qDebug() << "CCellNetworkRegistrationInfov2::StartMonitoring<---");
+    if (!IsActive()) {
+        m_rmobilePhone.NotifyNetworkRegistrationStatusChange(iStatus,m_networkStatus);
+        SetActive();
+    }
+   TRACES (qDebug() << "CCellNetworkRegistrationInfov2::StartMonitoring--->");
+}
+
+void CCellNetworkRegistrationInfo::DoCancel()
+{
+    TRACES (qDebug() << "CCellNetworkRegistrationInfov2::DoCancel");
+    m_rmobilePhone.CancelAsyncRequest(EMobilePhoneNotifyNetworkRegistrationStatusChange);
+}
+
+RMobilePhone::TMobilePhoneRegistrationStatus CCellNetworkRegistrationInfo::cellNetworkStatus() const
+{
+  TRACES (qDebug() << "CCellNetworkRegistrationInfov2::cellNetworkStatus:" << m_networkStatus);
+  return m_networkStatus;
+}
+
+CCellNetworkInfo::CCellNetworkInfo(RMobilePhone &aMobilePhone)
+    :CEtelInfo(aMobilePhone),iNetworkInfoPckg(iNetworkInfo)
+{
+  TRACES(qDebug() << "CCellNetworkInfov2::CCellNetworkInfov2<---");
+  initialise();
+  TRACES(qDebug() << "CCellNetworkInfov2::CCellNetworkInfov2--->");
+}
+
+void CCellNetworkInfo::initialise()
+{
+  TRACES (qDebug() << "CCellNetworkInfov2::initialise<--");
+
+  if (m_initialised)
+    {
+      TRACES (qDebug() << "CCellNetworkInfov2 already initialised,return");
+      return;
+    }
+
+    // Check Signal related Caps
+    TUint32 networkCaps;
+    TInt capserror = m_rmobilePhone.GetNetworkCaps(networkCaps);
+    if ( capserror != KErrNone) TRACES ( qDebug() << "CCellNetworkInfo::initialise-capability error:" << capserror);
+    if ( capserror == KErrNone && (networkCaps & RMobilePhone::KCapsGetCurrentNetwork))
+      {
+        //For cellid & location area code, networkid, countrycode
+        TRequestStatus locationstatus;
+        m_rmobilePhone.GetCurrentNetwork(locationstatus, iNetworkInfoPckg, iLocation);
+        User::WaitForRequest(locationstatus);
+        if ( locationstatus == KErrNone )
+          {
+            //cellid
+            m_cellId = iLocation.iCellId;
+            m_previouscellId = m_cellId;
+
+            //location area code
+            m_locationAreaCode = iLocation.iLocationAreaCode;
+
+            //network id
+            m_networkId = QString::fromUtf16(iNetworkInfo.iNetworkId.Ptr(), iNetworkInfo.iNetworkId.Length());
+            m_previousNetworkId = m_networkId;
+
+            //country code
+            m_countryCode = QString::fromUtf16(iNetworkInfo.iCountryCode.Ptr(), iNetworkInfo.iCountryCode.Length());
+            m_previousCountryCode = m_countryCode;
+
+            //networkname
+            RMobilePhone::TMobilePhoneNetworkLongName longName = iNetworkInfo.iLongName;
+            if (longName.Length() > 0 ) {
+              m_networkName = QString::fromUtf16(longName.Ptr(), longName.Length());
+            } else {
+              RMobilePhone::TMobilePhoneNetworkDisplayTag displayTag = iNetworkInfo.iDisplayTag;
+              m_networkName = QString::fromUtf16(displayTag.Ptr(), displayTag.Length());
+            }
+            m_previousNetworkName = m_networkName;
+            //network mode
+            m_networkMode = iNetworkInfo.iMode;
+            m_previousNetworkMode = m_networkMode;
+            m_initialised = true;
+          }
+      }
+
+  if (capserror == KErrPermissionDenied) {
+    m_initialised = true;
+    return;
+  }
+
+  if (networkCaps & RMobilePhone::KCapsNotifyCurrentNetwork) startMonitoring();
+
+  TRACES (qDebug() << "CCellNetworkInfov2::initialise-->");
+}
+
+CCellNetworkInfo::~CCellNetworkInfo()
+{
+    Cancel();
+}
+
+int CCellNetworkInfo::cellId() const
+{
+  TRACES (qDebug() << "CCellNetworkInfov2::cellId():" << m_cellId);
+  return m_cellId;
+}
+
+int CCellNetworkInfo::locationAreaCode() const
+{
+  TRACES (qDebug() << "CCellNetworkInfov2::cellId():" << m_locationAreaCode);
+  return m_locationAreaCode;
+}
+
+QString CCellNetworkInfo::countryCode() const
+{
+  TRACES (qDebug() << "CCellNetworkInfov2::countryCode():" << m_countryCode);
+  return m_countryCode;
+}
+
+QString CCellNetworkInfo::networkCode() const
+{
+  TRACES (qDebug() << "CCellNetworkInfov2::networkCode():" << m_networkId);
+  return m_networkId;
+}
+
+QString CCellNetworkInfo::networkName() const
+{
+  TRACES (qDebug() << "CCellNetworkInfov2::networkName():" << m_networkName);
+  return m_networkName;
+}
+
+QString CCellNetworkInfo::homeNetworkCode()
+{
+    TRequestStatus homenetworkstatus;
+    RMobilePhone::TMobilePhoneNetworkInfoV1 infov1;
+    RMobilePhone::TMobilePhoneNetworkInfoV1Pckg statusPkg(infov1);
+    m_rmobilePhone.GetHomeNetwork(homenetworkstatus, statusPkg);
+    User::WaitForRequest(homenetworkstatus);
+    if (homenetworkstatus.Int() == KErrNone)
+              {
+              QString homeNetworkCode= QString::fromUtf16(infov1.iNetworkId.Ptr(), infov1.iNetworkId.Length());
+              return homeNetworkCode;
+              }
+           else
+               return QString();
+}
+
+CTelephony::TNetworkMode CCellNetworkInfo::networkMode() const
+{
+  TRACES (qDebug() << "CCellNetworkInfov2::networkMode():" << m_networkMode);
+  switch (m_networkMode){
+    case RMobilePhone::ENetworkModeUnregistered:
+      return CTelephony::ENetworkModeUnregistered;
+    case RMobilePhone::ENetworkModeGsm:
+      return CTelephony::ENetworkModeGsm;
+    case RMobilePhone::ENetworkModeAmps:
+      return CTelephony::ENetworkModeAmps;
+    case RMobilePhone::ENetworkModeCdma95:
+      return CTelephony::ENetworkModeCdma95;
+    case RMobilePhone::ENetworkModeCdma2000:
+      return CTelephony::ENetworkModeCdma2000;
+    case RMobilePhone::ENetworkModeWcdma:
+      return CTelephony::ENetworkModeWcdma;
+    /*case RMobilePhone::ENetworkModeTdcdma:
+      return CTelephony::ENetworkModeTdcdma;*/
+    default:
+      return CTelephony::ENetworkModeUnknown;
+  }
+}
+
+void CCellNetworkInfo::DoCancel()
+{
+    TRACES ( qDebug() << "CCellNetworkInfov2::DoCancel<--" );
+    if (IsActive())
+      m_rmobilePhone.CancelAsyncRequest(EMobilePhoneNotifyCurrentNetworkChange);
+    TRACES ( qDebug() << "CCellNetworkInfov2::DoCancel-->" );
+}
+
+void CCellNetworkInfo::RunL()
+{
+    TRACES(qDebug() << "CCellNetworkInfov2::RunL()<---");
+    if (iStatus == KErrNone)
+      {
+          //cellid
+          m_cellId = iLocation.iCellId;
+
+          //location area code
+          m_locationAreaCode = iLocation.iLocationAreaCode;
+
+          //network id
+          m_networkId = QString::fromUtf16(iNetworkInfo.iNetworkId.Ptr(), iNetworkInfo.iNetworkId.Length());
+
+          //country code
+          m_countryCode = QString::fromUtf16(iNetworkInfo.iCountryCode.Ptr(), iNetworkInfo.iCountryCode.Length());
+
+          //networkname
+          RMobilePhone::TMobilePhoneNetworkLongName longName = iNetworkInfo.iLongName;
+          if (longName.Length() > 0 ) {
+            m_networkName = QString::fromUtf16(longName.Ptr(), longName.Length());
+          } else {
+            RMobilePhone::TMobilePhoneNetworkDisplayTag displayTag = iNetworkInfo.iDisplayTag;
+            m_networkName = QString::fromUtf16(displayTag.Ptr(), displayTag.Length());
+          }
+
+          //network mode
+          m_networkMode = iNetworkInfo.iMode;
+
+          foreach (MTelephonyInfoObserver *observer, m_observers)
+            {
+              if (m_networkId != m_previousNetworkId) {
+                  TRACES (qDebug() << "Notifying networkcodechanged");
+                  observer->networkCodeChanged();
+              }
+              if (m_countryCode != m_previousCountryCode) {
+                  TRACES (qDebug() << "Notifying countryCodeChanged");
+                  observer->countryCodeChanged();
+              }
+              if (m_networkName != m_previousNetworkName) {
+                  TRACES (qDebug() << "Notifying networkNameChanged");
+                  observer->networkNameChanged();
+              }
+              if (m_networkMode != m_previousNetworkMode) {
+                  TRACES (qDebug() << "Notifying networkModeChanged");
+                  observer->networkModeChanged();
+              }
+              if (m_cellId != m_previouscellId) {
+                  TRACES (qDebug() << "Notifying cellId changes");
+                  observer->changedCellId(m_cellId);
+              }
+            }
+        m_previouscellId = m_cellId;
+        m_previousNetworkId = m_networkId;
+        m_previousCountryCode = m_countryCode;
+        m_previousNetworkName = m_networkName;
+        m_previousNetworkMode = m_networkMode;
+      }
+
+    if (iStatus != KErrPermissionDenied) {
+        // NotifyCurrentNetworkChange requires ReadDeviceData so don't retry if app does not
+        // have required capabilities
+        startMonitoring();
+    }
+    TRACES(qDebug() << "CCellNetworkInfov2::RunL()--->");
+}
+
+void CCellNetworkInfo::startMonitoring()
+{
+  TRACES(qDebug() << "CCellNetworkInfov2::StartMonitoring--start");
+    if (!IsActive()) {
+        m_rmobilePhone.NotifyCurrentNetworkChange(iStatus, iNetworkInfoPckg, iLocation);
+        SetActive();
+    }
+    TRACES(qDebug() << "CCellNetworkInfov2::StartMonitoring--End");
+}
+
+#endif
diff --git a/src/systeminfo/symbian/telephonyinfo_s60.h b/src/systeminfo/symbian/telephonyinfo_s60.h
index a848b9d74d..4059addb48 100644
--- a/src/systeminfo/symbian/telephonyinfo_s60.h
+++ b/src/systeminfo/symbian/telephonyinfo_s60.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2010-2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010-2012 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -39,14 +39,20 @@
 **
 ****************************************************************************/
 
-#ifndef DEVICEINFO_H
-#define DEVICEINFO_H
+#ifndef TELEPHONY_S60_H
+#define TELEPHONY_S60_H
 
 #include <e32base.h>
 #include <etel3rdparty.h>
 #include <QString>
 #include <QList>
+#include <QStack>
+#include <QEventLoop>
+#include <qDebug>
 #include "trace.h"
+#ifdef ETELMM_SUPPORTED
+#include <etelmm.h>
+#endif
 
 class CActiveSchedulerWait;
 
@@ -65,6 +71,7 @@ public:
     virtual void changedCellId(int) = 0;
 };
 
+#ifndef ETELMM_SUPPORTED
 class CTelephonyInfo : public CActive
 {
 public:
@@ -74,16 +81,14 @@ public:
     void addObserver(MTelephonyInfoObserver *observer);
     void removeObserver(MTelephonyInfoObserver *observer);
 
-protected:  //from CActive
-    void RunL();
-
 protected:
-    void makeRequest();
+    void waitForRequest() const;
+    void exitWait() const;
 
 protected:
     CTelephony &m_telephony;
     QList<MTelephonyInfoObserver *> m_observers;
-    CActiveSchedulerWait *m_wait;
+    mutable QStack<QEventLoop*> m_loops;
 };
 
 class CPhoneInfo : public CTelephonyInfo
@@ -93,16 +98,19 @@ public:
     ~CPhoneInfo();
 
 protected:
+    void RunL();
     void DoCancel();
 
 public:
-    QString imei() const;
-    QString manufacturer() const;
-    QString model() const;
+    QString imei();
+    QString manufacturer();
+    QString model();
 
 private:
-    CTelephony::TPhoneIdV1 m_phoneIdV1;
-    CTelephony::TPhoneIdV1Pckg m_phoneIdV1Pckg;
+    void makeRequest();
+    bool m_initializing;
+    mutable CTelephony::TPhoneIdV1 m_phoneIdV1;
+    mutable CTelephony::TPhoneIdV1Pckg m_phoneIdV1Pckg;
 
     QString m_imei;
     QString m_manufacturer;
@@ -116,14 +124,17 @@ public:
     ~CSubscriberInfo();
 
 protected:
+    void RunL();
     void DoCancel();
 
 public:
-    QString imsi() const;
+    QString imsi();
 
 private:
-    CTelephony::TSubscriberIdV1 m_subscriberIdV1;
-    CTelephony::TSubscriberIdV1Pckg m_subscriberIdV1Pckg;
+    void makeRequest();
+    bool m_initializing;
+    mutable CTelephony::TSubscriberIdV1 m_subscriberIdV1;
+    mutable CTelephony::TSubscriberIdV1Pckg m_subscriberIdV1Pckg;
 
     QString m_imsi;
 };
@@ -247,5 +258,168 @@ private:
     int m_signalBar;
     int m_previousSignalBar;
 };
+#else //ETELMM_SUPPORTED
+class CPhoneInfo : public CBase
+{
+public:
+    CPhoneInfo(RMobilePhone &aMobilePhone);
+    ~CPhoneInfo();
+    void initialise();
+
+public:
+    QString imei();
+    QString manufacturer();
+    QString model();
+
+private:
+    RMobilePhone &m_rmobilePhone;
+    bool m_phoneInfoinitialised;
+    QString m_imei;
+    QString m_manufacturer;
+    QString m_model;
+};
+
+class CSubscriberInfo : public CBase
+{
+public:
+    CSubscriberInfo(RMobilePhone &aMobilePhone);
+    ~CSubscriberInfo();
+    void initialise();
+
+public:
+    QString imsi();
+
+private:
+    RMobilePhone &m_rmobilePhone;
+    bool m_subscriberInfoinitialised;
+    QString m_imsi;
+};
+
+
+class CEtelInfo : public CActive
+{
+public:
+    CEtelInfo(RMobilePhone &aMobilePhone);
+    ~CEtelInfo();
+    void addObserver(MTelephonyInfoObserver *observer);
+    void removeObserver(MTelephonyInfoObserver *observer);
+
+protected:
+    RMobilePhone &m_rmobilePhone;
+    QList<MTelephonyInfoObserver *> m_observers;
+    bool m_initialised;
+};
+
+
+class CBatteryInfo : public CEtelInfo
+{
+public:
+    CBatteryInfo(RMobilePhone &aMobilePhone);
+    ~CBatteryInfo();
+    void initialise();
+    void startMonitoring();
+
+protected:
+    void RunL();
+    void DoCancel();
+
+public:
+    int batteryLevel() const;
+
+private:
+    int m_batteryLevel;
+    RMobilePhone::TMobilePhoneBatteryInfoV1 m_batteryinfo;
+};
+
+
+class CCellSignalStrengthInfo : public CEtelInfo
+{
+public:
+    CCellSignalStrengthInfo(RMobilePhone &aMobilePhone);
+    ~CCellSignalStrengthInfo();
+    void initialise();
+    void startMonitoring();
+
+protected:
+    void RunL();
+    void DoCancel();
+
+public:
+    int cellNetworkSignalStrength() const;
+
+private:
+    TInt32 m_cellNetworkSignalStrength;
+    TInt8 m_signalBar;
+    TInt32 m_prevcellNetworkSignalStrength;
+    TInt8 m_prevsignalBar;
+};
+
+class CCellNetworkRegistrationInfo : public CEtelInfo
+{
+public:
+    CCellNetworkRegistrationInfo(RMobilePhone &aMobilePhone);
+    ~CCellNetworkRegistrationInfo();
+    void initialise();
+    void startMonitoring();
+
+protected:
+    void RunL();
+    void DoCancel();
+
+public:
+    RMobilePhone::TMobilePhoneRegistrationStatus cellNetworkStatus() const;
+
+private:
+    RMobilePhone::TMobilePhoneRegistrationStatus m_networkStatus;
+    RMobilePhone::TMobilePhoneRegistrationStatus m_previousNetworkStatus;
+};
+
+class CCellNetworkInfo : public CEtelInfo
+{
+public:
+    CCellNetworkInfo(RMobilePhone &aMobilePhone);
+    ~CCellNetworkInfo();
+    void initialise();
+    void startMonitoring();
+
+protected:
+    void RunL();
+    void DoCancel();
+
+public:
+    int cellId() const;
+    int locationAreaCode() const;
+
+    QString countryCode() const;
+    QString networkCode() const;
+    QString networkName() const;
+    QString homeNetworkCode();
+    CTelephony::TNetworkMode networkMode() const;/*RMobilePhone::TMobilePhoneNetworkMode <=> CTelePhony::TNetworkMode*/
+
+private:
+    /** Network info of mobile phone. */
+    RMobilePhone::TMobilePhoneNetworkInfoV1 iNetworkInfo;
+    /** Location of mobile phone. */
+    RMobilePhone::TMobilePhoneLocationAreaV1 iLocation;
+    /** Packaged network info object. */
+    RMobilePhone::TMobilePhoneNetworkInfoV1Pckg iNetworkInfoPckg;
+
+    int m_cellId;
+    int m_previouscellId;
+    int m_locationAreaCode;
+
+    QString m_networkId;
+    QString m_previousNetworkId;
+
+    QString m_countryCode;
+    QString m_previousCountryCode;
+
+    QString m_networkName;
+    QString m_previousNetworkName;
+
+    RMobilePhone::TMobilePhoneNetworkMode m_networkMode;
+    RMobilePhone::TMobilePhoneNetworkMode m_previousNetworkMode;
+};
+#endif //End ETELMM_SUPPORTED
 
-#endif //DEVICEINFO_H
+#endif //TELEPHONY_S60_H
diff --git a/src/systeminfo/symbian/thermalstatus_s60.h b/src/systeminfo/symbian/thermalstatus_s60.h
index 60b2e4025e..b6fc0f359a 100644
--- a/src/systeminfo/symbian/thermalstatus_s60.h
+++ b/src/systeminfo/symbian/thermalstatus_s60.h
@@ -46,7 +46,7 @@
 #include <e32property.h>
 #include <QList>
 #include "trace.h"
-#include <internal\ThermalManagerUserIF.h>
+#include <internal/ThermalManagerUserIF.h>
 #define KThermalerror 0xFF
 
 
diff --git a/src/systeminfo/symbian/tsrc/qsystemdeviceinfo.pro b/src/systeminfo/symbian/tsrc/qsystemdeviceinfo.pro
index 3909857b85..ed6cec8ae3 100644
--- a/src/systeminfo/symbian/tsrc/qsystemdeviceinfo.pro
+++ b/src/systeminfo/symbian/tsrc/qsystemdeviceinfo.pro
@@ -33,7 +33,7 @@ symbian:
             -lusbman \
             -lprofileeng
 
-            contains(S60_VERSION, 5.1) | contains(S60_VERSION, 5.2) {
+            contains(S60_VERSION, 5.1) | contains(S60_VERSION, 5.2) | contains(S60_VERSION, 5.3) | contains(S60_VERSION, 5.4){
             LIBS += -lhwrmpowerclient
         }
-}
\ No newline at end of file
+}
diff --git a/src/systeminfo/symbian/tsrc/threadtests/threadtests.pro b/src/systeminfo/symbian/tsrc/threadtests/threadtests.pro
new file mode 100644
index 0000000000..77db750722
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/threadtests.pro
@@ -0,0 +1,6 @@
+TEMPLATE = subdirs
+SUBDIRS +=  tst_CreateDifferentInfosInDifferentThreads \
+            tst_CreateSameInfosInDifferentThreads \
+            tst_CreateInfoOutsideMainThread \
+            tst_MoveInfosToDifferentThreads \
+            tst_RecreateInfosInDifferentThreads
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_CreateDifferentInfosInDifferentThreads/tst_CreateDifferentInfosInDifferentThreads.cpp b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateDifferentInfosInDifferentThreads/tst_CreateDifferentInfosInDifferentThreads.cpp
new file mode 100644
index 0000000000..21a0f836c8
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateDifferentInfosInDifferentThreads/tst_CreateDifferentInfosInDifferentThreads.cpp
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <qsysteminfo.h>
+
+QTM_USE_NAMESPACE
+
+//#define SHOWDEBUGS
+
+QSemaphore MainThreadRunningSemaphore;
+
+class Thread : public QThread
+{
+    Q_OBJECT
+public:
+    void run() {
+#ifdef SHOWDEBUGS
+        qDebug()<<"Thread::run - create QSystemNetworkInfo - running in thread: "<<thread()->currentThreadId();
+#endif//SHOWDEBUGS
+        QSystemNetworkInfo networkInfo;
+        MainThreadRunningSemaphore.release();
+    }
+};
+
+class tst_QSystemInfo_CreateDifferentInfosInDifferentThreads : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void testCase() {
+#ifdef SHOWDEBUGS
+        qDebug()<<"CreateInfosInDifferentThreads::testCase - create QSystemDeviceInfo - running in thread: "<<thread()->currentThreadId();
+#endif//SHOWDEBUGS
+        QSystemDeviceInfo deviceInfo;
+        Thread testThread;
+        testThread.start();
+        MainThreadRunningSemaphore.acquire();
+        testThread.wait();
+    }
+};
+
+QTEST_MAIN(tst_QSystemInfo_CreateDifferentInfosInDifferentThreads);
+
+#include "tst_CreateDifferentInfosInDifferentThreads.moc"
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_CreateDifferentInfosInDifferentThreads/tst_CreateDifferentInfosInDifferentThreads.pro b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateDifferentInfosInDifferentThreads/tst_CreateDifferentInfosInDifferentThreads.pro
new file mode 100644
index 0000000000..4792323ecd
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateDifferentInfosInDifferentThreads/tst_CreateDifferentInfosInDifferentThreads.pro
@@ -0,0 +1,14 @@
+TARGET = tst_CreateDifferentInfosInDifferentThreads
+CONFIG+=testcase
+
+SOURCES  += tst_CreateDifferentInfosInDifferentThreads.cpp
+QT = core network
+INCLUDEPATH += ../../../../../src/systeminfo
+
+include(../../../../../../common.pri)
+CONFIG += mobility
+MOBILITY = systeminfo
+
+symbian {
+    TARGET.CAPABILITY = All -TCB -DRM
+}
\ No newline at end of file
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_CreateInfoOutsideMainThread/tst_CreateInfoOutsideMainThread.cpp b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateInfoOutsideMainThread/tst_CreateInfoOutsideMainThread.cpp
new file mode 100644
index 0000000000..297bacf04a
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateInfoOutsideMainThread/tst_CreateInfoOutsideMainThread.cpp
@@ -0,0 +1,172 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <qsysteminfo.h>
+
+QTM_USE_NAMESPACE
+
+#define SHOWDEBUGS
+
+QSemaphore MainThreadRunningSemaphore;
+QSemaphore OtherThreadRunningSemaphore;
+
+class ThreadBase : public QThread
+{
+    Q_OBJECT
+public:
+
+    void run() {
+#ifdef SHOWDEBUGS
+        qDebug()<<"Thread::run - create object in thread: "<<thread()->currentThreadId();
+#endif//SHOWDEBUGS
+        construct();
+#if 0
+        qDebug()<<"Thread::run - read something directly from object in this thread: "
+                <<networkInfo.currentMode();
+#endif//SHOWDEBUGS
+        MainThreadRunningSemaphore.release();
+    }
+
+    virtual void construct() = 0;
+};
+
+class QSystemBatteryInfoThread : public ThreadBase
+{
+    void construct() {
+        QSystemBatteryInfo info;
+    }
+};
+
+class QSystemDeviceInfoThread : public ThreadBase
+{
+    void construct() {
+        QSystemDeviceInfo info;
+    }
+};
+
+class QSystemInfoThread : public ThreadBase
+{
+    void construct() {
+        QSystemInfo info;
+    }
+};
+
+class QSystemNetworkInfoThread : public ThreadBase
+{
+    void construct() {
+        QSystemNetworkInfo info;
+    }
+};
+
+class QSystemScreenSaverThread : public ThreadBase
+{
+    void construct() {
+        QSystemScreenSaver info;
+    }
+};
+
+class QSystemStorageInfoThread : public ThreadBase
+{
+    void construct() {
+        QSystemStorageInfo info;
+    }
+};
+
+class tst_QSystemInfo_CreateInfoOutsideMainThread : public QObject
+{
+    Q_OBJECT
+
+private:
+    void runThread(ThreadBase& testThread) {
+        testThread.start();
+        MainThreadRunningSemaphore.acquire();
+        OtherThreadRunningSemaphore.release();
+        testThread.wait();
+    }
+
+    void logThread(const QString message) {
+#ifdef SHOWDEBUGS
+        qDebug() << message << thread()->currentThreadId();
+#endif//SHOWDEBUGS
+    }
+
+private Q_SLOTS:
+    void testBatteryInfo() {
+        logThread("running in thread:");
+        QSystemBatteryInfoThread testThread;
+        runThread(testThread);
+    }
+
+    void testDeviceInfo() {
+        logThread("running in thread:");
+        QSystemDeviceInfoThread testThread;
+        runThread(testThread);
+    }
+
+    void testInfo() {
+        logThread("running in thread:");
+        QSystemInfoThread testThread;
+        runThread(testThread);
+    }
+
+    void testNetworkInfo() {
+        logThread("running in thread:");
+        QSystemNetworkInfoThread testThread;
+        runThread(testThread);
+    }
+
+    void testScreenSaver() {
+        logThread("running in thread:");
+        QSystemScreenSaverThread testThread;
+        runThread(testThread);
+    }
+
+    void testStorageInfo() {
+        logThread("running in thread:");
+        QSystemStorageInfoThread testThread;
+        runThread(testThread);
+    }
+};
+
+QTEST_MAIN(tst_QSystemInfo_CreateInfoOutsideMainThread);
+
+#include "tst_CreateInfoOutsideMainThread.moc"
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_CreateInfoOutsideMainThread/tst_CreateInfoOutsideMainThread.pro b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateInfoOutsideMainThread/tst_CreateInfoOutsideMainThread.pro
new file mode 100644
index 0000000000..560371e006
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateInfoOutsideMainThread/tst_CreateInfoOutsideMainThread.pro
@@ -0,0 +1,14 @@
+TARGET = tst_CreateInfoOutsideMainThread
+CONFIG+=testcase
+
+SOURCES  += tst_CreateInfoOutsideMainThread.cpp
+QT = core network
+INCLUDEPATH += ../../../../../src/systeminfo
+
+include(../../../../../../common.pri)
+CONFIG += mobility
+MOBILITY = systeminfo
+
+symbian {
+    TARGET.CAPABILITY = All -TCB -DRM
+}
\ No newline at end of file
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_CreateSameInfosInDifferentThreads/tst_CreateSameInfosInDifferentThreads.cpp b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateSameInfosInDifferentThreads/tst_CreateSameInfosInDifferentThreads.cpp
new file mode 100644
index 0000000000..8f29029399
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateSameInfosInDifferentThreads/tst_CreateSameInfosInDifferentThreads.cpp
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <qsysteminfo.h>
+
+QTM_USE_NAMESPACE
+
+//#define SHOWDEBUGS
+
+QSemaphore MainThreadRunningSemaphore;
+QSemaphore OtherThreadRunningSemaphore;
+
+class Thread : public QThread
+{
+    Q_OBJECT
+public:
+    void run() {
+#ifdef SHOWDEBUGS
+        qDebug()<<"Thread::run - create same object also in thread: "<<thread()->currentThreadId();
+#endif//SHOWDEBUGS
+        QSystemNetworkInfo networkInfo;
+#ifdef SHOWDEBUGS
+        qDebug()<<"Thread::run - read something directly from object in this thread: "
+                <<networkInfo.currentMode();
+#endif//SHOWDEBUGS
+        MainThreadRunningSemaphore.release();
+    }
+};
+
+class tst_QSystemInfo_CreateSameInfosInDifferentThreads : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void testCase() {
+#ifdef SHOWDEBUGS
+        qDebug()<<"tst_QSystemInfo_CreateSameInfosInDifferentThreads::testCase - create objects - running in thread: "<<thread()->currentThreadId();
+#endif//SHOWDEBUGS
+        QSystemNetworkInfo networkInfo;
+        Thread testThread;
+        testThread.start();
+        MainThreadRunningSemaphore.acquire();
+#ifdef SHOWDEBUGS
+        qDebug()<<"tst_QSystemInfo_CreateSameInfosInDifferentThreads::testCase - read something directly from object in this thread: "
+                <<networkInfo.currentMode();
+#endif//SHOWDEBUGS
+        OtherThreadRunningSemaphore.release();
+        testThread.wait();
+    }
+};
+
+QTEST_MAIN(tst_QSystemInfo_CreateSameInfosInDifferentThreads);
+
+#include "tst_CreateSameInfosInDifferentThreads.moc"
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_CreateSameInfosInDifferentThreads/tst_CreateSameInfosInDifferentThreads.pro b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateSameInfosInDifferentThreads/tst_CreateSameInfosInDifferentThreads.pro
new file mode 100644
index 0000000000..91db780c32
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_CreateSameInfosInDifferentThreads/tst_CreateSameInfosInDifferentThreads.pro
@@ -0,0 +1,14 @@
+TARGET = tst_CreateSameInfosInDifferentThreads
+CONFIG+=testcase
+
+SOURCES  += tst_CreateSameInfosInDifferentThreads.cpp
+QT = core network
+INCLUDEPATH += ../../../../../src/systeminfo
+
+include(../../../../../../common.pri)
+CONFIG += mobility
+MOBILITY = systeminfo
+
+symbian {
+    TARGET.CAPABILITY = All -TCB -DRM
+}
\ No newline at end of file
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_MoveInfosToDifferentThreads/tst_MoveInfosToDifferentThreads.cpp b/src/systeminfo/symbian/tsrc/threadtests/tst_MoveInfosToDifferentThreads/tst_MoveInfosToDifferentThreads.cpp
new file mode 100644
index 0000000000..e6999ad36f
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_MoveInfosToDifferentThreads/tst_MoveInfosToDifferentThreads.cpp
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <qsysteminfo.h>
+#include <qsystemdeviceinfo.h>
+
+QTM_USE_NAMESPACE
+
+//#define SHOWDEBUGS
+
+QSemaphore MainThreadRunningSemaphore;
+QSemaphore OtherThreadRunningSemaphore;
+
+class Thread : public QThread
+{
+    Q_OBJECT
+public:
+    Thread(QSystemDeviceInfo *deviceInfo, QSystemNetworkInfo *networkInfo)
+        : mSysDeviceInfo(deviceInfo), mSysNetworkInfo(networkInfo) {}
+
+    void run() {
+#ifdef SHOWDEBUGS
+        qDebug()<<"Thread::run - running in thread: "<<thread()->currentThreadId();
+        qDebug()<<"Thread::run - read something directly from object in different thread: "
+                <<mSysDeviceInfo->manufacturer();
+        qDebug()<<"Thread::run - create a signal&slot connection";
+#endif//SHOWDEBUGS
+        connect( mSysDeviceInfo, SIGNAL(batteryLevelChanged(int)),
+                this, SLOT(testSlot()));
+        MainThreadRunningSemaphore.release();
+        OtherThreadRunningSemaphore.acquire();
+#ifdef SHOWDEBUGS
+        qDebug()<<"ThreadU::run - read something directly from object moved to this thread: "
+                <<mSysNetworkInfo->currentMode();
+#endif//SHOWDEBUGS
+        MainThreadRunningSemaphore.release();
+    }
+
+public slots:
+    void testSlot() {
+#ifdef SHOWDEBUGS
+        qDebug()<<"Thread::testSlot called - running in thread: "<<thread()->currentThreadId();
+#endif//SHOWDEBUGS
+    }
+
+public:
+    QSystemDeviceInfo *mSysDeviceInfo;
+    QSystemNetworkInfo *mSysNetworkInfo;
+};
+
+class tst_QSystemInfo_MoveInfosToDifferentThreads : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void testCase() {
+#ifdef SHOWDEBUGS
+        qDebug()<<"tst_QSystemInfo_MoveInfosToDifferentThreads::testCase - create objects - running in thread: "<<thread()->currentThreadId();
+#endif//SHOWDEBUGS
+        QSystemDeviceInfo deviceInfo;
+        QSystemNetworkInfo networkInfo;
+        Thread testThread(&deviceInfo, &networkInfo);
+        testThread.start();
+        MainThreadRunningSemaphore.acquire();
+#ifdef SHOWDEBUGS
+        qDebug()<<"tst_QSystemInfo_MoveInfosToDifferentThreads::testCase - move objects to other thread";
+#endif//SHOWDEBUGS
+        deviceInfo.moveToThread(&testThread);
+        networkInfo.moveToThread(&testThread);
+        OtherThreadRunningSemaphore.release();
+        MainThreadRunningSemaphore.acquire();
+#ifdef SHOWDEBUGS
+        qDebug()<<"tst_QSystemInfo_MoveInfosToDifferentThreads::testCase - read something directly from object moved to other thread: "
+                <<deviceInfo.productName();
+#endif//SHOWDEBUGS
+        OtherThreadRunningSemaphore.release();
+        testThread.wait();
+    }
+};
+
+QTEST_MAIN(tst_QSystemInfo_MoveInfosToDifferentThreads);
+
+#include "tst_MoveInfosToDifferentThreads.moc"
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_MoveInfosToDifferentThreads/tst_MoveInfosToDifferentThreads.pro b/src/systeminfo/symbian/tsrc/threadtests/tst_MoveInfosToDifferentThreads/tst_MoveInfosToDifferentThreads.pro
new file mode 100644
index 0000000000..1610a59599
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_MoveInfosToDifferentThreads/tst_MoveInfosToDifferentThreads.pro
@@ -0,0 +1,14 @@
+TARGET = tst_MoveInfosToDifferentThreads
+CONFIG+=testcase
+
+SOURCES  += tst_MoveInfosToDifferentThreads.cpp
+QT = core network
+INCLUDEPATH += ../../../../../src/systeminfo
+
+include(../../../../../../common.pri)
+CONFIG += mobility
+MOBILITY = systeminfo
+
+symbian {
+    TARGET.CAPABILITY = All -TCB -DRM
+}
\ No newline at end of file
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_RecreateInfosInDifferentThreads/tst_RecreateInfosInDifferentThreads.cpp b/src/systeminfo/symbian/tsrc/threadtests/tst_RecreateInfosInDifferentThreads/tst_RecreateInfosInDifferentThreads.cpp
new file mode 100644
index 0000000000..fed91ff45b
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_RecreateInfosInDifferentThreads/tst_RecreateInfosInDifferentThreads.cpp
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <qsysteminfo.h>
+
+QTM_USE_NAMESPACE
+
+//#define SHOWDEBUGS
+
+QSemaphore MainThreadRunningSemaphore;
+QSemaphore OtherThreadRunningSemaphore;
+
+void createAndDeleteNetworkInfo() {
+    QSystemNetworkInfo networkInfo;
+#ifdef SHOWDEBUGS
+        qDebug()<<"createAndDeleteNetworkInfo - create and delete in thread: "<<networkInfo.thread()->currentThreadId();
+#endif//SHOWDEBUGS
+    }
+
+class Thread : public QThread
+{
+    Q_OBJECT
+public:
+    void run() {
+        createAndDeleteNetworkInfo();
+        createAndDeleteNetworkInfo();
+        MainThreadRunningSemaphore.release();
+    }
+};
+
+class tst_QSystemInfo_RecreateInfosInDifferentThreads : public QObject
+{
+    Q_OBJECT
+private Q_SLOTS:
+    void testCase() {
+#ifdef SHOWDEBUGS
+        qDebug()<<"tst_QSystemInfo_RecreateInfosInDifferentThreads::testCase - running in thread: "<<thread()->currentThreadId();
+#endif//SHOWDEBUGS
+        createAndDeleteNetworkInfo();
+        Thread testThread;
+        testThread.start();
+        MainThreadRunningSemaphore.acquire();
+        OtherThreadRunningSemaphore.release();
+        testThread.wait();
+    }
+};
+
+QTEST_MAIN(tst_QSystemInfo_RecreateInfosInDifferentThreads);
+
+#include "tst_RecreateInfosInDifferentThreads.moc"
diff --git a/src/systeminfo/symbian/tsrc/threadtests/tst_RecreateInfosInDifferentThreads/tst_RecreateInfosInDifferentThreads.pro b/src/systeminfo/symbian/tsrc/threadtests/tst_RecreateInfosInDifferentThreads/tst_RecreateInfosInDifferentThreads.pro
new file mode 100644
index 0000000000..2cc314c104
--- /dev/null
+++ b/src/systeminfo/symbian/tsrc/threadtests/tst_RecreateInfosInDifferentThreads/tst_RecreateInfosInDifferentThreads.pro
@@ -0,0 +1,16 @@
+TARGET = tst_RecreateInfosInDifferentThreads
+
+TARGET = tst_RecreateInfosInDifferentThreads
+CONFIG+=testcase
+
+SOURCES  += tst_RecreateInfosInDifferentThreads.cpp
+QT = core network
+INCLUDEPATH += ../../../../../src/systeminfo
+
+include(../../../../../../common.pri)
+CONFIG += mobility
+MOBILITY = systeminfo
+
+symbian {
+    TARGET.CAPABILITY = All -TCB -DRM
+}
\ No newline at end of file
diff --git a/src/systeminfo/symbian/tsrc/tst_qsystemdeviceinfo.cpp b/src/systeminfo/symbian/tsrc/tst_qsystemdeviceinfo.cpp
index ba3494428b..71cad7fd1a 100644
--- a/src/systeminfo/symbian/tsrc/tst_qsystemdeviceinfo.cpp
+++ b/src/systeminfo/symbian/tsrc/tst_qsystemdeviceinfo.cpp
@@ -229,6 +229,7 @@ void tst_QSystemStorageInfo::tst_PhoneMemoryThresholdNotifications()
     {
     qDebug() << "  - Begin ";
     QSystemStorageInfo *sti = new QSystemStorageInfo(this);
+    //make sure we have a file available by name file.mp3
     _LIT(KSOURCEPATH,"C:\\Data\\file.mp3");
     _LIT(KDESTINATIONPATH,":\\Data\\");
     _LIT(KMP3,".mp3");
@@ -417,8 +418,8 @@ void tst_QSystemDeviceInfo::tst_uniqueDeviceID()
 {
     qDebug() << "tst_QSystemDeviceInfo::tst_uniqueDeviceID---START" ;
     QSystemDeviceInfo di;
-    QUuid uniqueDeviceId = di.uniqueDeviceID();
-    QVERIFY(uniqueDeviceId != 0);
+    QByteArray byteArray = di.uniqueDeviceID();
+    QVERIFY(byteArray.isEmpty() != true);
 }
 
 //Lockstatus is set to KeypadLocked and then changed to DeviceLocked
@@ -426,8 +427,8 @@ void tst_QSystemDeviceInfo::tst_lockStatusKeypadLocked()
 {
     qDebug() << "tst_QSystemDeviceInfo::tst_lockStatusKeypadLocked ---START Line No" <<__LINE__;
     QSystemDeviceInfo *di = new QSystemDeviceInfo;
-    connect(di,SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockType)),this,SLOT(updateLockStatus(QSystemDeviceInfo::LockType)));
-    QSignalSpy spy(di, SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockType)));
+    connect(di,SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockTypeFlags)),this,SLOT(updateLockStatus(QSystemDeviceInfo::LockTypeFlags)));
+    QSignalSpy spy(di, SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockTypeFlags)));
     TInt err = RProperty::Set(KPSUidAvkonDomain, KAknKeyguardStatus, EKeyguardLocked);
     WaitActive(1000000);
 
@@ -452,8 +453,8 @@ void tst_QSystemDeviceInfo::tst_lockStatusDeviceLocked()
 {
     qDebug() << "tst_QSystemDeviceInfo::tst_lockStatusDeviceLocked---START" ;
     QSystemDeviceInfo *di = new QSystemDeviceInfo;
-    connect(di,SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockType)),this,SLOT(updateLockStatus(QSystemDeviceInfo::LockType)));
-    QSignalSpy spy(di, SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockType)));
+    connect(di,SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockTypeFlags)),this,SLOT(updateLockStatus(QSystemDeviceInfo::LockTypeFlags)));
+    QSignalSpy spy(di, SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockTypeFlags)));
     TInt err = RProperty::Set(KPSUidAvkonDomain, KAknKeyguardStatus, EKeyguardAutolockEmulation);
     WaitActive(1000000);
 
@@ -478,8 +479,8 @@ void tst_QSystemDeviceInfo::tst_lockStatusDeviceUnknownLock()
     TInt value = 5;
     qDebug() << "tst_QSystemDeviceInfo::tst_lockStatusDeviceUnknownLock---START" ;
     QSystemDeviceInfo *di = new QSystemDeviceInfo;
-    connect(di,SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockType)),this,SLOT(updateLockStatus(QSystemDeviceInfo::LockType)));
-    QSignalSpy spy(di, SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockType)));
+    connect(di,SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockTypeFlags)),this,SLOT(updateLockStatus(QSystemDeviceInfo::LockTypeFlags)));
+    QSignalSpy spy(di, SIGNAL(lockStatusChanged(QSystemDeviceInfo::LockTypeFlags)));
     TInt err = RProperty::Set(KPSUidAvkonDomain, KAknKeyguardStatus ,value);
     WaitActive(1000000);
 
@@ -881,7 +882,7 @@ void tst_QSystemDeviceInfo::tst_vibrationVolumeSettings()
             CleanupStack::PopAndDestroy(repository);
             repository = NULL;
         )
-        vibration = testObj.getActiveProfileDetails().vibrationActive();
+        vibration = testObj.activeProfileDetails().vibrationActive();
         qDebug()<<"Vibra Status returned is  "<<boolToStr(vibration);
         QVERIFY2(( vibration == vibraStates[loopiter] ) ," Failed to Set/Get vibra Status.. Aborting..");
     }
@@ -896,8 +897,8 @@ void tst_QSystemDeviceInfo::tst_vibrationVolumeSettings()
             CleanupStack::PopAndDestroy(repository);
             repository = NULL;
         )
-        msgVolume = testObj.getActiveProfileDetails().messageRingtoneVolume();
-        voiceVolume = testObj.getActiveProfileDetails().voiceRingtoneVolume();
+        msgVolume = testObj.activeProfileDetails().messageRingtoneVolume();
+        voiceVolume = testObj.activeProfileDetails().voiceRingtoneVolume();
         qDebug()<<"Msg Vol  : "<<msgVolume<<"   Voice vol : "<<voiceVolume;
         TInt calibVol = 100*(loopiter - 1)/9;
         QVERIFY2( ( msgVolume == calibVol), "Message Volume Get/Set Error... Aborting");
@@ -928,7 +929,7 @@ void tst_QSystemDeviceInfo::tst_vibrationVolumeSettings()
  QSystemDisplayInfo::DisplayOrientation orientation = QSystemDisplayInfo::Unknown;
  int screen = 0;
  QSystemDisplayInfo di;
- orientation = di.getOrientation(screen);
+ orientation = di.orientation(screen);
  qDebug() << "The Orientation is  " << orientation ;
  qDebug() << "tst_QSystemDisplayInfo::tst_getOrientation---END" ;
  }
diff --git a/src/systeminfo/systeminfo.pro b/src/systeminfo/systeminfo.pro
index e5817933d4..2de6a8536c 100644
--- a/src/systeminfo/systeminfo.pro
+++ b/src/systeminfo/systeminfo.pro
@@ -1,3 +1,5 @@
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 TARGET = QtSystemInfo
 QT += network gui
@@ -328,10 +330,13 @@ unix:!simulator {
         }
 
         contains(thermalstatus_symbian_enabled, yes) {
+            # header not present in public SDK builds
+            exists($${EPOCROOT}epoc32\\include\\internal\\ThermalManagerUserIF.h) {
             DEFINES += THERMALSTATUS_SUPPORTED
             SOURCES += thermalstatus_s60.cpp
             HEADERS += thermalstatus_s60.h
             message("Thermalstatus enabled")
+           }
         }
 
         contains(networkhandlingengine_symbian_enabled, yes) {
@@ -346,9 +351,9 @@ unix:!simulator {
 #        TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment Location ReadDeviceData TrustedUI
 
         TARGET.EPOCALLOWDLLDATA = 1
-        TARGET.UID3 = 0x2002ac7d
+        TARGET.UID3 = $$mobilityUID(0x2002ac7d)
 
-        QtSystemInfoDeployment.sources = QtSystemInfo.dll
+        QtSystemInfoDeployment.sources = QtSystemInfo$${QT_LIBINFIX}.dll
         QtSystemInfoDeployment.path = /sys/bin
         DEPLOYMENT += QtSystemInfoDeployment
     }
diff --git a/src/versit/versit.pro b/src/versit/versit.pro
index e32f4b4e80..d1924ba8a3 100644
--- a/src/versit/versit.pro
+++ b/src/versit/versit.pro
@@ -1,6 +1,9 @@
 # #####################################################################
 # Versit
 # #####################################################################
+
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 TARGET = QtVersit
 include(../../common.pri)
@@ -75,13 +78,13 @@ HEADERS += \
     $$PRIVATE_HEADERS
 
 symbian { 
-    TARGET.UID3 = 0x2002BFBF
+    TARGET.UID3 = $$mobilityUID(0x2002BFBF)
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
 
     LIBS += -lefsrv
 
-    VERSIT_DEPLOYMENT.sources = QtVersit.dll
+    VERSIT_DEPLOYMENT.sources = QtVersit$${QT_LIBINFIX}.dll
     VERSIT_DEPLOYMENT.path = /sys/bin
     DEPLOYMENT += VERSIT_DEPLOYMENT
 }
diff --git a/src/versitorganizer/versitorganizer.pro b/src/versitorganizer/versitorganizer.pro
index ec4b1e237e..a828d9a70c 100644
--- a/src/versitorganizer/versitorganizer.pro
+++ b/src/versitorganizer/versitorganizer.pro
@@ -1,6 +1,9 @@
 # #####################################################################
 # Versit-Organizer Import/Export
 # #####################################################################
+
+include(../../features/utils.pri)
+
 TEMPLATE = lib
 TARGET = QtVersitOrganizer
 include(../../common.pri)
@@ -51,13 +54,13 @@ HEADERS += \
     $$PRIVATE_HEADERS
 
 symbian { 
-    TARGET.UID3 = 0x200315FB
+    TARGET.UID3 = $$mobilityUID(0x200315FB)
     TARGET.EPOCALLOWDLLDATA = 1
     TARGET.CAPABILITY = ALL -TCB
 
     LIBS += -lefsrv
 
-    VERSIT_ORGANIZER_DEPLOYMENT.sources = QtVersitOrganizer.dll
+    VERSIT_ORGANIZER_DEPLOYMENT.sources = QtVersitOrganizer$${QT_LIBINFIX}.dll
     VERSIT_ORGANIZER_DEPLOYMENT.path = /sys/bin
     DEPLOYMENT += VERSIT_ORGANIZER_DEPLOYMENT
 }
diff --git a/tests/auto/multimedia.pro b/tests/auto/multimedia.pro
index d4176dd05c..8c94d37f66 100644
--- a/tests/auto/multimedia.pro
+++ b/tests/auto/multimedia.pro
@@ -50,6 +50,7 @@ SUBDIRS += \
 # doesn't believe it's an untested directory
 # qmultimedia_common
 
+symbian: SUBDIRS += qgraphicsvideoitem_symbian
 
 contains (QT_CONFIG, declarative) {
     SUBDIRS += \
diff --git a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
index 749090e928..b6f3c22a11 100644
--- a/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
+++ b/tests/auto/qgraphicsvideoitem/qgraphicsvideoitem.pro
@@ -6,8 +6,14 @@ SOURCES += tst_qgraphicsvideoitem.cpp
 
 include (../../../common.pri)
 
-symbian: TARGET.CAPABILITY = ReadDeviceData WriteDeviceData
-
+symbian {
+    TARGET.CAPABILITY = ReadDeviceData WriteDeviceData
+    contains(QT_CONFIG, egl) {
+        LIBS *= -llibegl
+    } else {
+        DEFINES += QT_NO_EGL
+    }
+}
 
 CONFIG += mobility
 MOBILITY = multimedia
diff --git a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
index 7a45325fc0..13a069b0f0 100644
--- a/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
+++ b/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
@@ -56,6 +56,10 @@
 #include <QtGui/qgraphicsscene.h>
 #include <QtGui/qgraphicsview.h>
 
+#if defined(Q_OS_SYMBIAN) && !defined(QT_NO_EGL)
+#include <egl/egl.h>
+#endif
+
 QT_USE_NAMESPACE
 class tst_QGraphicsVideoItem : public QObject
 {
@@ -83,6 +87,9 @@ private slots:
     void boundingRect();
 
     void paint();
+
+private:
+    bool m_rendererControlUsed;
 };
 
 Q_DECLARE_METATYPE(const uchar *)
@@ -210,6 +217,14 @@ private:
 void tst_QGraphicsVideoItem::initTestCase()
 {
     qRegisterMetaType<Qt::AspectRatioMode>();
+    m_rendererControlUsed = true;
+#if defined(Q_OS_SYMBIAN) && !defined(QT_NO_EGL)
+    const EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    if (display != EGL_NO_DISPLAY) {
+        if (eglInitialize(display, 0, 0) == EGL_TRUE)
+            m_rendererControlUsed = (eglGetProcAddress("eglCreateEndpointNOK") != 0);
+    }
+#endif
 }
 
 void tst_QGraphicsVideoItem::nullObject()
@@ -265,7 +280,8 @@ void tst_QGraphicsVideoItem::serviceDestroyed()
     QGraphicsVideoItem item;
     object.bind(&item);
 
-    QCOMPARE(object.testService->rendererRef, 1);
+    if (m_rendererControlUsed)
+        QCOMPARE(object.testService->rendererRef, 1);
 
     QtTestVideoService *service = object.testService;
     object.testService = 0;
@@ -283,7 +299,8 @@ void tst_QGraphicsVideoItem::mediaObjectDestroyed()
     QGraphicsVideoItem item;
     object->bind(&item);
 
-    QCOMPARE(object->testService->rendererRef, 1);
+    if (m_rendererControlUsed)
+        QCOMPARE(object->testService->rendererRef, 1);
 
     delete object;
     object = 0;
@@ -300,67 +317,78 @@ void tst_QGraphicsVideoItem::setMediaObject()
     QGraphicsVideoItem item;
 
     QCOMPARE(item.mediaObject(), nullObject);
-    QCOMPARE(object.testService->rendererRef, 0);
+    if (m_rendererControlUsed)
+        QCOMPARE(object.testService->rendererRef, 0);
 
     object.bind(&item);
     QCOMPARE(item.mediaObject(), static_cast<QMediaObject *>(&object));
-    QCOMPARE(object.testService->rendererRef, 1);
-    QVERIFY(object.testService->rendererControl->surface() == 0);
+    if (m_rendererControlUsed) {
+        QCOMPARE(object.testService->rendererRef, 1);
+        QVERIFY(object.testService->rendererControl->surface() == 0);
 
-    {   // Surface setup is deferred until after the first paint.
-        QImage image(320, 240, QImage::Format_RGB32);
-        QPainter painter(&image);
+        {   // Surface setup is deferred until after the first paint.
+            QImage image(320, 240, QImage::Format_RGB32);
+            QPainter painter(&image);
 
-        item.paint(&painter, 0);
+            item.paint(&painter, 0);
+        }
+        QVERIFY(object.testService->rendererControl->surface() != 0);
     }
-    QVERIFY(object.testService->rendererControl->surface() != 0);
 
     object.unbind(&item);
     QCOMPARE(item.mediaObject(), nullObject);
 
-    QCOMPARE(object.testService->rendererRef, 0);
-    QVERIFY(object.testService->rendererControl->surface() == 0);
+    if (m_rendererControlUsed) {
+        QCOMPARE(object.testService->rendererRef, 0);
+        QVERIFY(object.testService->rendererControl->surface() == 0);
+    }
 
     item.setVisible(false);
 
     object.bind(&item);
     QCOMPARE(item.mediaObject(), static_cast<QMediaObject *>(&object));
-    QCOMPARE(object.testService->rendererRef, 1);
-    QVERIFY(object.testService->rendererControl->surface() != 0);
+    if (m_rendererControlUsed) {
+        QCOMPARE(object.testService->rendererRef, 1);
+        QVERIFY(object.testService->rendererControl->surface() != 0);
+    }
 }
 
 void tst_QGraphicsVideoItem::show()
-{    
-    QtTestVideoObject object(new QtTestRendererControl);
-    QtTestGraphicsVideoItem *item = new QtTestGraphicsVideoItem;
-    object.bind(item);
+{
+    if (!m_rendererControlUsed) {
+        QSKIP("QGraphicsVideoItem does not use QVideoRendererControl", SkipAll);
+    } else {
+        QtTestVideoObject object(new QtTestRendererControl);
+        QtTestGraphicsVideoItem *item = new QtTestGraphicsVideoItem;
+        object.bind(item);
 
-    // Graphics items are visible by default
-    QCOMPARE(object.testService->rendererRef, 1);
-    QVERIFY(object.testService->rendererControl->surface() == 0);
+        // Graphics items are visible by default
+        QCOMPARE(object.testService->rendererRef, 1);
+        QVERIFY(object.testService->rendererControl->surface() == 0);
 
-    item->hide();
-    QCOMPARE(object.testService->rendererRef, 1);
+        item->hide();
+        QCOMPARE(object.testService->rendererRef, 1);
 
-    item->show();
-    QCOMPARE(object.testService->rendererRef, 1);
-    QVERIFY(object.testService->rendererControl->surface() == 0);
+        item->show();
+        QCOMPARE(object.testService->rendererRef, 1);
+        QVERIFY(object.testService->rendererControl->surface() == 0);
 
-    QGraphicsScene graphicsScene;
-    graphicsScene.addItem(item);
-    QGraphicsView graphicsView(&graphicsScene);
-    graphicsView.show();
+        QGraphicsScene graphicsScene;
+        graphicsScene.addItem(item);
+        QGraphicsView graphicsView(&graphicsScene);
+        graphicsView.show();
 
-    QVERIFY(item->paintCount() || item->waitForPaint(1));
-    QVERIFY(object.testService->rendererControl->surface() != 0);
+        QVERIFY(item->paintCount() || item->waitForPaint(1));
+        QVERIFY(object.testService->rendererControl->surface() != 0);
 
-    QVERIFY(item->boundingRect().isEmpty());
+        QVERIFY(item->boundingRect().isEmpty());
 
-    QVideoSurfaceFormat format(QSize(320,240),QVideoFrame::Format_RGB32);
-    QVERIFY(object.testService->rendererControl->surface()->start(format));
+        QVideoSurfaceFormat format(QSize(320,240),QVideoFrame::Format_RGB32);
+        QVERIFY(object.testService->rendererControl->surface()->start(format));
 
-    QCoreApplication::processEvents();
-    QVERIFY(!item->boundingRect().isEmpty());
+        QCoreApplication::processEvents();
+        QVERIFY(!item->boundingRect().isEmpty());
+    }
 }
 
 void tst_QGraphicsVideoItem::aspectRatioMode()
@@ -459,32 +487,34 @@ void tst_QGraphicsVideoItem::nativeSize()
 
     QCOMPARE(item.nativeSize(), QSizeF());
 
-    QSignalSpy spy(&item, SIGNAL(nativeSizeChanged(QSizeF)));
+    if (m_rendererControlUsed) {
+        QSignalSpy spy(&item, SIGNAL(nativeSizeChanged(QSizeF)));
 
-    QVideoSurfaceFormat format(frameSize, QVideoFrame::Format_ARGB32);
-    format.setViewport(viewport);
-    format.setPixelAspectRatio(pixelAspectRatio);
+        QVideoSurfaceFormat format(frameSize, QVideoFrame::Format_ARGB32);
+        format.setViewport(viewport);
+        format.setPixelAspectRatio(pixelAspectRatio);
 
-    {   // Surface setup is deferred until after the first paint.
-        QImage image(320, 240, QImage::Format_RGB32);
-        QPainter painter(&image);
+        {   // Surface setup is deferred until after the first paint.
+            QImage image(320, 240, QImage::Format_RGB32);
+            QPainter painter(&image);
 
-        item.paint(&painter, 0);
-    }
-    QVERIFY(object.testService->rendererControl->surface() != 0);
-    QVERIFY(object.testService->rendererControl->surface()->start(format));
+            item.paint(&painter, 0);
+        }
+        QVERIFY(object.testService->rendererControl->surface() != 0);
+        QVERIFY(object.testService->rendererControl->surface()->start(format));
 
-    QCoreApplication::processEvents();
-    QCOMPARE(item.nativeSize(), nativeSize);
-    QCOMPARE(spy.count(), 1);
-    QCOMPARE(spy.last().first().toSizeF(), nativeSize);
+        QCoreApplication::processEvents();
+        QCOMPARE(item.nativeSize(), nativeSize);
+        QCOMPARE(spy.count(), 1);
+        QCOMPARE(spy.last().first().toSizeF(), nativeSize);
 
-    object.testService->rendererControl->surface()->stop();
+        object.testService->rendererControl->surface()->stop();
 
-    QCoreApplication::processEvents();
-    QVERIFY(item.nativeSize().isEmpty());
-    QCOMPARE(spy.count(), 2);
-    QVERIFY(spy.last().first().toSizeF().isEmpty());
+        QCoreApplication::processEvents();
+        QVERIFY(item.nativeSize().isEmpty());
+        QCOMPARE(spy.count(), 2);
+        QVERIFY(spy.last().first().toSizeF().isEmpty());
+    }
 }
 
 void tst_QGraphicsVideoItem::boundingRect_data()
@@ -590,33 +620,37 @@ void tst_QGraphicsVideoItem::boundingRect_data()
 
 void tst_QGraphicsVideoItem::boundingRect()
 {
-    QFETCH(QSize, frameSize);
-    QFETCH(QPointF, offset);
-    QFETCH(QSizeF, size);
-    QFETCH(Qt::AspectRatioMode, aspectRatioMode);
-    QFETCH(QRectF, expectedRect);
-
-    QtTestVideoObject object(new QtTestRendererControl);
-    QGraphicsVideoItem item;
-    object.bind(&item);
-
-    item.setOffset(offset);
-    item.setSize(size);
-    item.setAspectRatioMode(aspectRatioMode);
-
-    QVideoSurfaceFormat format(frameSize, QVideoFrame::Format_ARGB32);
-
-    {   // Surface setup is deferred until after the first paint.
-        QImage image(320, 240, QImage::Format_RGB32);
-        QPainter painter(&image);
+    if (!m_rendererControlUsed) {
+        QSKIP("QGraphicsVideoItem does not use QVideoRendererControl", SkipAll);
+    } else {
+        QFETCH(QSize, frameSize);
+        QFETCH(QPointF, offset);
+        QFETCH(QSizeF, size);
+        QFETCH(Qt::AspectRatioMode, aspectRatioMode);
+        QFETCH(QRectF, expectedRect);
+
+        QtTestVideoObject object(new QtTestRendererControl);
+        QGraphicsVideoItem item;
+        object.bind(&item);
+
+        item.setOffset(offset);
+        item.setSize(size);
+        item.setAspectRatioMode(aspectRatioMode);
+
+        QVideoSurfaceFormat format(frameSize, QVideoFrame::Format_ARGB32);
+
+        {   // Surface setup is deferred until after the first paint.
+            QImage image(320, 240, QImage::Format_RGB32);
+            QPainter painter(&image);
+
+            item.paint(&painter, 0);
+        }
+        QVERIFY(object.testService->rendererControl->surface() != 0);
+        QVERIFY(object.testService->rendererControl->surface()->start(format));
 
-        item.paint(&painter, 0);
+        QCoreApplication::processEvents();
+        QCOMPARE(item.boundingRect(), expectedRect);
     }
-    QVERIFY(object.testService->rendererControl->surface() != 0);
-    QVERIFY(object.testService->rendererControl->surface()->start(format));
-
-    QCoreApplication::processEvents();
-    QCOMPARE(item.boundingRect(), expectedRect);
 }
 
 static const uchar rgb32ImageData[] =
@@ -627,48 +661,51 @@ static const uchar rgb32ImageData[] =
 
 void tst_QGraphicsVideoItem::paint()
 {
-    QtTestVideoObject object(new QtTestRendererControl);
-    QtTestGraphicsVideoItem *item = new QtTestGraphicsVideoItem;
-    object.bind(item);
-    
-    QGraphicsScene graphicsScene;
-    graphicsScene.addItem(item);
-    QGraphicsView graphicsView(&graphicsScene);
-    graphicsView.show();
-    QVERIFY(item->waitForPaint(1));
+    if (!m_rendererControlUsed) {
+        QSKIP("QGraphicsVideoItem does not use QVideoRendererControl", SkipAll);
+    } else {
+        QtTestVideoObject object(new QtTestRendererControl);
+        QtTestGraphicsVideoItem *item = new QtTestGraphicsVideoItem;
+        object.bind(item);
 
-    QPainterVideoSurface *surface = qobject_cast<QPainterVideoSurface *>(
-            object.testService->rendererControl->surface());
-    if (!surface)
-        QSKIP("QGraphicsVideoItem is not QPainterVideoSurface based", SkipAll);
+        QGraphicsScene graphicsScene;
+        graphicsScene.addItem(item);
+        QGraphicsView graphicsView(&graphicsScene);
+        graphicsView.show();
+        QVERIFY(item->waitForPaint(1));
 
-    QVideoSurfaceFormat format(QSize(2, 2), QVideoFrame::Format_RGB32);
+        QPainterVideoSurface *surface = qobject_cast<QPainterVideoSurface *>(
+                object.testService->rendererControl->surface());
+        if (!surface)
+            QSKIP("QGraphicsVideoItem is not QPainterVideoSurface based", SkipAll);
 
-    QVERIFY(surface->start(format));
-    QCOMPARE(surface->isActive(), true);
-    QCOMPARE(surface->isReady(), true);
+        QVideoSurfaceFormat format(QSize(2, 2), QVideoFrame::Format_RGB32);
 
-    QVERIFY(item->waitForPaint(1));
+        QVERIFY(surface->start(format));
+        QCOMPARE(surface->isActive(), true);
+        QCOMPARE(surface->isReady(), true);
 
-    QCOMPARE(surface->isActive(), true);
-    QCOMPARE(surface->isReady(), true);
+        QVERIFY(item->waitForPaint(1));
 
-    QVideoFrame frame(sizeof(rgb32ImageData), QSize(2, 2), 8, QVideoFrame::Format_RGB32);
+        QCOMPARE(surface->isActive(), true);
+        QCOMPARE(surface->isReady(), true);
 
-    frame.map(QAbstractVideoBuffer::WriteOnly);
-    memcpy(frame.bits(), rgb32ImageData, frame.mappedBytes());
-    frame.unmap();
+        QVideoFrame frame(sizeof(rgb32ImageData), QSize(2, 2), 8, QVideoFrame::Format_RGB32);
 
-    QVERIFY(surface->present(frame));
-    QCOMPARE(surface->isActive(), true);
-    QCOMPARE(surface->isReady(), false);
+        frame.map(QAbstractVideoBuffer::WriteOnly);
+        memcpy(frame.bits(), rgb32ImageData, frame.mappedBytes());
+        frame.unmap();
 
-    QVERIFY(item->waitForPaint(1));
+        QVERIFY(surface->present(frame));
+        QCOMPARE(surface->isActive(), true);
+        QCOMPARE(surface->isReady(), false);
 
-    QCOMPARE(surface->isActive(), true);
-    QCOMPARE(surface->isReady(), true);
-}
+        QVERIFY(item->waitForPaint(1));
 
+        QCOMPARE(surface->isActive(), true);
+        QCOMPARE(surface->isReady(), true);
+    }
+}
 
 QTEST_MAIN(tst_QGraphicsVideoItem)
 
diff --git a/tests/auto/qgraphicsvideoitem_symbian/qgraphicsvideoitem_symbian.pro b/tests/auto/qgraphicsvideoitem_symbian/qgraphicsvideoitem_symbian.pro
new file mode 100644
index 0000000000..04d1ba072d
--- /dev/null
+++ b/tests/auto/qgraphicsvideoitem_symbian/qgraphicsvideoitem_symbian.pro
@@ -0,0 +1,14 @@
+!symbian: error("This test should only be built on Symbian")
+TARGET = tst_qgraphicsvideoitem_symbian
+CONFIG += testcase mobility
+MOBILITY = multimedia
+INCLUDEPATH += ../../../src/multimedia
+SOURCES += tst_qgraphicsvideoitem_symbian.cpp
+LIBS += -lcone -lavkon
+contains(QT_CONFIG, egl) {
+    LIBS *= -llibegl
+} else {
+    DEFINES += QT_NO_EGL
+}
+include (../../../common.pri)
+
diff --git a/tests/auto/qgraphicsvideoitem_symbian/tst_qgraphicsvideoitem_symbian.cpp b/tests/auto/qgraphicsvideoitem_symbian/tst_qgraphicsvideoitem_symbian.cpp
new file mode 100644
index 0000000000..d9f592a9e3
--- /dev/null
+++ b/tests/auto/qgraphicsvideoitem_symbian/tst_qgraphicsvideoitem_symbian.cpp
@@ -0,0 +1,392 @@
+/****************************************************************************
+**
+** 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 Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "qgraphicsvideoitem.h"
+#include "qmediaplayer.h"
+
+#include <QtCore/QFile>
+#include <QtGui/QApplication>
+#include <QtGui/QDesktopWidget>
+#include <QtGui/QGraphicsScene>
+#include <QtGui/QGraphicsView>
+#include <QtGui/QPaintEngine>
+#include <QtTest/QtTest>
+
+#include <eikenv.h>
+#include <eikappui.h>
+#include <aknenv.h>
+#include <aknappui.h>
+
+#ifndef QT_NO_EGL
+#include <egl/egl.h>
+#endif
+
+QT_USE_NAMESPACE
+
+static const QString FileName = "e:/test.mp4";
+
+class QtTestGraphicsView;
+class QtTestGraphicsVideoItem;
+
+enum PreferredRenderingPath
+{
+    PreferredRenderingPathAuto,
+    PreferredRenderingPathRenderer,
+    PreferredRenderingPathDirect
+};
+
+enum ActualRenderingPath
+{
+    ActualRenderingPathNone,
+    ActualRenderingPathRenderer = PreferredRenderingPathRenderer,
+    ActualRenderingPathDirect = PreferredRenderingPathDirect
+};
+
+Q_DECLARE_METATYPE(PreferredRenderingPath)
+Q_DECLARE_METATYPE(ActualRenderingPath)
+
+#define WAIT_FOR_CONDITION(condition, ms) \
+{ \
+    Q_ASSERT(QCoreApplication::instance()); \
+    QElapsedTimer timer; \
+    timer.start(); \
+    do { \
+        QCoreApplication::processEvents(QEventLoop::AllEvents, ms); \
+        QTest::qSleep(10); \
+    } while (!(condition) && (timer.elapsed() < ms)); \
+}
+
+#define CHECKED_WAIT_FOR_CONDITION(condition, ms) \
+    WAIT_FOR_CONDITION(condition, ms); \
+    QVERIFY(condition);
+
+class tst_QGraphicsVideoItemSymbian : public QObject
+{
+    Q_OBJECT
+public slots:
+    void initTestCase();
+    void init();
+    void cleanup();
+
+    void play();
+    void mediaPlayerError(QMediaPlayer::Error error);
+    void resetInactivityTime();
+
+private:
+    void lockOrientation();
+    void disableScreenSaver();
+    void setPreferredRenderingPath(PreferredRenderingPath path);
+    void setFullScreen(bool enabled);
+
+    ActualRenderingPath actualRenderingPath() const;
+
+private slots:
+    void specifyPreferredRenderingPath();
+    void specifyPreferredRenderingPath_data();
+    void autoFullScreenIn();
+    void autoFullScreenOut();
+
+private:
+    QMediaPlayer *m_mediaPlayer;
+    QtTestGraphicsView *m_view;
+    QGraphicsScene *m_scene;
+    QtTestGraphicsVideoItem *m_videoItem;
+    bool m_eglEndpointSupport;
+};
+
+class QtTestGraphicsView : public QGraphicsView
+{
+public:
+    QtTestGraphicsView(QWidget *parent = 0)
+    :    QGraphicsView(parent)
+    ,    m_paintEngineType(QPaintEngine::MaxUser)
+    {
+
+    }
+
+    void drawBackground(QPainter *painter, const QRectF &rect)
+    {
+        m_paintEngineType = painter->paintEngine()->type();
+        QGraphicsView::drawBackground(painter, rect);
+    }
+
+    QPaintEngine::Type paintEngineType() const
+    {
+        return m_paintEngineType;
+    }
+
+private:
+    QPaintEngine::Type m_paintEngineType;
+};
+
+class QtTestGraphicsVideoItem : public QGraphicsVideoItem
+{
+public:
+    QtTestGraphicsVideoItem(QGraphicsItem *parent = 0)
+    :   QGraphicsVideoItem(parent)
+    ,   m_prevPaintCount(0)
+    ,   m_paintCount(0)
+    {
+
+    }
+
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+    {
+        ++m_paintCount;
+        QTestEventLoop::instance().exitLoop();
+        QGraphicsVideoItem::paint(painter, option, widget);
+    }
+
+    void savePaintCount()
+    {
+        m_prevPaintCount = m_paintCount;
+    }
+
+    void waitForPaint(bool save = false)
+    {
+        if (save)
+            savePaintCount();
+        static const int required = 2;
+        static const int secs = 5;
+        CHECKED_WAIT_FOR_CONDITION(m_paintCount >= m_prevPaintCount + required, secs * 1000);
+        m_prevPaintCount = m_paintCount;
+    }
+
+    int paintCount() const { return m_paintCount; }
+
+private:
+    int m_prevPaintCount;
+    int m_paintCount;
+};
+
+void tst_QGraphicsVideoItemSymbian::initTestCase()
+{
+    lockOrientation();
+    disableScreenSaver();
+    m_mediaPlayer = 0;
+    m_view = 0;
+    m_scene = 0;
+    m_videoItem = 0;
+    m_eglEndpointSupport = false;
+#ifndef QT_NO_EGL
+    const EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    if (display != EGL_NO_DISPLAY) {
+        if (eglInitialize(display, 0, 0) == EGL_TRUE)
+            m_eglEndpointSupport = (eglGetProcAddress("eglCreateEndpointNOK") != 0);
+    }
+#endif
+    qRegisterMetaType<PreferredRenderingPath>();
+    qRegisterMetaType<ActualRenderingPath>();
+}
+
+void tst_QGraphicsVideoItemSymbian::init()
+{
+    // Framework does not automatically call cleanup() if previous case skipped
+    cleanup();
+    if (QFile::exists(FileName)) {
+        QVERIFY(!m_mediaPlayer);
+        QVERIFY(!m_view);
+        QVERIFY(!m_scene);
+        QVERIFY(!m_videoItem);
+        m_mediaPlayer = new QMediaPlayer();
+        connect(m_mediaPlayer, SIGNAL(error(QMediaPlayer::Error)),
+                this, SLOT(mediaPlayerError(QMediaPlayer::Error)));
+        m_view = new QtTestGraphicsView();
+        m_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        m_view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        m_scene = new QGraphicsScene();
+        m_videoItem = new QtTestGraphicsVideoItem();
+        m_videoItem->setSize(QSizeF(200, 200));
+        m_view->setScene(m_scene);
+        m_view->setBackgroundBrush(Qt::blue);
+        m_view->showFullScreen();
+        QTest::qWaitForWindowShown(m_view);
+        const QPaintEngine::Type type = m_view->paintEngineType();
+        if (QPaintEngine::OpenGL != type && QPaintEngine::OpenVG != type)
+            QSKIP(QString("Test case is only valid when using opengl or openvg graphics system (paint engine type %1)").arg(type).toAscii(), SkipAll);
+    } else {
+        QSKIP(QString("Test file %1 not found").arg(FileName).toAscii(), SkipAll);
+    }
+}
+
+void tst_QGraphicsVideoItemSymbian::cleanup()
+{
+    delete m_videoItem;
+    m_videoItem = 0;
+    delete m_scene;
+    m_scene = 0;
+    delete m_view;
+    m_view = 0;
+    delete m_mediaPlayer;
+    m_mediaPlayer = 0;
+}
+
+void tst_QGraphicsVideoItemSymbian::play()
+{
+    m_mediaPlayer->setMedia(QUrl::fromLocalFile(FileName));
+    m_mediaPlayer->setVideoOutput(m_videoItem);
+    m_scene->addItem(m_videoItem);
+    m_view->centerOn(m_videoItem);
+    m_mediaPlayer->play();
+    CHECKED_WAIT_FOR_CONDITION(QMediaPlayer::BufferedMedia == m_mediaPlayer->mediaStatus(), 3000);
+}
+
+void tst_QGraphicsVideoItemSymbian::mediaPlayerError(QMediaPlayer::Error error)
+{
+    QVERIFY(QMediaPlayer::NoError == error);
+}
+
+void tst_QGraphicsVideoItemSymbian::setPreferredRenderingPath(PreferredRenderingPath path)
+{
+    static const QString property = "_q_preferredVideoRenderingPath";
+    QString value;
+    switch (path) {
+    case PreferredRenderingPathAuto:
+        value = "auto";
+        break;
+    case PreferredRenderingPathRenderer:
+        value = "renderer";
+        break;
+    case PreferredRenderingPathDirect:
+        value = "direct";
+        break;
+    }
+    m_videoItem->setProperty(property.toAscii(), value);
+}
+
+void tst_QGraphicsVideoItemSymbian::setFullScreen(bool enabled)
+{
+    const QSizeF size = enabled ? QApplication::desktop()->size() : QSizeF(200, 200);
+    m_videoItem->setSize(size);
+    const Qt::AspectRatioMode mode = enabled ? Qt::IgnoreAspectRatio : Qt::KeepAspectRatio;
+    m_videoItem->setAspectRatioMode(mode);
+}
+
+ActualRenderingPath tst_QGraphicsVideoItemSymbian::actualRenderingPath() const
+{
+    ActualRenderingPath path = ActualRenderingPathNone;
+    static const QString property = "_q_currentVideoRenderingPath";
+    const QString value = m_videoItem->property(property.toAscii()).value<QString>();
+    if ("direct" == value)
+        path = ActualRenderingPathDirect;
+    else if ("renderer" == value)
+        path = ActualRenderingPathRenderer;
+    return path;
+}
+
+void tst_QGraphicsVideoItemSymbian::lockOrientation()
+{
+    CAknAppUi* appUi = dynamic_cast<CAknAppUi*>(CEikonEnv::Static()->AppUi());
+    QVERIFY(appUi);
+    TRAPD(err, appUi->SetOrientationL(CAknAppUi::EAppUiOrientationLandscape));
+    QVERIFY(!err);
+}
+
+void tst_QGraphicsVideoItemSymbian::disableScreenSaver()
+{
+    QTimer *timer = new QTimer(this);
+    connect(timer, SIGNAL(timeout()), this, SLOT(resetInactivityTime()));
+    timer->start(100);
+    resetInactivityTime();
+}
+
+void tst_QGraphicsVideoItemSymbian::resetInactivityTime()
+{
+    User::ResetInactivityTime();
+}
+
+void tst_QGraphicsVideoItemSymbian::specifyPreferredRenderingPath()
+{
+    QFETCH(PreferredRenderingPath, preferredRenderingPath);
+    QFETCH(ActualRenderingPath, actualRenderingPath);
+    setPreferredRenderingPath(preferredRenderingPath);
+    play();
+    QVERIFY(this->actualRenderingPath() == actualRenderingPath);
+}
+
+void tst_QGraphicsVideoItemSymbian::specifyPreferredRenderingPath_data()
+{
+    QTest::addColumn<PreferredRenderingPath>("preferredRenderingPath");
+    QTest::addColumn<ActualRenderingPath>("actualRenderingPath");
+        QTest::newRow("direct") << PreferredRenderingPathDirect
+                                << ActualRenderingPathDirect;
+    if (m_eglEndpointSupport)
+        QTest::newRow("renderer") << PreferredRenderingPathRenderer
+                                  << ActualRenderingPathRenderer;
+    else
+        QTest::newRow("renderer") << PreferredRenderingPathRenderer
+                                  << ActualRenderingPathDirect;
+}
+
+void tst_QGraphicsVideoItemSymbian::autoFullScreenIn()
+{
+    setPreferredRenderingPath(PreferredRenderingPathAuto);
+    play();
+    if (m_eglEndpointSupport)
+        QVERIFY(actualRenderingPath() == ActualRenderingPathRenderer);
+    else
+        QVERIFY(actualRenderingPath() == ActualRenderingPathDirect);
+    m_videoItem->savePaintCount();
+    setFullScreen(true);
+    m_videoItem->waitForPaint();
+    QVERIFY(actualRenderingPath() == ActualRenderingPathDirect);
+}
+
+void tst_QGraphicsVideoItemSymbian::autoFullScreenOut()
+{
+    setPreferredRenderingPath(PreferredRenderingPathAuto);
+    play();
+    setFullScreen(true);
+    m_videoItem->waitForPaint();
+    QVERIFY(actualRenderingPath() == ActualRenderingPathDirect);
+    m_videoItem->savePaintCount();
+    setFullScreen(false);
+    m_videoItem->waitForPaint();
+    if (m_eglEndpointSupport)
+        QVERIFY(actualRenderingPath() == ActualRenderingPathRenderer);
+    else
+        QVERIFY(actualRenderingPath() == ActualRenderingPathDirect);
+}
+
+QTEST_MAIN(tst_QGraphicsVideoItemSymbian)
+
+#include "tst_qgraphicsvideoitem_symbian.moc"
+
diff --git a/tests/auto/qmessageservice/tst_qmessageservice.cpp b/tests/auto/qmessageservice/tst_qmessageservice.cpp
index 20f0192d53..f3e7117d20 100644
--- a/tests/auto/qmessageservice/tst_qmessageservice.cpp
+++ b/tests/auto/qmessageservice/tst_qmessageservice.cpp
@@ -173,12 +173,13 @@ private slots:
     void initTestCase();
     void cleanupTestCase();
 
+/* temporarily disabled to get continuous integration working again
     void testQueryMessages();
     void testQueryMessages_data();
 
     void testCountMessages();
     void testCountMessages_data();
-
+*/
     void testSend();
 
     void testCompose();
@@ -504,6 +505,7 @@ void tst_QMessageService::cleanupTestCase()
 {
 }
 
+/* temporarily disabled to get continuous integration working again
 void tst_QMessageService::testQueryMessages()
 {
     QFETCH(QMessageFilter, filter);
@@ -573,6 +575,7 @@ void tst_QMessageService::testQueryMessages()
         QSKIP("Unsupported for this configuration", SkipSingle);
     }
 }
+*/
 
 void tst_QMessageService::testQueryCountData()
 {
@@ -2068,11 +2071,13 @@ void tst_QMessageService::testQueryCountData()
 #endif
 }
 
+/* temporarily disabled to get continuous integration working again
 void tst_QMessageService::testQueryMessages_data()
 {
     testQueryCountData();
 }
 
+
 void tst_QMessageService::testCountMessages()
 {
     QFETCH(QMessageFilter, filter);
@@ -2121,7 +2126,7 @@ void tst_QMessageService::testCountMessages_data()
 {
     testQueryCountData();
 }
-
+*/
 void tst_QMessageService::testSend()
 {
     QMessage testMessage;
diff --git a/tests/auto/qmessagestore/tst_qmessagestore.cpp b/tests/auto/qmessagestore/tst_qmessagestore.cpp
index 56c5e35daf..e3fc06a4f4 100644
--- a/tests/auto/qmessagestore/tst_qmessagestore.cpp
+++ b/tests/auto/qmessagestore/tst_qmessagestore.cpp
@@ -162,8 +162,10 @@ private slots:
 
     void testRemoveAccount();
 
+/* temporarily disabled to get continuous integration working again
     void testMessage_data();
     void testMessage();
+*/
 
 private:
     QMessageManager *manager;
@@ -385,6 +387,7 @@ Q_DECLARE_METATYPE(QList<int>)
 typedef QMap<QString, QString> CustomFieldMap;
 Q_DECLARE_METATYPE(CustomFieldMap)
 
+/* temporarily disabled to get continuous integration working again
 void tst_QMessageStore::testMessage_data()
 {
     QTest::addColumn<QString>("to");
@@ -547,6 +550,7 @@ void tst_QMessageStore::testMessage_data()
         << customData
         << "byFilter";
 }
+*/
 
 void tst_QMessageStore::testRemoveAccount()
 {
@@ -570,6 +574,7 @@ void tst_QMessageStore::testRemoveAccount()
 #endif
 }
 
+/* temporarily disabled to get continuous integration working again
 void tst_QMessageStore::testMessage()
 {
     // Ensure we have an account to create messages with
@@ -1037,4 +1042,5 @@ void tst_QMessageStore::testMessage()
 #endif
 #endif    
 }
+*/
 
diff --git a/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp b/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
index 184fb8e130..e95290d93c 100644
--- a/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
+++ b/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
@@ -96,11 +96,13 @@ private slots:
     void testFolderOrdering_data();
     void testFolderOrdering();
 
+/* temporarily disabled to get continuous integration working again
     void testMessageFilter_data();
     void testMessageFilter();
 
     void testMessageOrdering_data();
     void testMessageOrdering();
+*/
 
 private:
     QSet<QMessageAccountId> existingAccountIds;
@@ -1779,6 +1781,7 @@ void tst_QMessageStoreKeys::testFolderOrdering()
     }
 }
 
+/* temporarily disabled to get continuous integration working again
 void tst_QMessageStoreKeys::testMessageFilter_data()
 {
     QTest::addColumn<QMessageFilter>("filter");
@@ -3256,7 +3259,7 @@ void tst_QMessageStoreKeys::testMessageFilter_data()
        In Maemo6 QMF does not support case sensitive search.
        So if called x.setMatchFlags(QMessageDataComparator::MatchCaseSensitive)
        query returns empty list and set error to QMessageManager::NotYetImplemented
-     */
+     * /
 #if !defined(Q_WS_MAEMO_6)
     caseSensitive2.setMatchFlags(QMessageDataComparator::MatchCaseSensitive);
 #endif
@@ -3764,4 +3767,5 @@ void tst_QMessageStoreKeys::testMessageOrdering()
         QSKIP("Unsupported for this configuration", SkipSingle);
     }
 }
+*/
 
diff --git a/tests/manual/sfwtestclient/main.cpp b/tests/manual/sfwtestclient/main.cpp
new file mode 100644
index 0000000000..0cd4f44ad3
--- /dev/null
+++ b/tests/manual/sfwtestclient/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include "sfwtestclient.h"
+
+#include <QtGui>
+#include <QApplication>
+
+/*
+ * This is the test client application for Service Framework which invokes
+ * Out Of Process service. This provides following two options in the UI
+ * 1. Add Service: This allows the user to add a service which is sfwtest
+ * OOP service
+ * 2. Invoke: This loads the OOP service and then Invokes the remote method
+ * provided by sfwtest service.
+ * 
+ */
+
+int main(int argc, char *argv[])
+{
+    QApplication a(argc, argv);
+    sfwtestclient w;
+    w.showMaximized();
+    return a.exec();
+}
diff --git a/tests/manual/sfwtestclient/sfwtestclient.cpp b/tests/manual/sfwtestclient/sfwtestclient.cpp
new file mode 100644
index 0000000000..98a587c0b4
--- /dev/null
+++ b/tests/manual/sfwtestclient/sfwtestclient.cpp
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <QServiceManager>
+#include <QFile>
+#include <QFileInfo>
+
+#include "sfwtestclient.h"
+
+QTM_USE_NAMESPACE
+
+//This is the service XML which will be imported to this path by sfwtest service.
+const QString sfwtestservicefile = "/resource/apps/xmldata/sfwtestservice.xml";
+
+sfwtestclient::sfwtestclient(QWidget *parent)
+    : QMainWindow(parent)
+{
+	ui.setupUi(this);
+	
+    QObject::connect(ui.addServiceButton, SIGNAL(clicked()),
+                     this, SLOT(addServiceButtonClicked()));
+
+    QObject::connect(ui.invokeButton, SIGNAL(clicked()),
+                     this, SLOT(invokeButtonClicked()));
+
+}
+
+sfwtestclient::~sfwtestclient()
+{
+
+}
+/*
+ * This is a slot for Add Service Button, it adds the OOP sfwtest service.
+ */
+void sfwtestclient::addServiceButtonClicked()
+{
+    ui.textEditBox->clear();
+    
+    QFileInfo fileInfo(sfwtestservicefile);
+    QString filePath = fileInfo.absoluteFilePath();
+    QServiceManager serviceManager;
+    if (QFile::exists(filePath)) {
+        if (serviceManager.addService(filePath)) {
+            ui.textEditBox->setText("Add Service: Success\n");
+        }
+        else {
+            ui.textEditBox->setText("Add Service: Service Exists Already\n");
+        }
+    }
+    else {
+        ui.textEditBox->setText("Removing Service\n");
+        serviceManager.removeService("SfwTestService\n");
+    }
+
+}
+
+/*
+ * This is the slot for Invoke Button, which loads the OOP service
+ * and then invokes the Remote Method provided by the service.
+ */
+void sfwtestclient::invokeButtonClicked()
+{
+    ui.textEditBox->clear();
+    
+    QServiceManager serviceManager;
+    QServiceFilter serviceFilter;
+    serviceFilter.setServiceName("SfwTestService");
+    serviceFilter.setInterface("com.nokia.qt.SfwTest");
+    
+    QList<QServiceInterfaceDescriptor> interfaceList;
+    interfaceList = serviceManager.findInterfaces(serviceFilter);
+    
+    if(!interfaceList.count()) {
+        ui.textEditBox->setText("No Interfaces Found\n");
+        return;
+    }
+    
+    if(interfaceList.count() > 1) {
+        ui.textEditBox->setText("Multiple Interfaces Found\n");
+        return;
+    }
+    ui.textEditBox->setText("Loading Interface...\n");
+    
+    QObject *sfwTestService = NULL;
+
+    sfwTestService = serviceManager.loadInterface(interfaceList.at(0));
+
+    if (sfwTestService) {
+        ui.textEditBox->setText("Loading Interface: Success\n");
+        ui.textEditBox->setText("Invoking Interface Method: getServiceCount...\n");
+        int result = 0;
+        
+        QMetaObject::invokeMethod(sfwTestService, "getServiceCount", Q_RETURN_ARG(int, result));
+    
+        if (!result) {
+            ui.textEditBox->setText("Invoke Interface Method getServiceCount: No Services Found\n");
+        }
+        else {
+            QString fmtString;
+            ui.textEditBox->setText(fmtString.sprintf("Invoke Interface Method getServiceCount: Found %d Services\n",result));
+        }
+        delete sfwTestService;
+        sfwTestService = NULL;
+
+    }
+    else {
+        ui.textEditBox->setText("Loading Interface: Failed\n");
+    }
+
+}
+
+
diff --git a/tests/manual/sfwtestclient/sfwtestclient.h b/tests/manual/sfwtestclient/sfwtestclient.h
new file mode 100644
index 0000000000..91702eb9e0
--- /dev/null
+++ b/tests/manual/sfwtestclient/sfwtestclient.h
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef SFWTESTCLIENT_H
+#define SFWTESTCLIENT_H
+
+#include <QtGui/QMainWindow>
+#include "ui_sfwtestclient.h"
+
+/*
+ * This is the class which has the UI for
+ * Service Framework Test client.
+ * 
+ */
+class sfwtestclient : public QMainWindow
+{
+    Q_OBJECT
+
+public:
+	sfwtestclient(QWidget *parent = 0);
+    ~sfwtestclient();
+    
+public slots:
+    void addServiceButtonClicked();
+    void invokeButtonClicked();
+
+
+private:
+    Ui::SfwTestClient ui;
+};
+
+#endif // SFWTESTCLIENT_H
diff --git a/tests/manual/sfwtestclient/sfwtestclient.pro b/tests/manual/sfwtestclient/sfwtestclient.pro
new file mode 100644
index 0000000000..67c13fadee
--- /dev/null
+++ b/tests/manual/sfwtestclient/sfwtestclient.pro
@@ -0,0 +1,19 @@
+TEMPLATE = app
+TARGET = sfwtestclient 
+
+QT        += core \
+    gui 
+
+CONFIG += mobility
+MOBILITY = serviceframework
+
+HEADERS   += sfwtestclient.h
+SOURCES   += main.cpp \
+    sfwtestclient.cpp
+FORMS	  += sfwtestclient.ui
+
+symbian: {
+	TARGET.UID3 = 0xe0d26e2c 
+}
+
+
diff --git a/tests/manual/sfwtestclient/sfwtestclient.ui b/tests/manual/sfwtestclient/sfwtestclient.ui
new file mode 100644
index 0000000000..2e7b55a665
--- /dev/null
+++ b/tests/manual/sfwtestclient/sfwtestclient.ui
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SfwTestClient</class>
+ <widget class="QMainWindow" name="SfwTestClient">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>340</height>
+   </rect>
+  </property>
+  <property name="contextMenuPolicy">
+   <enum>Qt::ActionsContextMenu</enum>
+  </property>
+  <property name="windowTitle">
+   <string>SfwTestClient</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QLabel" name="titleLabel">
+      <property name="font">
+       <font>
+        <pointsize>17</pointsize>
+       </font>
+      </property>
+      <property name="styleSheet">
+       <string notr="true"/>
+      </property>
+      <property name="text">
+       <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:12pt; font-weight:300; font-style:normal;&quot;&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;SFW TEST CLIENT&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QTextEdit" name="textEditBox">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <property name="readOnly">
+       <bool>true</bool>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <item>
+       <widget class="QPushButton" name="addServiceButton">
+        <property name="text">
+         <string>Add Service</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QPushButton" name="invokeButton">
+        <property name="text">
+         <string>Invoke</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tests/manual/sfwtestservice/main.cpp b/tests/manual/sfwtestservice/main.cpp
new file mode 100644
index 0000000000..d69a587567
--- /dev/null
+++ b/tests/manual/sfwtestservice/main.cpp
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <QCoreApplication>
+#include <QRemoteServiceRegister>
+#include <QServiceManager>
+
+#include "sfwtestservice.h"
+
+QTM_USE_NAMESPACE
+
+/*
+ * This is a test service which provides an interface for testing
+ * the OOP service mechanism provided by Qt Mobility Service Framework.
+ * This main function of sfwtest service publishes
+ * its entires/services.
+ */
+int main(int argc, char *argv[])
+{
+    QCoreApplication a(argc, argv);
+	
+    QRemoteServiceRegister *serviceRegisterSfwTest = new QRemoteServiceRegister();
+    QRemoteServiceRegister::Entry serviceUriHandler = serviceRegisterSfwTest->createEntry<
+        SfwTestService> ("SfwTestService", "com.nokia.qt.SfwTest", "1.0");
+
+    serviceUriHandler.setInstantiationType(QRemoteServiceRegister::GlobalInstance);
+    serviceRegisterSfwTest->publishEntries("sfwtest");
+
+    serviceRegisterSfwTest->setQuitOnLastInstanceClosed(false);
+
+    
+    return a.exec();
+}
diff --git a/tests/manual/sfwtestservice/sfwtestservice.cpp b/tests/manual/sfwtestservice/sfwtestservice.cpp
new file mode 100644
index 0000000000..f1f4706758
--- /dev/null
+++ b/tests/manual/sfwtestservice/sfwtestservice.cpp
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#include <QServiceManager>
+#include <QEventLoop>
+#include <QTimer>
+
+#include "sfwtestservice.h"
+
+// Enable this Macro for simulating long running method.
+//#define ENABLE_LONG_RUNNING_EVENT
+
+QTM_USE_NAMESPACE
+
+SfwTestService::SfwTestService(QObject *parent) :
+    QObject(parent)
+{
+
+}
+
+SfwTestService::~SfwTestService()
+{
+
+}
+
+/*
+ * This is the method which clients can invoke remotely
+ * using service framework. This method return the total
+ * number of services available in service framework.
+ */
+int SfwTestService::getServiceCount()
+{
+    QServiceManager serviceManager;
+    QStringList serviceList = serviceManager.findServices();
+    
+    //Below code simulates long running event to make this method
+    //time consuming.
+#ifdef ENABLE_LONG_RUNNING_EVENT
+    
+    QEventLoop* loop = new QEventLoop( this );
+    QTimer::singleShot(10000, loop, SLOT(quit()));
+    loop->exec();
+    delete loop;
+    
+#endif
+    
+    return serviceList.count();
+}
diff --git a/tests/manual/sfwtestservice/sfwtestservice.h b/tests/manual/sfwtestservice/sfwtestservice.h
new file mode 100644
index 0000000000..09a3079a24
--- /dev/null
+++ b/tests/manual/sfwtestservice/sfwtestservice.h
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the Qt Mobility Components.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.1, 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.
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef SFWTESTSERVICE_H_
+#define SFWTESTSERVICE_H_
+
+#include <QObject>
+#include <QString>
+
+/*
+ * This class provides the Methods which can be 
+ * invoked remotely by the clients using service framework.
+ */
+class SfwTestService: public QObject
+{
+
+    Q_OBJECT
+public:
+    
+    SfwTestService(QObject *parent = 0);
+    
+    ~SfwTestService();
+    
+    Q_INVOKABLE
+    int getServiceCount();
+};
+
+#endif /* SFWTESTSERVICE_H_ */
diff --git a/tests/manual/sfwtestservice/sfwtestservice.pro b/tests/manual/sfwtestservice/sfwtestservice.pro
new file mode 100644
index 0000000000..7202ebbe87
--- /dev/null
+++ b/tests/manual/sfwtestservice/sfwtestservice.pro
@@ -0,0 +1,19 @@
+TEMPLATE = app
+TARGET = sfwtest
+CONFIG += mobility
+MOBILITY = serviceframework
+QT += core
+QT -= gui
+HEADERS += sfwtestservice.h
+SOURCES += sfwtestservice.cpp \
+    main.cpp
+
+symbian: { 
+    TARGET.UID3 = 0xe3260ac0
+    TARGET.VID = VID_DEFAULT
+  	SYMBIAN_PLATFORMS = WINSCW ARMV5
+    addFiles.sources = sfwtestservice.xml
+  	addFiles.path = /resource/apps/xmldata/
+  	DEPLOYMENT += addFiles
+    
+}
diff --git a/tests/manual/sfwtestservice/sfwtestservice.xml b/tests/manual/sfwtestservice/sfwtestservice.xml
new file mode 100644
index 0000000000..77f969001c
--- /dev/null
+++ b/tests/manual/sfwtestservice/sfwtestservice.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SFW version="1.1">
+<service>
+    <name>SfwTestService</name>
+    <ipcaddress>sfwtest</ipcaddress>
+    <description>Service for testing IPC Service</description>
+    <interface>
+        <name>com.nokia.qt.SfwTest</name>
+        <version>1.0</version>
+        <description>Interface for Test Service</description>
+        <capabilities></capabilities>
+    </interface>
+</service>
+</SFW>
\ No newline at end of file
diff --git a/translations/qtmobility_cs.ts b/translations/qtmobility_cs.ts
index de0983cd40..8945364b2a 100644
--- a/translations/qtmobility_cs.ts
+++ b/translations/qtmobility_cs.ts
@@ -4,310 +4,238 @@
 <context>
     <name>AudioCaptureSession</name>
     <message>
-        <location filename="../plugins/multimedia/audiocapture/audiocapturesession.cpp" line="+141"/>
         <source>RAW file format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formát souboru RAW</translation>
     </message>
     <message>
-        <location line="+2"/>
         <source>WAV file format</source>
-        <translation type="unfinished"></translation>
+        <translation>Formát souboru WAV</translation>
     </message>
 </context>
 <context>
     <name>AudioEncoderControl</name>
     <message>
-        <location filename="../plugins/multimedia/audiocapture/audioencodercontrol.cpp" line="+87"/>
         <source>PCM audio data</source>
-        <translation type="unfinished"></translation>
+        <translation>PCM audio data</translation>
     </message>
 </context>
 <context>
     <name>QGstreamerAudioEncode</name>
     <message>
-        <location filename="../plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp" line="+68"/>
-        <location filename="../plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp" line="+83"/>
         <source>Raw PCM audio</source>
-        <translation type="unfinished"></translation>
+        <translation>Surové PCM audio</translation>
     </message>
 </context>
 <context>
     <name>QGstreamerCaptureSession</name>
     <message>
-        <location filename="../plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp" line="+200"/>
         <source>Could not create an audio source element</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodařilo se vytvořit prvek zvukového zdroje</translation>
     </message>
     <message>
-        <location line="+244"/>
         <source>Failed to build media capture pipeline.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QGstreamerPlayerSession</name>
-    <message>
-        <location filename="../plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp" line="+271"/>
-        <location line="+16"/>
-        <source>Unable to play %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodařilo se sestavit rouru pro zachytávání multimédií.</translation>
     </message>
 </context>
 <context>
     <name>QGstreamerRecorderControl</name>
     <message>
-        <location filename="../plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.cpp" line="+108"/>
-        <location line="+8"/>
-        <location filename="../plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp" line="+109"/>
-        <location line="+11"/>
         <source>Service has not been started</source>
-        <translation type="unfinished"></translation>
+        <translation>Služba nebyla spuštěna</translation>
     </message>
     <message>
-        <location line="+92"/>
-        <location filename="../plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp" line="+92"/>
         <source>Not compatible codecs and container format.</source>
-        <translation type="unfinished"></translation>
+        <translation>Neslučitelný formát kodeků a kontejneru.</translation>
     </message>
 </context>
 <context>
     <name>QMediaPlayer</name>
     <message>
-        <location filename="../src/multimedia/qmediaplayer.cpp" line="+475"/>
         <source>The QMediaPlayer object does not have a valid service</source>
-        <translation type="unfinished"></translation>
+        <translation>Objekt QMediaPlayer nemá platnou službu</translation>
     </message>
 </context>
 <context>
     <name>QMediaPlaylist</name>
     <message>
-        <location filename="../src/multimedia/qmediaplaylist.cpp" line="+449"/>
-        <location line="+46"/>
         <source>Could not add items to read only playlist.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nepodařilo se přidat položky, aby se četl pouze seznam skladeb.</translation>
     </message>
     <message>
-        <location line="-27"/>
-        <location line="+46"/>
         <source>Playlist format is not supported</source>
-        <translation type="unfinished"></translation>
+        <translation>Formát seznamu skladeb není podporován</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>The file could not be accessed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Nebylo možné přistoupit k souboru.</translation>
     </message>
     <message>
-        <location line="+35"/>
         <source>Playlist format is not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>Formát seznamu skladeb není podporován.</translation>
     </message>
 </context>
 <context>
     <name>QMessage</name>
     <message>
-        <location filename="../src/messaging/qmessage_qmf.cpp" line="+597"/>
-        <location filename="../src/messaging/qmessage_win.cpp" line="+534"/>
         <source>Subject</source>
-        <translation type="unfinished"></translation>
+        <translation>Předmět</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location filename="../src/messaging/qmessage_win.cpp" line="+1"/>
         <source>Date</source>
-        <translation type="unfinished"></translation>
+        <translation>Datum</translation>
     </message>
     <message>
-        <location line="+1"/>
-        <location filename="../src/messaging/qmessage_win.cpp" line="+1"/>
         <source>From</source>
-        <translation type="unfinished"></translation>
+        <translation>Od</translation>
     </message>
     <message>
-        <location line="+7"/>
-        <location filename="../src/messaging/qmessage_win.cpp" line="+1"/>
         <source>To</source>
-        <translation type="unfinished"></translation>
+        <translation>Pro</translation>
     </message>
     <message>
-        <location line="+82"/>
-        <location filename="../src/messaging/qmessage_win.cpp" line="+66"/>
         <source>On %1 you wrote:
 &gt; </source>
-        <translation type="unfinished"></translation>
+        <translation>%1 jste napsal:
+&gt; </translation>
     </message>
     <message>
-        <location filename="../src/messaging/qmessage_win.cpp" line="-70"/>
         <source>Forwarded Message</source>
-        <translation type="unfinished"></translation>
+        <translation>Přeposlaná zpráva</translation>
     </message>
 </context>
 <context>
     <name>QNetworkConfigurationManagerPrivate</name>
     <message>
-        <location filename="../src/bearer/qnetworkconfigmanager_p.cpp" line="+178"/>
         <source>Internet</source>
-        <translation type="unfinished"></translation>
+        <translation>Internet</translation>
     </message>
 </context>
 <context>
     <name>QNetworkSessionPrivate</name>
     <message>
-        <location filename="../src/bearer/qnetworksession_p.cpp" line="+301"/>
-        <location filename="../src/bearer/qnetworksession_s60_p.cpp" line="+265"/>
         <source>Unknown session error.</source>
-        <translation type="unfinished"></translation>
+        <translation>Neznámá chyba při spojení přes síť.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/bearer/qnetworksession_s60_p.cpp" line="+2"/>
         <source>The session was aborted by the user or system.</source>
-        <translation type="unfinished"></translation>
+        <translation>Spojení bylo zrušeno buď uživatelem nebo operačním systémem.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/bearer/qnetworksession_s60_p.cpp" line="+2"/>
         <source>The requested operation is not supported by the system.</source>
-        <translation type="unfinished"></translation>
+        <translation>Požadovaná operace není systémem podporována.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/bearer/qnetworksession_s60_p.cpp" line="+2"/>
         <source>The specified configuration cannot be used.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zadané nastavení nelze použít.</translation>
     </message>
     <message>
-        <location line="+2"/>
-        <location filename="../src/bearer/qnetworksession_s60_p.cpp" line="+2"/>
         <source>Roaming was aborted or is not possible.</source>
-        <translation type="unfinished"></translation>
+        <translation>Toulání se (roaming) bylo buď zrušeno, nebo zde není možné.</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../src/bearer/qnetworksession_maemo.cpp" line="+993"/>
         <source>Roaming error</source>
-        <translation type="unfinished"></translation>
+        <translation>Chyba při toulání se (roaming)</translation>
     </message>
     <message>
-        <location line="+3"/>
         <source>Session aborted by user or system</source>
-        <translation type="unfinished"></translation>
+        <translation>Spojení bylo zrušeno buď uživatelem nebo operačním systémem</translation>
+    </message>
+    <message>
+        <source>The specified configuration cannot be used.</source>
+        <translation>Zadané nastavení nelze použít.</translation>
     </message>
     <message>
-        <location line="+4"/>
         <source>Unidentified Error</source>
-        <translation type="unfinished"></translation>
+        <translation>Neznámá chyba</translation>
     </message>
     <message>
-        <location filename="../src/publishsubscribe/qsystemreadwritelock_unix.cpp" line="+237"/>
         <source>QSystemReadWriteLock::QSystemReadWriteLock: unable to make key file for key: %1(%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>QSystemReadWriteLock::QSystemReadWriteLock: Nelze udělat klíčový soubor pro klíč: %1(%2)</translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>QSystemReadWriteLock::QSystemReadWriteLock: ftok failed for key %1(%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>QSystemReadWriteLock::QSystemReadWriteLock: ftok selhal pro klíč %1(%2)</translation>
     </message>
     <message>
-        <location line="+13"/>
         <source>QSystemReadWriteLock::QSystemReadWriteLock: Unable to access semaphore set for key %1(%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>QSystemReadWriteLock::QSystemReadWriteLock: Nelze přistupovat k nastavení semaforu pro klíč %1(%2)</translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>QSystemReadWriteLock:QSystemReadWriteLock: Unable to access semaphore set for key %1(%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>QSystemReadWriteLock::QSystemReadWriteLock: Nelze přistupovat k nastavení semaforu pro klíč %1(%2)</translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>QSystemReadWriteLock::QSystemReadWriteLock: Unable to reset semaphore set for key %1(%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>QSystemReadWriteLock::QSystemReadWriteLock: Nelze znovu nastavit nastavení semaforu pro klíč %1(%2)</translation>
     </message>
     <message>
-        <location line="+16"/>
         <source>QSystemReadWriteLock::QSystemReadWriteLock: Unable to increment NumInstances semaphore for key%1(%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>QSystemReadWriteLock::QSystemReadWriteLock: Nelze zvyšovat NumInstances semafor pro klíč %1(%2)</translation>
     </message>
     <message>
-        <location line="+73"/>
         <source>QSystemReadWriteLock::lockForRead: Unable to lock for read for key %1(Lock had not been correctly initialized)</source>
-        <translation type="unfinished"></translation>
+        <translation>QSystemReadWriteLock::lockForRead: Nelze zamknout pro čtení pro klíč %1(Zámek nebyl správně zapnut)</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>QSystemReadWriteLock::lockForRead: Unable to lock for read for key %1(%2)</source>
-        <translation type="unfinished"></translation>
+        <translation>QSystemReadWriteLock::lockForRead: Nelze zamknout pro čtení pro klíč %1(%2)</translation>
     </message>
     <message>
-        <location line="+18"/>
         <source>QSystemReadWriteLock::lockForWrite: Unable to lock for write for key %1(Lock had not been correctly initialized)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+14"/>
         <source>QSystemReadWriteLock::lockForWrite: Could not increment TotalWriters semaphore for key %1(%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+11"/>
         <source>QSystemReadWriteLock::lockForWrite: Could not detect if all readers were finished for key %1(%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>QSystemReadWriteLock::lockForWrite: Could not decrement ActiveWriterSem semaphore for key %1(%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+22"/>
         <source>QSystemReadWriteLock::unlock: Unable to unlock for key %1(Lock had not been correctly initialized)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+29"/>
         <source>QSystemSemaphoreWriteLock::unlock: Unable to check and update writer semaphores for key %1(%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
         <source>QSystemReadWriteLock::unlock: Unable to decrement ActiveReaders semaphore for key %1(%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/publishsubscribe/qsystemreadwritelock_win.cpp" line="+105"/>
         <source>QSystemReadWriteLockPrivate::QSystemReadWriteLockPrivate: Unable to create/attach to shared memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+7"/>
         <source>QSystemReadWriteLockPrivate::QSystemReadWriteLockPrivate: Unable to initialize shared memory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+75"/>
         <source>QSystemReadWriteLock::lockForRead(): cannot peform operation, lock initialization had not been successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
         <source>QSystemReadWriteLock::lockForRead(): cannot perform operation, locking of shared memory was unsuccessful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+32"/>
         <source>QSystemReadWriteLock::lockForWrite(): cannot peform operation, lock initialization had not been successful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+6"/>
-        <location line="+39"/>
         <source>QSystemReadWriteLock::lockForwrite(): cannot perform operation, locking of shared memory was unsuccessful</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-6"/>
         <source>QSystemReadWriteLock::unlock(): cannot peform operation, lock initialization had not been successful</source>
         <translation type="unfinished"></translation>
     </message>
@@ -315,92 +243,1754 @@
 <context>
     <name>QXARecordSession</name>
     <message>
-        <location filename="../plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp" line="+60"/>
-        <location line="+11"/>
         <source>Service has not been started</source>
-        <translation type="unfinished"></translation>
+        <translation>Služba nebyla spuštěna</translation>
     </message>
     <message>
-        <location line="+31"/>
         <source>Unable to start Service</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze spustit službu</translation>
+    </message>
+    <message>
+        <source>Settings cannot be changed once recording started</source>
+        <translation>Nastavení nelze, když už nahrávání začalo, změnit</translation>
     </message>
     <message>
-        <location line="+44"/>
-        <location line="+48"/>
         <source>Generic error</source>
-        <translation type="unfinished"></translation>
+        <translation>Generická chyba</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to pause</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze pozastavit</translation>
     </message>
     <message>
-        <location line="+17"/>
         <source>Unable to stop</source>
-        <translation type="unfinished"></translation>
+        <translation>Nelze zastavit</translation>
     </message>
     <message>
-        <location line="+26"/>
         <source>Resources Unavailable</source>
-        <translation type="unfinished"></translation>
+        <translation>Zdroje nedostupné</translation>
     </message>
     <message>
-        <location line="+76"/>
         <source>Invalid endpoint</source>
-        <translation type="unfinished"></translation>
+        <translation>Neplatný koncový bod</translation>
     </message>
     <message>
-        <location line="+126"/>
-        <location line="+12"/>
         <source>Invalid container</source>
+        <translation>Neplatný kontejner</translation>
+    </message>
+    <message>
+        <source>Invalid codec</source>
+        <translation>Neplatný kodek</translation>
+    </message>
+    <message>
+        <source>Invalid encoding mode setting</source>
+        <translation>Neplatné nastavení režimu kódování</translation>
+    </message>
+    <message>
+        <source>Internal error</source>
+        <translation>Vnitřní chyba</translation>
+    </message>
+</context>
+<context>
+    <name>S60MediaPlayerControl</name>
+    <message>
+        <source>Media couldn&apos;t be resolved</source>
+        <translation>Nepodařilo se vyřešit multimédia</translation>
+    </message>
+</context>
+<context>
+    <name>QCameraPrivate</name>
+    <message>
+        <source>The camera service is missing</source>
+        <translation>Služba kamery chybí</translation>
+    </message>
+</context>
+<context>
+    <name>QCamera</name>
+    <message>
+        <source>The camera service is missing</source>
+        <translation>Služba kamery chybí</translation>
+    </message>
+</context>
+<context>
+    <name>QCameraImageCapture</name>
+    <message>
+        <source>Device does not support images capture.</source>
+        <translation>Zařízení nepodporuje zachytávání obrázků.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactAddress</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+    <message>
+        <source>Unknown sub type.</source>
+        <translation>Neznámý podtyp.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactAnniversary</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactAvatar</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactBirthday</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactDisplayLabel</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactEmailAddress</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactFamily</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactFavorite</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactGender</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactGeoLocation</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactGlobalPresence</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactGuid</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactHobby</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactName</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactNickname</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactNote</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactOnlineAccount</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+    <message>
+        <source>Unknown sub type.</source>
+        <translation>Neznámý podtyp.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactOrganization</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactPhoneNumber</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+    <message>
+        <source>Unknown sub type.</source>
+        <translation>Neznámý podtyp.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactPresence</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactRingtone</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactSyncTarget</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactTag</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactTimestamp</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactUrl</name>
+    <message>
+        <source>Unknown field type.</source>
+        <translation>Neznámý typ pole.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactModel</name>
+    <message>
+        <source>ContactModel: appending contacts is not currently supported</source>
+        <translation>ContactModel: přidávání spojení není nyní podporováno</translation>
+    </message>
+    <message>
+        <source>contacts imported.</source>
+        <translation>Spojení zavedena</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactRelationship</name>
+    <message>
+        <source>unknown relationship type:</source>
+        <translation>Neznámý typ vztahu:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeContactRelationshipModel</name>
+    <message>
+        <source>this relationship &apos;</source>
+        <translation>Tento vztah &apos;</translation>
+    </message>
+    <message>
+        <source>&apos; was already removed!</source>
+        <translation>&apos; již byl odstraněn!</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeDocumentGallery</name>
+    <message>
+        <source>DocumentGallery is a namespace class</source>
+        <translation>DocumentGallery je třída jmenného prostoru</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeGalleryItem</name>
+    <message>
+        <source>An error was encountered connecting to the document gallery</source>
+        <translation>Při připojování se k dokumentové galerii došlo k chybě</translation>
+    </message>
+    <message>
+        <source>The value of item is not a valid item ID</source>
+        <translation>Hodnota položky není platné ID položky</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeGalleryQueryModel</name>
+    <message>
+        <source>An error was encountered connecting to the document gallery</source>
+        <translation>Při připojování se k dokumentové galerii došlo k chybě</translation>
+    </message>
+    <message>
+        <source>DocumentGallery.InvalidType is not a supported item type</source>
+        <translation>DocumentGallery.InvalidType není podporovaný typ položky</translation>
+    </message>
+    <message>
+        <source>DocumentGallery.%1 is not a supported item type</source>
+        <translation>DocumentGallery.%1 není podporovaný typ položky</translation>
+    </message>
+    <message>
+        <source>The value of rootItem is not a valid item ID</source>
+        <translation>Hodnota rootItem není platné ID položky</translation>
+    </message>
+    <message>
+        <source>The value of filter is unsupported</source>
+        <translation>Hodnota filtru není podporována</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeGalleryType</name>
+    <message>
+        <source>An error was encountered connecting to the document gallery</source>
+        <translation>Při připojování se k dokumentové galerii došlo k chybě</translation>
+    </message>
+    <message>
+        <source>DocumentGallery.%1 is not a supported item type</source>
+        <translation>DocumentGallery.%1 není podporovaný typ položky</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeLandmarkFilterBase</name>
+    <message>
+        <source>LandmarkFilterBase is an abstract class</source>
+        <translation>LandmarkFilterBase je abstraktní třída</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeLandmarkAbstractModel</name>
+    <message>
+        <source>LandmarkAbstractModel is an abstract class</source>
+        <translation>LandmarkAbstractModel je abstraktní třída</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeGeoMapPolygonObject</name>
+    <message>
+        <source>Member is not a Coordinate</source>
+        <translation>Člen není souřadnice</translation>
+    </message>
+    <message>
+        <source>Cannot remove nonexistent coordinate.</source>
+        <translation>Nelze odstranit neexistující souřadnici.</translation>
+    </message>
+    <message>
+        <source>Cannot remove the coordinate, it does not exist.</source>
+        <translation>Nelze odstranit souřadnici, která neexistuje.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeGeoMapPolylineObject</name>
+    <message>
+        <source>Cannot remove nonexistent coordinate.</source>
+        <translation>Nelze odstranit neexistující souřadnici.</translation>
+    </message>
+    <message>
+        <source>Cannot remove the coordinate, it does not exist.</source>
+        <translation>Nelze odstranit souřadnici, která neexistuje.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeGraphicsGeoMap</name>
+    <message>
+        <source>Plugin is a write-once property, and cannot be set again.</source>
+        <translation>Přídavný modul je vlastnost jednou-zapsat a nelze jej nastavit znovu.</translation>
+    </message>
+    <message>
+        <source>Map plugin is not set, cannot pan.</source>
+        <translation>Mapový přídavný modul není nastaven, nelze přejíždět.</translation>
+    </message>
+    <message>
+        <source>Map plugin is not set, mouse event cannot be processed.</source>
+        <translation>Mapový přídavný modul není nastaven, událost pohybu myši nelze zpracovat.</translation>
+    </message>
+    <message>
+        <source>Map plugin is not set, map object cannot be added.</source>
+        <translation>Mapový přídavný modul není nastaven, mapový předmět nelze přidat.</translation>
+    </message>
+    <message>
+        <source>Map plugin is not set, map object cannot be removed.</source>
+        <translation>Mapový přídavný modul není nastaven, mapový předmět nelze odstranit.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeLandmarkModel</name>
+    <message>
+        <source>Cannot import, import file is empty.</source>
+        <translation>Nelze zavést, soubor k zavedení je prázdný.</translation>
+    </message>
+    <message>
+        <source>Import file not found.</source>
+        <translation>Soubor k zavedení nenalezen.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativePositionSource</name>
+    <message>
+        <source>PositionSource requires the Symbian Location capability to succeed on the Symbian platform.</source>
+        <translation>PositionSource vyžaduje schopnost Symbian Location, aby uspěl na platformě Symbian.</translation>
+    </message>
+    <message>
+        <source>Nmea file not found.</source>
+        <translation>Soubor Nmea nenalezen.</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeMessageFilterBase</name>
+    <message>
+        <source>MessageFilterBase is an abstract class</source>
+        <translation>MessageFilterBase je abstraktní třída</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeMediaBase</name>
+    <message>
+        <source>volume should be between 0.0 and 1.0</source>
+        <translation>Hlasitost by měla být mezi 0.0 a 1.0</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemDetail</name>
+    <message>
+        <source>Can&apos;t find the detail definition name for detail type &apos;%1&apos;</source>
+        <translation>Nelze najít název vymezení podrobnosti pro typ podrobnosti &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Can&apos;t find the detail type for detail name &apos;%1&apos;</source>
+        <translation>Nelze najít typ podrobnosti pro název podrobnosti &apos;%1&apos;</translation>
+    </message>
+    <message>
+        <source>Can&apos;t find the field name for detail type &apos;%1&apos; and field type &apos;%2&apos;</source>
+        <translation>Nelze najít název pole pro typ podrobnosti &apos;%1&apos; a název pole &apos;%2&apos;</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemComment</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemDescription</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemDisplayLabel</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemGuid</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemParent</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemLocation</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemPriority</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemRecurrence</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemReminder</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemAudibleReminder</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemVisualReminder</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemEmailReminder</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemTimestamp</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerEventTime</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerItemType</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+    <message>
+        <source>I don&apos;t known how to set the customized item type name here!</source>
+        <translation>Nevím, jak tu nastavit vlastní název typu položky!</translation>
+    </message>
+    <message>
+        <source>Unknown organizer item type: </source>
+        <translation>Neznámý typ položky organizátora: </translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerJournalTime</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerTodoProgress</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+    <message>
+        <source>Trying to set an invalid percentage value:</source>
+        <translation>Pokouší se nastavit neplatnou hodnotu procenta:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerTodoTime</name>
+    <message>
+        <source>invalid field type:</source>
+        <translation>Neplatný typ pole:</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerModel</name>
+    <message>
+        <source>Can&apos;t remove an occurrence item, please modify the parent item&apos;s recurrence rule instead!</source>
+        <translation>Nelze odstranit položku výskytu. Změňte, prosím, místo toho pravidlo opakování rodičovské položky!</translation>
+    </message>
+    <message>
+        <source>OrganizerModel: occurrences is not currently supported.</source>
+        <translation>OrganizerModel: výskyty nejsou nyní podporovány.</translation>
+    </message>
+    <message>
+        <source>OrganizerModel: appending items is not currently supported</source>
+        <translation>OrganizerModel: přidávání položek není nyní podporováno</translation>
+    </message>
+</context>
+<context>
+    <name>QDeclarativeOrganizerRecurrenceRule</name>
+    <message>
+        <source>Invalid recurrence rule limit; value ,</source>
+        <translation>Neplatné omezení pravidla opakování; hodnota ,</translation>
+    </message>
+    <message>
+        <source>, did not match one of the types: date, integer or double</source>
+        <translation>, neodpovídá jednomu z typů: datum, celé číslo nebo obojí</translation>
+    </message>
+</context>
+<context>
+    <name>QFeedbackSimulator</name>
+    <message>
+        <source>Custom haptics effect</source>
+        <translation>Vlastní hmatový efekt</translation>
+    </message>
+    <message>
+        <source>File: %1</source>
+        <translation>Soubor: %1</translation>
+    </message>
+</context>
+<context>
+    <name>CameraBinAudioEncoder</name>
+    <message>
+        <source>Raw PCM audio</source>
+        <translation>Surové PCM audio</translation>
+    </message>
+</context>
+<context>
+    <name>CameraBinImageCapture</name>
+    <message>
+        <source>Camera not ready</source>
+        <translation>Kamera není připravena</translation>
+    </message>
+</context>
+<context>
+    <name>CameraBinImageEncoder</name>
+    <message>
+        <source>JPEG image</source>
+        <translation>Obrázek JPEG</translation>
+    </message>
+</context>
+<context>
+    <name>CameraBinRecorder</name>
+    <message>
+        <source>Service has not been started</source>
+        <translation>Služba nebyla spuštěna</translation>
+    </message>
+    <message>
+        <source>Not compatible codecs and container format.</source>
+        <translation>Neslučitelný formát kodeků a kontejneru.</translation>
+    </message>
+</context>
+<context>
+    <name>CameraBinSession</name>
+    <message>
+        <source>Camera error</source>
+        <translation>Chyba kamery</translation>
+    </message>
+</context>
+<context>
+    <name>QGstreamerCameraControl</name>
+    <message>
+        <source>State not supported.</source>
+        <translation>Stav není podporován.</translation>
+    </message>
+</context>
+<context>
+    <name>QGstreamerImageEncode</name>
+    <message>
+        <source>JPEG image encoder</source>
+        <translation>Kodér obrázku JPEG</translation>
+    </message>
+</context>
+<context>
+    <name>QGstreamerPlayerControl</name>
+    <message>
+        <source>Attempting to play invalid Qt resource</source>
+        <translation>Pokus o přehrávání neplatných prostředků Qt</translation>
+    </message>
+    <message>
+        <source>Attempting to play invalid user stream</source>
+        <translation>Pokus o přehrávání neplatného uživatelského proudu</translation>
+    </message>
+</context>
+<context>
+    <name>QGstreamerPlayerSession</name>
+    <message>
+        <source>Cannot play stream of type: &lt;unknown&gt;</source>
+        <translation>Nelze přehrávat proud typu: &lt;neznámý&gt;</translation>
+    </message>
+    <message>
+        <source>UDP source timeout</source>
+        <translation>Překročení času zdroje UDP</translation>
+    </message>
+</context>
+<context>
+    <name>QGstreamerServicePlugin</name>
+    <message>
+        <source>Main Camera</source>
+        <translation>Hlavní kamera</translation>
+    </message>
+    <message>
+        <source>Front Camera</source>
+        <translation>Přední kamera</translation>
+    </message>
+    <message>
+        <source>Main camera</source>
+        <translation>Hlavní kamera</translation>
+    </message>
+    <message>
+        <source>Front camera</source>
+        <translation>Přední kamera</translation>
+    </message>
+</context>
+<context>
+    <name>QGstreamerVideoInputDeviceControl</name>
+    <message>
+        <source>Main camera</source>
+        <translation>Hlavní kamera</translation>
+    </message>
+    <message>
+        <source>Front camera</source>
+        <translation>Přední kamera</translation>
+    </message>
+</context>
+<context>
+    <name>SimulatorCameraImageCaptureControl</name>
+    <message>
+        <source>DriveMode not supported.</source>
+        <translation>DriveMode není podporován.</translation>
+    </message>
+    <message>
+        <source>Incorrect CaptureMode.</source>
+        <translation>Nesprávný CaptureMode.</translation>
+    </message>
+</context>
+<context>
+    <name>S60AudioEncoderControl</name>
+    <message>
+        <source>Audio encoding option is not supported</source>
+        <translation>Volba pro kódování zvuku není podporována</translation>
+    </message>
+    <message>
+        <source>Unable to set undefined settings.</source>
+        <translation>Nelze nastavit nevymezené nastavení.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraAdvSettings</name>
+    <message>
+        <source>Requested focus mode is not supported.</source>
+        <translation>Požadovaný režim zaostření není podporován.</translation>
+    </message>
+    <message>
+        <source>Unexpected camera error.</source>
+        <translation>Neočekávaná chyba kamery.</translation>
+    </message>
+    <message>
+        <source>Settings focus mode is not supported.</source>
+        <translation>Nastavení pro režim zaostření není podporováno.</translation>
+    </message>
+    <message>
+        <source>Settings digital zoom factor is not supported.</source>
+        <translation>Nastavení pro násobek digitálního zvětšení není podporováno.</translation>
+    </message>
+    <message>
+        <source>Requested value is not in supported range.</source>
+        <translation>Požadovaná hodnota není v podporovaném rozsahu.</translation>
+    </message>
+    <message>
+        <source>Requested setting is not supported.</source>
+        <translation>Požadované nastavení není podporováno.</translation>
+    </message>
+    <message>
+        <source>Requested ISO value is not supported.</source>
+        <translation>Požadovaná hodnota ISO není podporována.</translation>
+    </message>
+    <message>
+        <source>Setting ISO value failed.</source>
+        <translation>Nastavení hodnoty ISO se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Requested aperture value is not supported.</source>
+        <translation>Požadovaná hodnota světelnosti není podporována.</translation>
+    </message>
+    <message>
+        <source>Setting aperture value failed.</source>
+        <translation>Nastavení hodnoty světelnosti se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Requested exposure compensation is not supported.</source>
+        <translation>Požadované vyrovnání osvitu není podporováno.</translation>
+    </message>
+    <message>
+        <source>Setting exposure compensation failed.</source>
+        <translation>Nastavení hodnoty osvitu se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Setting zoom factor failed.</source>
+        <translation>Nastavení násobku zvětšení se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Focusing is not supported with this camera.</source>
+        <translation>Zaostřování není touto kamerou podporováno.</translation>
+    </message>
+    <message>
+        <source>Setting focus mode failed.</source>
+        <translation>Nastavení režimu ostření se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Requested sharpness is not supported.</source>
+        <translation>Požadovaná ostrost není podporována.</translation>
+    </message>
+    <message>
+        <source>Setting sharpness failed.</source>
+        <translation>Nastavení ostrosti se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Requested saturation is not supported.</source>
+        <translation>Požadovaná sytost není podporována.</translation>
+    </message>
+    <message>
+        <source>Setting saturation failed.</source>
+        <translation>Nastavení sytosti se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Requested brightness is not supported.</source>
+        <translation>Požadovaný jas není podporován.</translation>
+    </message>
+    <message>
+        <source>Setting brightness failed.</source>
+        <translation>Nastavení jasu se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Requested contrast is not supported.</source>
+        <translation>Požadovaný kontrast není podporován.</translation>
+    </message>
+    <message>
+        <source>Setting contrast failed.</source>
+        <translation>Nastavení kontrastu se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Unexpected error with flash.</source>
+        <translation>Neočekávaná chyba blesku.</translation>
+    </message>
+    <message>
+        <source>Setting metering mode is not supported.</source>
+        <translation>Nastavení pro režim měření není podporováno.</translation>
+    </message>
+    <message>
+        <source>Setting manual iso sensitivity failed.</source>
+        <translation>Ruční nastavení citlivosti ISO se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Setting manual iso sensitivity is not supported.</source>
+        <translation>Ruční nastavení citlivosti ISO není podporováno.</translation>
+    </message>
+    <message>
+        <source>Setting auto iso sensitivity failed.</source>
+        <translation>Automatické nastavení citlivosti ISO se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Setting auto iso sensitivity is not supported.</source>
+        <translation>Automatické nastavení citlivosti ISO není podporováno.</translation>
+    </message>
+    <message>
+        <source>Failure while querying supported apertures.</source>
+        <translation>Neúspěch při dotazu na podporované světelnosti.</translation>
+    </message>
+    <message>
+        <source>Setting manual aperture is not supported.</source>
+        <translation>Ruční nastavení světelnosti není podporováno.</translation>
+    </message>
+    <message>
+        <source>Failure while querying supported shutter speeds.</source>
+        <translation>Neúspěch při dotazu na podporované rychlosti závěrky.</translation>
+    </message>
+    <message>
+        <source>Setting manual shutter speed is not supported.</source>
+        <translation>Ruční nastavení rychlosti závěrky není podporováno.</translation>
+    </message>
+    <message>
+        <source>Setting exposure compensation is not supported.</source>
+        <translation>Nastavení vyrovnání osvitu není podporováno.</translation>
+    </message>
+    <message>
+        <source>Failure while querying supported exposure compensation values.</source>
+        <translation>Neúspěch při dotazu na podporované hodnoty vyrovnání osvitu.</translation>
+    </message>
+    <message>
+        <source>Failed to query supported processing parameters.</source>
+        <translation>Neúspěch při dotazu na podporované parametry zpracování.</translation>
+    </message>
+    <message>
+        <source>Setting denoising level is not supported.</source>
+        <translation>Nastavení pro úroveň odstranění šumu není podporováno.</translation>
+    </message>
+    <message>
+        <source>Setting sharpening level is not supported.</source>
+        <translation>Nastavení pro úroveň ostření není podporováno.</translation>
+    </message>
+    <message>
+        <source>Setting saturation is not supported.</source>
+        <translation>Nastavení pro sytost není podporováno.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraCaptureBufferFormatControl</name>
+    <message>
+        <source>Requested buffer capture format is not supported.</source>
+        <translation>Požadovaný formát zachytávání vyrovnávací paměti není podporován.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraCaptureDestinationControl</name>
+    <message>
+        <source>Requested capture destination is not supported.</source>
+        <translation>Požadovaný cíl zachytávání není podporován.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraControl</name>
+    <message>
+        <source>Unexpected camera error.</source>
+        <translation>Neočekávaná chyba kamery.</translation>
+    </message>
+    <message>
+        <source>Requested state is not supported.</source>
+        <translation>Požadovaný stav není podporován.</translation>
+    </message>
+    <message>
+        <source>Requested capture mode is not supported.</source>
+        <translation>Požadovaný režim zachytávání není podporován.</translation>
+    </message>
+    <message>
+        <source>Loading video capture failed.</source>
+        <translation>Načtení zachytávání videa se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Loading video recorder failed.</source>
+        <translation>Načtení nahrávání videa se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Failed to set viewfinder</source>
+        <translation>Nepodařilo se nastavit hledáček</translation>
+    </message>
+    <message>
+        <source>Failed to start viewfinder.</source>
+        <translation>Nepodařilo se spustit hledáček.</translation>
+    </message>
+    <message>
+        <source>Failed to stop viewfinder.</source>
+        <translation>Nepodařilo se zastavit hledáček.</translation>
+    </message>
+    <message>
+        <source>Access to camera device was rejected.</source>
+        <translation>Přístup k zařízení kamery byl odmítnut.</translation>
+    </message>
+    <message>
+        <source>Camera resources were lost.</source>
+        <translation>Prostředky kamery byly ztraceny.</translation>
+    </message>
+    <message>
+        <source>Requested camera is not available.</source>
+        <translation>Požadovaná kamera není dostupná.</translation>
+    </message>
+    <message>
+        <source>Primary camera</source>
+        <translation>První kamera</translation>
+    </message>
+    <message>
+        <source>Secondary camera</source>
+        <translation>Druhá kamera</translation>
+    </message>
+    <message>
+        <source>Tertiary camera</source>
+        <translation>Třetí kamera</translation>
+    </message>
+    <message>
+        <source>Unidentified Camera</source>
+        <translation>Neurčená kamera</translation>
+    </message>
+    <message>
+        <source>Device primary camera</source>
+        <translation>Zařízení první kamera</translation>
+    </message>
+    <message>
+        <source>Device secondary camera</source>
+        <translation>Zařízení druhá kamera</translation>
+    </message>
+    <message>
+        <source>Device tertiary camera</source>
+        <translation>Zařízení třetí kamera</translation>
+    </message>
+    <message>
+        <source>Recovering from error failed. Possibly missing capabilities.</source>
+        <translation>Vzpamatování se z chyby se nezdařilo. Možná chybí způsobilost.</translation>
+    </message>
+    <message>
+        <source>Recovering from error failed.</source>
+        <translation>Vzpamatování se z chyby se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Camera device creation failed. Possibly missing capabilities.</source>
+        <translation>Vytvoření zařízení kamery se nezdařilo. Možná chybí způsobilost.</translation>
+    </message>
+    <message>
+        <source>Camera device creation failed.</source>
+        <translation>Vytvoření zařízení kamery se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Viewfinder device creation failed.</source>
+        <translation>Vytvoření zařízení hledáčku se nezdařilo.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraExposureControl</name>
+    <message>
+        <source>Requested exposure mode is not supported.</source>
+        <translation>Požadovaný režim osvitu není podporován.</translation>
+    </message>
+    <message>
+        <source>Requested metering mode is not supported.</source>
+        <translation>Požadovaný režim měření není podporován.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraFlashControl</name>
+    <message>
+        <source>Requested flash mode is not supported.</source>
+        <translation>Požadovaný režim blesku není podporován.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraFocusControl</name>
+    <message>
+        <source>Requested focus mode is not supported.</source>
+        <translation>Požadovaný režim zaostření není podporován.</translation>
+    </message>
+    <message>
+        <source>Requested zoom factor is not supported.</source>
+        <translation>Požadovaný násobek zvětšení není podporován.</translation>
+    </message>
+    <message>
+        <source>Requested focus point mode is not supported.</source>
+        <translation>Požadovaný režim bodového zaostření není podporován.</translation>
+    </message>
+    <message>
+        <source>Setting custom focus point is not supported.</source>
+        <translation>Nastavení režimu bodového zaostření není podporováno.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraImageCaptureControl</name>
+    <message>
+        <source>Unexpected camera error.</source>
+        <translation>Neočekávaná chyba kamery.</translation>
+    </message>
+    <message>
+        <source>DriveMode not supported.</source>
+        <translation>DriveMode není podporován.</translation>
+    </message>
+    <message>
+        <source>Incorrect CaptureMode.</source>
+        <translation>Nesprávný CaptureMode.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraImageProcessingControl</name>
+    <message>
+        <source>Requested white balance mode is not supported.</source>
+        <translation>Požadovaný režim vyvážení bílé není podporován.</translation>
+    </message>
+    <message>
+        <source>Setting manual white balance is not supported.</source>
+        <translation>Ruční nastavení vyvážení bílé není podporováno.</translation>
+    </message>
+</context>
+<context>
+    <name>S60CameraViewfinderEngine</name>
+    <message>
+        <source>Unexpected camera error.</source>
+        <translation>Neočekávaná chyba kamery.</translation>
+    </message>
+    <message>
+        <source>General viewfinder error.</source>
+        <translation>Obecná chyba hledáčku.</translation>
+    </message>
+    <message>
+        <source>Unexpected viewfinder error.</source>
+        <translation>Neočekávaná chyba hledáčku.</translation>
+    </message>
+    <message>
+        <source>Requesting window for viewfinder failed.</source>
+        <translation>Požadavek na okno pro hledáček se nezdařil.</translation>
+    </message>
+    <message>
+        <source>Requested viewfinder size is not supported.</source>
+        <translation>Požadovaná velikost hledáčku není podporována.</translation>
+    </message>
+    <message>
+        <source>Starting viewfinder failed.</source>
+        <translation>Spuštění hledáčku se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Unable to start viewfinder with such small resolution.</source>
+        <translation>Nelze spustit hledáček s tak malým rozlišením.</translation>
+    </message>
+    <message>
+        <source>Invalid surface format.</source>
+        <translation>Neplatný formát povrchu.</translation>
+    </message>
+    <message>
+        <source>Failed to start surface.</source>
+        <translation>Nepodařilo se spustit povrch.</translation>
+    </message>
+    <message>
+        <source>Failed to restart surface.</source>
+        <translation>Nepodařilo se spustit povrch znovu.</translation>
+    </message>
+    <message>
+        <source>Presenting viewfinder frame failed.</source>
+        <translation>Ukázání snímku hledáčku se nezdařilo.</translation>
+    </message>
+    <message>
+        <source>Invalid viewfinder frame was received.</source>
+        <translation>Byl přijat neplatný snímku hledáčku.</translation>
+    </message>
+    <message>
+        <source>Failed to convert viewfinder frame to presentable image.</source>
+        <translation>Nepodařilo se převést snímek hledáčku na slušný obrázek.</translation>
+    </message>
+</context>
+<context>
+    <name>S60ImageCaptureSession</name>
+    <message>
+        <source>Unable to capture image before camera is started.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+70"/>
-        <source>Invalid bitrate</source>
+        <source>Failure during image capture preparation.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+13"/>
-        <source>Invalid channel count</source>
+        <source>Previous operation is still ongoing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+15"/>
-        <source>Invalid codec</source>
+        <source>Image capture failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+24"/>
-        <source>Invalid encoding quality setting</source>
+        <source>Unexpected camera error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+9"/>
-        <location line="+14"/>
-        <location line="+14"/>
-        <source>Invalid encoding mode setting</source>
+        <source>Captured image is empty.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="-23"/>
-        <location line="+14"/>
-        <source>Internal error</source>
+        <source>Failure while notifying client that camera is ready for capture.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create preview image.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preview image creation failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Writing captured image to a file failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to write captured image to a file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Saving captured image failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General camera error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Preview creation failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid path given.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location line="+19"/>
-        <source>Invalid sample rate</source>
+        <source>Saving captured image to file failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>S60MediaPlayerControl</name>
+    <name>S60ImageCaptureSettings</name>
     <message>
-        <location filename="../plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp" line="+229"/>
-        <source>Media couldn&apos;t be resolved</source>
+        <source>Unexpected camera error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to recover from error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to apply zoom factor.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to select color format to be used with image codec.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Buffer image capture is not supported with this setup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested resolution is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested image codec is not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested image quality is not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting image quality failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested digital zoom factor is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested optical zoom factor is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Zooming failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set flash mode before camera is started.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set flash mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested flash mode is not suported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set exposure mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested exposure mode is not suported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting metering mode is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set contrast.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set brightness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set white balance mode.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested white balance mode is not suported</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>S60ImageEncoderControl</name>
+    <message>
+        <source>Failed to apply image settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to set undefined settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>S60MediaContainerControl</name>
+    <message>
+        <source>No supported video containers found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>S60MediaRecorderControl</name>
+    <message>
+        <source>Video capture mode is not selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>S60VideoCaptureSession</name>
+    <message>
+        <source>Failed to gather video codec information.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot apply settings while recording.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unexpected camera error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to initialize video recorder.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to recover from video error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure in creation of video recorder device.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot set file name while recording.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Network URL is not supported as video sink.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot retrieve video position.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unexpected recording error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera not ready to start video recording.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Pausing video recording failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to gather information of supported audio codecs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to gather information of supported video codecs.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested video container or controller is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure during video recorder initialization.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Camera preparation for video recording failed because of unsupported setting.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to prepare camera for video recording.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not enough space for video, recording stopped.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Recording stopped due to unexpected error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>S60VideoCaptureSettings</name>
+    <message>
+        <source>Could not query supported video resolutions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Muting audio is not supported during recording.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unmuting audio is not supported during recording.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set audio or video codec.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting audio sample rate failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting audio sample rate is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested audio bitrate is not supported or previously set codec is not supported with requested bitrate.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting audio bitrate failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting audio channel count failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Setting audio channel count is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failure when checking if audio is enabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to mute/unmute audio.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Muting/unmuting audio is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Querying audio codec failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Querying audio sample rate failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Querying audio bitrate failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Querying audio channel count failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Querying whether audio is muted failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to convert video codec to Qt format.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Querying video resolution failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Querying video framerate failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Querying video bitrate failed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Currently selected audio codec is not supported by the platform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Currently selected video codec is not supported by the platform.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to gather video container information.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to query information of supported sample rates.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested audio codec is not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unexpected camera error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested video bitrate is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set video bitrate.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested resolution is not supported for this camera.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested video resolution is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set video resolution.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested framerate is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set video framerate.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested video encoding mode is not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested audio encoding mode is not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to query current pixel aspect ratio.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set pixel aspect ratio.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to query audio gain.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set audio gain.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set maximum video size.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Requested video container is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>S60VideoEncoderControl</name>
+    <message>
+        <source>Requested encoding option is not supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to set undefined settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>S60RadioTunerControl</name>
+    <message>
+        <source>Initialize Error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Band FM not Supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Band AM not Supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Band SW not Supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Band LW not Supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Band FM2 not Supported</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Antenna Not Connected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resource Error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frequency out of band range</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown Error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frequency Out of Band Range or Frequency Not Valid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Hardware failure or RadioInOfflineMode</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Frequency Out of range or not Valid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>QXAPlaySession</name>
+    <message>
+        <source>Service has not been started</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to load media</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Resources Unavailable</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MFPlayerSession</name>
+    <message>
+        <source>Invalid stream source!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attempting to play invalid Qt resource</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The system cannot find the file specified.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The specified server could not be found.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to load source.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t create presentation descriptor!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to get stream count</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to create topology!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to play some stream</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to play</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to set topology!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown stream type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>failed to stop</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>failed to start playback</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>failed to pause</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create mediasession</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to pulling session events</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>failed to seek</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>media session non-fatal error!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>media session serious error!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/translations/translations.pro b/translations/translations.pro
index dfbc20ee0e..ffca6d0dea 100644
--- a/translations/translations.pro
+++ b/translations/translations.pro
@@ -49,13 +49,13 @@ QMAKE_EXTRA_TARGETS += check-ts
 
 isEqual(QMAKE_DIR_SEP, /) {
     commit-ts.commands = \
-        cd $$IDE_SOURCE_TREE; \
+        cd $$QT_MOBILITY_SOURCE_TREE; \
         for f in `git diff-files --name-only translations/*_??.ts`; do \
             $$LCONVERT -locations none -i \$\$f -o \$\$f; \
         done; \
         git add translations/*_??.ts && git commit
 } else {
-    wd = $$replace(IDE_SOURCE_TREE, /, \\)
+    wd = $$replace(QT_MOBILITY_SOURCE_TREE, /, \\)
     commit-ts.commands = \
         cd $$wd && \
         for /f usebackq %%f in (`git diff-files --name-only translations/*_??.ts`) do \