# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1276255585 -10800
# Node ID 06b8e2af4411ddf18893f5797ddbaa4073e68ba2
# Parent  71781823f7763ca230be95a3eedfe8dc778ffc1b
Revision: 201021
Kit: 2010123

diff -r 71781823f776 -r 06b8e2af4411 .hgtags
--- a/.hgtags	Thu May 27 13:42:11 2010 +0300
+++ b/.hgtags	Fri Jun 11 14:26:25 2010 +0300
@@ -35,3 +35,5 @@
 8efb64d7d2f74e77bc1e6002fe5d8fedd45d0cfe rel-1018-1
 bd857121e75382047a96c3b5942d83fc9828cc4b rel-1018-2
 824172531d783ab1c6d1173b77ebeb284a680092 rel-1018-3
+5176467671d820839e10de0518dfc807689d0096 rel-1020
+abcadb4e428db13cc6a6d494f4e66515a8e53c5c rel-1020-1
diff -r 71781823f776 -r 06b8e2af4411 VERSION.SHA1
--- a/VERSION.SHA1	Thu May 27 13:42:11 2010 +0300
+++ b/VERSION.SHA1	Fri Jun 11 14:26:25 2010 +0300
@@ -1,1 +1,1 @@
-f7095fa7e088766f37122918eadd488da8938fe2
+02ae094d792a122b4600caf7dfe55eefa68c9d25
diff -r 71781823f776 -r 06b8e2af4411 group/bld.inf
--- a/group/bld.inf	Thu May 27 13:42:11 2010 +0300
+++ b/group/bld.inf	Fri Jun 11 14:26:25 2010 +0300
@@ -27,6 +27,7 @@
 PRJ_EXPORTS
 qtextensionsconfig.xml  /epoc32/tools/makefile_templates/qt/qtextensionsconfig.xml
 qtextensions_pre_targetdep.flm /epoc32/tools/makefile_templates/qt/qtextensions_pre_targetdep.flm
+qtmobilityheaders.flm /epoc32/tools/makefile_templates/qt/qtmobilityheaders.flm
 
 ../qtecomplugins/mkspecs/features/ecomplugin.prf /epoc32/tools/qt/mkspecs/features/symbian/ecomplugin.prf
 ../qtecomplugins/supplements/xqecom/xqecom.py    /epoc32/tools/xqecom.py
@@ -42,4 +43,6 @@
 
 
 PRJ_EXTENSIONS
-
+START EXTENSION qt/qtmobilityheaders
+OPTION MODULES bearer location serviceframework publishsubscribe systeminfo messaging sensors
+END
diff -r 71781823f776 -r 06b8e2af4411 group/qtextensionsconfig.xml
--- a/group/qtextensionsconfig.xml	Thu May 27 13:42:11 2010 +0300
+++ b/group/qtextensionsconfig.xml	Fri Jun 11 14:26:25 2010 +0300
@@ -5,6 +5,11 @@
 
 	<!-- Tools interfaces -->
 
+	<interface name="qt.qtmobilityheaders" extends="Symbian.UserFLM" flm="qtmobilityheaders.flm">
+		<param name='SYNCHEADERS' default='syncheaders' />
+		<param name='MODULES' default='' />
+	</interface>
+	
 	<interface name="qt.qtextensions_pre_targetdep.export" extends="Symbian.UserFLM"
                 flm="qtextensions_pre_targetdep.flm">
     <param name='PREDEP_TARGET' />
diff -r 71781823f776 -r 06b8e2af4411 group/qtmobilityheaders.flm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/group/qtmobilityheaders.flm	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,141 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# ** Contact: 
+# **
+# ****************************************************************************/
+
+# FLM to generate Qt style headers for QtMobility
+QTMOBILITY_ROOT := $(subst group,,$(subst \,/,$(EXTENSION_ROOT)qtmobility/))
+QTMOBILITY_BIN := $(QTMOBILITY_ROOT)bin
+QTMOBILITY_INCLUDE := $(QTMOBILITY_ROOT)include
+QTMOBILITY_BEARER_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmBearer
+QTMOBILITY_CONTACTS_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmContacts
+QTMOBILITY_LOCATION_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmLocation
+QTMOBILITY_MESSAGING_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmMessaging
+QTMOBILITY_MULTIMEDIA_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmMedia
+QTMOBILITY_PUBLISHSUBSCRIBE_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmPubSub
+QTMOBILITY_SYSTEMINFO_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmSystemInfo
+QTMOBILITY_SERVICEFRAMEWORK_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmServiceFramework
+QTMOBILITY_VERSIT_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmVersit
+QTMOBILITY_SENSORS_INCLUDE := $(QTMOBILITY_INCLUDE)/QtmSensors
+QTMOBILITY_SRC := $(QTMOBILITY_ROOT)src
+QTMOBILITY_GLOBAL_SRC := $(QTMOBILITY_SRC)/global
+QTMOBILITY_BEARER_SRC := $(QTMOBILITY_SRC)/bearer
+QTMOBILITY_CONTACTS_SRC := $(QTMOBILITY_SRC)/contacts
+QTMOBILITY_LOCATION_SRC := $(QTMOBILITY_SRC)/location
+QTMOBILITY_MESSAGING_SRC := $(QTMOBILITY_SRC)/messaging
+QTMOBILITY_MULTIMEDIA_SRC := $(QTMOBILITY_SRC)/multimedia
+QTMOBILITY_PUBLISHSUBSCRIBE_SRC := $(QTMOBILITY_SRC)/publishsubscribe
+QTMOBILITY_SYSTEMINFO_SRC := $(QTMOBILITY_SRC)/systeminfo
+QTMOBILITY_SERVICEFRAMEWORK_SRC := $(QTMOBILITY_SRC)/serviceframework
+QTMOBILITY_VERSIT_SRC := $(QTMOBILITY_SRC)/versit
+QTMOBILITY_SENSORS_SRC := $(QTMOBILITY_SRC)/sensors
+
+CLEANTARGETS := 
+CREATABLEPATHS := 
+
+define generate_module_headers
+EXPORT::
+	$(call startrule,generate_module_headers,FORCESUCCESS) \
+	cd $(QTMOBILITY_ROOT) && \
+	$(PERL) -S $(QTMOBILITY_BIN)/$(SYNCHEADERS) $(1) $(2) \
+	$(call endrule,generate_module_headers)
+endef
+
+define generate_clean_target
+CLEANTARGETS := $(CLEANTARGETS) $(1)/$(call strip, $(2))
+endef
+
+GUARD:=done_$(call sanitise,$(QTMOBILITY_INCLUDE))
+ifeq ($($(GUARD)),)
+$(GUARD) := 1
+$(call makepath,$(QTMOBILITY_INCLUDE))
+CREATABLEPATHS := $(QTMOBILITY_INCLUDE)
+
+ifneq (,$(findstring bearer,$(MODULES)))
+$(call makepath,$(QTMOBILITY_BEARER_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_BEARER_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_BEARER_INCLUDE), $(QTMOBILITY_BEARER_SRC)))
+#HEADERS := $(shell ls $(QTMOBILITY_BEARER_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_BEARER_INCLUDE), $(HEADER))))
+endif
+
+ifneq (,$(findstring contacts,$(MODULES)))
+$(call makepath,$(QTMOBILITY_CONTACTS_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_CONTACTS_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_CONTACTS_INCLUDE), $(QTMOBILITY_CONTACTS_SRC)))
+$(eval $(call generate_module_headers, $(QTMOBILITY_CONTACTS_INCLUDE), $(QTMOBILITY_CONTACTS_SRC)/requests))
+$(eval $(call generate_module_headers, $(QTMOBILITY_CONTACTS_INCLUDE), $(QTMOBILITY_CONTACTS_SRC)/filters))
+$(eval $(call generate_module_headers, $(QTMOBILITY_CONTACTS_INCLUDE), $(QTMOBILITY_CONTACTS_SRC)/details))
+#HEADERS := $(shell ls $(QTMOBILITY_CONTACTS_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_CONTACTS_INCLUDE), $(HEADER))))
+endif
+
+ifneq (,$(findstring location,$(MODULES)))
+$(call makepath,$(QTMOBILITY_LOCATION_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_LOCATION_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_LOCATION_INCLUDE), $(QTMOBILITY_LOCATION_SRC)))
+#HEADERS := $(shell ls $(QTMOBILITY_LOCATION_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_LOCATION_INCLUDE), $(HEADER))))
+endif
+
+ifneq (,$(findstring messaging,$(MODULES)))
+$(call makepath,$(QTMOBILITY_MESSAGING_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_MESSAGING_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_MESSAGING_INCLUDE), $(QTMOBILITY_MESSAGING_SRC)))
+#HEADERS := $(shell ls $(QTMOBILITY_MESSAGING_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_MESSAGING_INCLUDE), $(HEADER))))
+endif
+
+ifneq (,$(findstring multimedia,$(MODULES)))
+$(call makepath,$(QTMOBILITY_MULTIMEDIA_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_MULTIMEDIA_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_MULTIMEDIA_INCLUDE), $(QTMOBILITY_MULTIMEDIA_SRC)))
+#HEADERS := $(shell ls $(QTMOBILITY_MULTIMEDIA_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_MULTIMEDIA_INCLUDE), $(HEADER))))
+endif
+
+ifneq (,$(findstring publishsubscribe,$(MODULES)))
+$(call makepath,$(QTMOBILITY_PUBLISHSUBSCRIBE_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_PUBLISHSUBSCRIBE_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_PUBLISHSUBSCRIBE_INCLUDE), $(QTMOBILITY_PUBLISHSUBSCRIBE_SRC)))
+#HEADERS := $(shell ls $(QTMOBILITY_PUBLISHSUBSCRIBE_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_PUBLISHSUBSCRIBE_INCLUDE), $(HEADER))))
+endif
+
+ifneq (,$(findstring systeminfo,$(MODULES)))
+$(call makepath,$(QTMOBILITY_SYSTEMINFO_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_SYSTEMINFO_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_SYSTEMINFO_INCLUDE), $(QTMOBILITY_SYSTEMINFO_SRC)))
+#HEADERS := $(shell ls $(QTMOBILITY_SYSTEMINFO_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_SYSTEMINFO_INCLUDE), $(HEADER))))
+endif
+
+ifneq (,$(findstring serviceframework,$(MODULES)))
+$(call makepath,$(QTMOBILITY_SERVICEFRAMEWORK_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_SERVICEFRAMEWORK_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_SERVICEFRAMEWORK_INCLUDE), $(QTMOBILITY_SERVICEFRAMEWORK_SRC)))
+#HEADERS := $(shell ls $(QTMOBILITY_SERVICEFRAMEWORK_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_SERVICEFRAMEWORK_INCLUDE), $(HEADER))))
+endif
+
+ifneq (,$(findstring versit,$(MODULES)))
+$(call makepath,$(QTMOBILITY_VERSIT_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_VERSIT_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_VERSIT_INCLUDE), $(QTMOBILITY_VERSIT_SRC)))
+#HEADERS := $(shell ls $(QTMOBILITY_VERSIT_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_VERSIT_INCLUDE), $(HEADER))))
+endif
+
+ifneq (,$(findstring sensors,$(MODULES)))
+$(call makepath,$(QTMOBILITY_SENSORS_INCLUDE))
+CREATABLEPATHS := $(CREATABLEPATHS) $(QTMOBILITY_SENSORS_INCLUDE)
+$(eval $(call generate_module_headers, $(QTMOBILITY_SENSORS_INCLUDE), $(QTMOBILITY_SENSORS_SRC)))
+#HEADERS := $(shell ls $(QTMOBILITY_SENSORS_INCLUDE))
+#$(foreach HEADER,$(HEADERS), $(eval $(call generate_clean_target, $(QTMOBILITY_SENSORS_INCLUDE), $(HEADER))))
+endif
+
+$(eval $(call GenerateStandardCleanTarget, $(CLEANTARGETS), $(CREATABLEPATHS)))
+$(eval $(call whatmacro, $(CLEANTARGETS)))
+endif	
diff -r 71781823f776 -r 06b8e2af4411 qhbstyle/qhbstyle.cpp
--- a/qhbstyle/qhbstyle.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qhbstyle/qhbstyle.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -28,15 +28,12 @@
 //Qt widgets
 #include <QtGui/qgroupbox.h>
 #include <QtGui/qheaderview.h>
-#include <QtGui/qlistwidget.h>
 #include <QtGui/qlistview.h>
 #include <QtGui/qpushbutton.h>
 #include <QtGui/qscrollbar.h>
 #include <QtGui/qtabbar.h>
 #include <QtGui/qtableview.h>
-#include <QtGui/qtablewidget.h>
 #include <QtGui/qtreeview.h>
-#include <QtGui/qtreewidget.h>
 #include <QtGui/qtextedit.h>
 #include <QtGui/qtoolbar.h>
 #include <QtGui/qtoolbutton.h>
@@ -66,18 +63,14 @@
 
 QT_BEGIN_NAMESPACE
 
-QHbStylePrivate::QHbStylePrivate()
+QHbStylePrivate::QHbStylePrivate() : m_styleManager(0),
+    m_frameDrawer(new HbFrameDrawer),
+    m_animationGroup(new QParallelAnimationGroup)
 {
-    m_frameDrawer = 0;
-    m_styleManager = 0;
-
-    m_animationGroup = q_check_ptr(new QParallelAnimationGroup());
 }
 
 QHbStylePrivate::~QHbStylePrivate()
 {
-    delete m_frameDrawer;
-    delete m_animationGroup;
 }
 
 HbStyle* QHbStylePrivate::styleManager()
@@ -93,7 +86,7 @@
 
 QParallelAnimationGroup* QHbStylePrivate::animationGroup()
 {
-    return m_animationGroup;
+    return m_animationGroup.data();
 }
 
 /*!
@@ -158,12 +151,11 @@
                 state |= SS_Focused;
             if (vopt->state & State_Sunken || vopt->state & State_Raised)
                 state |= SS_Pressed;
-#ifndef QT_NO_TREEVIEW
-                if (qobject_cast<const QTreeWidget*>(widget)) {
-                    if (option->state & State_Children) {
-                        m_private->drawMultiPartItem(SM_ListParent, painter, vopt->rect, state);
-                        break;
-                    }
+
+#ifndef QT_NO_TABLEVIEW
+                if (qobject_cast<const QTableView *>(widget)) {
+                    m_private->drawMultiPartItem(SM_TableItem, painter, vopt->rect, state);
+                    break;
                 }
 #endif
             if (vopt->features & QStyleOptionViewItemV2::Alternate)
@@ -219,7 +211,7 @@
 #ifndef QT_NO_LINEEDIT
         case PE_PanelLineEdit: {
 #ifndef QT_NO_COMBOBOX
-            if (widget && qobject_cast<const QComboBox *>(widget->parentWidget()))
+            if ( (widget && qobject_cast<const QComboBox *>(widget->parentWidget()) ) && (!widget->hasFocus()))
                 break;
 #endif
 #ifndef QT_NO_SPINBOX
@@ -280,16 +272,17 @@
             if (const QStyleOptionFocusRect *highlight = qstyleoption_cast<const QStyleOptionFocusRect *>(option)) {
                 if (false
 #ifndef QT_NO_LISTVIEW
-                        || qobject_cast<const QListWidget *>(widget)
+                        || qobject_cast<const QListView *>(widget)
 #endif
 #ifndef QT_NO_TABLEVIEW
-                        || qobject_cast<const QTableWidget *>(widget)
+                        || qobject_cast<const QTableView *>(widget)
 #endif
 #ifndef QT_NO_TREEVIEW
-                        || qobject_cast<const QTreeWidget *>(widget)
+                        || qobject_cast<const QTreeView *>(widget)
 #endif
                     )
-                    m_private->drawMultiPartItem(SM_ItemViewHighlight, painter, highlight->rect);
+                    if (option->state & State_HasFocus)
+                        m_private->drawMultiPartItem(SM_ItemViewItem, painter, highlight->rect, SS_Focused);
             }
             break;
         }
@@ -373,13 +366,16 @@
             break;
         }
         case CE_ItemViewItem: {
+        //@todo: headerviews and listviews should show selection tick at the beginning of the row (in place of checkbox rect)
+        //@todo: headerview should select also parent when child is selected
+        //@todo: headerview should draw highlight rect
             if (const QStyleOptionViewItemV4 *itemOption = qstyleoption_cast<const QStyleOptionViewItemV4 *>(option)) {
                 const QRect checkRect = subElementRect(SE_ItemViewItemCheckIndicator, itemOption, widget);
                 const QRect iconRect = subElementRect(SE_ItemViewItemDecoration, itemOption, widget);
                 QRect textRect = subElementRect(SE_ItemViewItemText, itemOption, widget);
 
                 //background for list items (other itemviews use PE_PanelItemViewRow drawing)
-                if (qobject_cast<const QListWidget *>(widget))
+                if (qobject_cast<const QListView *>(widget))
                     proxy()->drawPrimitive(PE_PanelItemViewItem, itemOption, painter, widget);
 
                 //checkbox
@@ -393,7 +389,7 @@
                 //selection indication
                 if (itemOption->state & State_Selected) {
                     const QAbstractItemView *itemView = qobject_cast<const QAbstractItemView *>(widget);
-                    if (itemView->selectionMode() != QAbstractItemView::SingleSelection) {
+                    if (itemView->selectionMode() != QAbstractItemView::NoSelection) {
                         QStyleOptionViewItemV4 selectOption;
                         selectOption.QStyleOption::operator=(*itemOption);
                         int iconSize = 0;
@@ -881,7 +877,43 @@
         case CC_ComboBox: {
             if (const QStyleOptionComboBox *cmb = qstyleoption_cast<const QStyleOptionComboBox *>(option)) {
                 const QRect cmbxFrame = cmb->rect;
-                ItemStates state = SS_Active;
+
+                const bool isDisabled = !(cmb->state & State_Enabled);
+                ItemStates state = (isDisabled) ? SS_Disabled : SS_Active;
+
+                if (cmb->state & State_Active &&
+                    cmb->state & State_Enabled &&
+                    !cmb->state & State_HasFocus &&
+                    !cmb->state & State_MouseOver &&
+                    !cmb->state & State_Selected) {
+                    state |= SS_Active;
+                }
+                if (cmb->state & State_Active &&
+                    cmb->state & State_Enabled &&
+                    cmb->state & State_On &&
+                    !cmb->state & State_HasFocus &&
+                    !cmb->state & State_MouseOver &&
+                    !cmb->state & State_Selected) {
+                    state |= SS_Active;
+                }
+                else if (cmb->state & State_Active &&
+                         cmb->state & State_Enabled &&
+                         cmb->state & State_HasFocus &&
+                         cmb->state & State_MouseOver &&
+                         cmb->state & State_Selected) {
+                    state |= SS_Pressed;
+                }
+                else if (cmb->state & State_Active &&
+                         cmb->state & State_Enabled &&
+                         cmb->state & State_HasFocus &&
+                         cmb->state & State_MouseOver) {
+                    state |= SS_Pressed;
+                }
+               /* else if (cmb->state & State_Active &&
+                         cmb->state & State_Enabled &&
+                         cmb->state & State_Sunken) {
+                    state |= SS_Pressed;
+                }*/
 
                 // Button frame
                 QStyleOptionFrame  buttonOption;
@@ -891,42 +923,24 @@
                 const int topLeftPoint = (cmb->direction == Qt::LeftToRight) ? (cmbxFrame.width() - buttonMaxWidth) : 0;
 
                 const QRect buttonRect(topLeftPoint, cmbxFrame.top(), buttonMaxHeight, buttonMaxWidth);
-                buttonOption.rect = buttonRect;
-                buttonOption.state = cmb->state;
-                ItemStates buttonState = (buttonOption.state & State_Sunken) ? ItemStates(SS_Pressed  | SS_Active) : ItemStates(SS_Active);
-                if (cmb->direction == Qt::RightToLeft)
-                    buttonState |= SS_Mirrored;
-                if (buttonOption.state & State_HasFocus) {
-                    buttonState |= SS_Selected;
-                    state |= SS_Selected; //set frame status to follow button status for highlight
+                if (cmb->direction == Qt::RightToLeft){
+
+                    state |= SS_Mirrored;
                 }
 
-                m_private->drawItem(SP_BoxButton, painter, buttonRect.adjusted(0, 1, 0, -1), buttonState); //@todo: remove magic
-
                 if (cmb->subControls & SC_ComboBoxFrame) {
-                    const bool isDisabled = !(cmb->state & State_Enabled);
-                    const bool isPressed = (cmb->state & State_Sunken);
-                    const bool isEditable = cmb->editable;
 
-                    if (isDisabled)
-                        state = SS_Disabled;
-                    else if (isPressed)
-                        state |= SS_Pressed;
-                    if (isEditable)
-                        state |= SS_Edited;
                     QRect frameRect = QRect(cmb->rect);
                     int frameWidth = pixelMetric(PM_DefaultFrameWidth);
                     int maxRight = cmb->rect.height() - 2 * frameWidth;
                     frameRect.adjust(0, 0, -maxRight, 0);
-                    int adjustX = 0;
-                    if (option->direction == Qt::RightToLeft) {
-                        adjustX = buttonOption.rect.topRight().x();
-                        state |= SS_Mirrored;
-                    }
+
                     const QRect frame = subControlRect(CC_ComboBox, option, SC_ComboBoxFrame, widget);
-                    // @todo: if SC_ComboBoxFrame needs adjusting, move that code to subControlRect
-                    m_private->drawMultiPartItem(SM_BoxFrame, painter, frame.adjusted(adjustX, 1, -4 + adjustX, -1), state);
+                    //Draw the frame
+                    m_private->drawMultiPartItem(SM_BoxFrame, painter, frame, state);
                 }
+                //Draw the dropdown button
+                m_private->drawItem(SP_BoxButton, painter, buttonRect, state); //@todo: remove magic
             }
             break;
         }
@@ -1008,32 +1022,75 @@
                         v = nextInterval;
                     }
                 }
-                 QRect filledRect;
-                 if ( horizontal ){
-                    const int sliderPosition = sliderHandle.center().x();
-                    const int sliderWidth = sliderHandle.width()/2;
+
+                QRect filledRect;
+                QRect filledRectMask;
+                if ( horizontal ){
+                    if (slider && (slider->layoutDirection() == Qt::LeftToRight) ^ slider->invertedAppearance()){
+                        filledRect = QRect( sliderGroove.x(),
+                                            sliderGroove.y(),
+                                            qMax(sliderGroove.width()-sliderHandle.right(), sliderHandle.right()),
+                                            sliderGroove.height());
+
+                        int x = qMin(sliderHandle.left(), sliderGroove.x() + sliderGroove.width()-sliderHandle.right());
+                        filledRectMask = QRect(x,
+                                               sliderGroove.y(),
+                                               sliderGroove.width()-x,
+                                               sliderGroove.height());
+                    } else {
+                        filledRect = QRect( qMin(sliderGroove.width()-sliderHandle.left(),sliderHandle.left()),
+                                            sliderGroove.y(),
+                                            qMax(sliderGroove.width()-sliderHandle.left(), sliderHandle.left()),
+                                            sliderGroove.height());
+
+                        filledRectMask = QRect( sliderGroove.x(),
+                                                sliderGroove.y(),
+                                                qMax(sliderGroove.width()-sliderHandle.right(), sliderHandle.right()),
+                                                sliderGroove.height());
+
+                    }
+                } else {
                     if (slider && (slider->layoutDirection() == Qt::LeftToRight) ^ slider->invertedAppearance()){
-                        filledRect = QRect(sliderGroove.x(), sliderGroove.y(), sliderPosition+sliderWidth, sliderGroove.height());
-                     } else {
-                        filledRect = QRect(sliderGroove.x()+sliderPosition-sliderWidth, sliderGroove.y(), sliderGroove.width()-sliderPosition+sliderWidth, sliderGroove.height());
-                     }
-                 } else {
-                    const int sliderPosition = sliderHandle.center().y();
-                    const int sliderHeight = sliderHandle.height()/2;
-                     if (slider && (slider->layoutDirection() == Qt::LeftToRight) ^ slider->invertedAppearance()){
-                        filledRect = QRect(sliderGroove.x(), sliderGroove.y()+sliderPosition-sliderHeight, sliderGroove.width(), sliderGroove.height()-sliderPosition+sliderHeight);
-                     } else {
-                        filledRect = QRect(sliderGroove.x(), sliderGroove.y(), sliderGroove.width(), sliderPosition+sliderHeight);
-                     }
-                  }
+                        filledRect = QRect(sliderGroove.x(),
+                                           qMin(sliderGroove.height()-sliderHandle.top(), sliderHandle.top()),
+                                           sliderGroove.width(),
+                                           qMax(sliderGroove.height()-sliderHandle.top(), sliderHandle.top()));
+
+                        filledRectMask = QRect(sliderGroove.x(),
+                                               sliderGroove.y(),
+                                               sliderGroove.width(),
+                                               qMax(sliderGroove.height()-sliderHandle.bottom(), sliderHandle.bottom()));
+                    } else {
+                        filledRect = QRect(sliderGroove.x(),
+                                           sliderGroove.y(),
+                                           sliderGroove.width(),
+                                           qMax(sliderGroove.height()-sliderHandle.bottom(),sliderHandle.bottom()));
 
-                //Groove
-                m_private->drawMultiPartItem(SM_SliderGroove, painter, sliderGroove, grooveState);
+                        int y = qMin(sliderHandle.top(), sliderGroove.y() + sliderGroove.height()-sliderHandle.bottom());
+                        filledRectMask = QRect( sliderGroove.x(),
+                                                y,
+                                                sliderGroove.width(),
+                                                sliderGroove.height()-y );
+                    }
+                }
+
+                if (filledRect.width() <  filledRectMask.width() || filledRect.height() <  filledRectMask.height()){
+                    // Progress + groove
+                    m_private->drawMultiPartItem(SM_SliderGroove, painter, filledRect, grooveState );
+                    m_private->drawMultiPartItem(SM_SliderProgress, painter, filledRect, grooveState | SS_Filled);
 
-                //Progress
-                m_private->drawMultiPartItem(SM_SliderProgress, painter, filledRect, grooveState | SS_Filled);
+                    // Groove
+                    m_private->drawMultiPartItem(SM_SliderGroove, painter, filledRectMask, grooveState);
+                } else {
+                    // Groove
+                    m_private->drawMultiPartItem(SM_SliderGroove, painter, filledRectMask, grooveState);
 
-                 //handle
+                    // Progess + groove
+                    m_private->drawMultiPartItem(SM_SliderGroove, painter, filledRect, grooveState );
+                    m_private->drawMultiPartItem(SM_SliderProgress, painter, filledRect, grooveState | SS_Filled);
+                }
+
+                //handle
                 m_private->drawItem(SP_SliderHandle, painter, sliderHandle, handleState);
             }
             break;
@@ -1194,28 +1251,29 @@
                 const QRect spinboxButtonDownRect = subControlRect(control, optionSpinbox, SC_SpinBoxDown, widget);
                 const QRect spinboxEditorRect = subControlRect(control, optionSpinbox, SC_SpinBoxEditField, widget);
 
-                QStyleOptionSpinBox copy = *optionSpinbox;
-
                 //Frame & background
                 const bool isDisabled = !(optionSpinbox->state & State_Enabled);
                 ItemStates state = (isDisabled) ? SS_Disabled : SS_Active;
                 if (optionSpinbox->state & State_HasFocus)
                     state |= SS_Selected;
-                m_private->drawMultiPartItem(SM_BoxFrame, painter, spinboxEditorRect, state);
+                //Draw the rounded border of edit field frame under button, half spin button width
+                //Label drawn to spinboxEditorRect
+                m_private->drawMultiPartItem(SM_BoxFrame, painter, spinboxEditorRect.adjusted((-0.5*spinboxButtonDownRect.width()),0,0,0), state);
 
+
+                QStyle::State buttonState;
                 //Buttons
                 if (optionSpinbox->subControls & SC_SpinBoxUp) {
-                    copy.subControls = SC_SpinBoxUp;
                     if (!(optionSpinbox->stepEnabled & QAbstractSpinBox::StepUpEnabled))
-                        copy.state &= ~State_Enabled;
+                        buttonState &= ~State_Enabled;
                     if (optionSpinbox->activeSubControls == SC_SpinBoxUp && (optionSpinbox->state & State_Sunken)) {
-                        copy.state |= State_On;
-                        copy.state |= State_Sunken;
+                        buttonState |= State_On;
+                        buttonState |= State_Sunken;
                     } else {
-                        copy.state |= State_Raised;
-                        copy.state &= ~State_Sunken;
+                        buttonState |= State_Raised;
+                        buttonState &= ~State_Sunken;
                     }
-                    const bool isPressed = (copy.state & State_Sunken);
+                    const bool isPressed = (buttonState & State_Sunken);
                     ItemStates upButtonState = (isPressed) ? ItemStates(SS_Pressed  | SS_Active) : ItemStates(SS_Active);
                     if (optionSpinbox->direction == Qt::RightToLeft)
                         upButtonState = upButtonState | SS_Flipped;
@@ -1223,23 +1281,22 @@
                         upButtonState = upButtonState | SS_Flipped | SS_Mirrored;
                     if (optionSpinbox->state & State_HasFocus)
                         upButtonState |= SS_Selected;
-                    if (!(copy.state & State_Enabled))
+                    if (!(optionSpinbox->stepEnabled & QAbstractSpinBox::StepUpEnabled))
                         upButtonState |= SS_Disabled;
                     m_private->drawItem(SP_BoxButton, painter, spinboxButtonUpRect, upButtonState);
                 }
 
                 if (optionSpinbox->subControls & SC_SpinBoxDown) {
-                    copy.subControls = SC_SpinBoxDown;
                     if (!(optionSpinbox->stepEnabled & QAbstractSpinBox::StepDownEnabled))
-                        copy.state &= ~State_Enabled;
+                        buttonState &= ~State_Enabled;
                     if (optionSpinbox->activeSubControls == SC_SpinBoxDown && (optionSpinbox->state & State_Sunken)) {
-                        copy.state |= State_On;
-                        copy.state |= State_Sunken;
+                        buttonState |= State_On;
+                        buttonState |= State_Sunken;
                     } else {
-                        copy.state |= State_Raised;
-                        copy.state &= ~State_Sunken;
+                        buttonState |= State_Raised;
+                        buttonState &= ~State_Sunken;
                     }
-                    const bool isPressed = (copy.state & State_Sunken);
+                    const bool isPressed = (buttonState & State_Sunken);
                     ItemStates downButtonState = (isPressed) ? ItemStates(SS_Pressed  | SS_Active) : ItemStates(SS_Active);
                     if (optionSpinbox->direction == Qt::RightToLeft)
                         downButtonState = downButtonState;
@@ -1247,7 +1304,7 @@
                         downButtonState = downButtonState | SS_Mirrored;
                     if (optionSpinbox->state & State_HasFocus)
                         downButtonState |= SS_Selected;
-                    if (!(copy.state & State_Enabled))
+                    if (!(optionSpinbox->stepEnabled & QAbstractSpinBox::StepDownEnabled))
                         downButtonState |= SS_Disabled;
                     m_private->drawItem(SP_BoxButton, painter, spinboxButtonDownRect, downButtonState);
                 }
@@ -1301,6 +1358,14 @@
     const QRect baseSize = QCommonStyle::subElementRect(element, option, widget);
     QRect elementSize = baseSize;
     switch (element) {
+        case SE_LineEditContents: {
+            qreal metric = 0;
+            m_private->styleManager()->parameter(QLatin1String("hb-param-margin-gene-middle-horizontal"), metric);
+            const int metricValue = metric + 0.5;
+            elementSize = visualRect(
+                option->direction, option->rect, option->rect.adjusted(metricValue, 0, 0, 0));
+            }
+            break;
         case SE_ItemViewItemText: {
             if (const QStyleOptionMenuItem *menuItem = qstyleoption_cast<const QStyleOptionMenuItem *>(option)) {
                 elementSize = menuItem->rect;
@@ -1316,17 +1381,27 @@
                 elementSize.setWidth(menuItem->rect.width() - widthMod);
             } else if (const QStyleOptionViewItemV4 *itemView = qstyleoption_cast<const QStyleOptionViewItemV4 *>(option)) {
                 elementSize = itemView->rect;
-                const QRect iconRect = subElementRect(SE_ItemViewItemDecoration, option, widget);
-                const QRect checkBoxRect = subElementRect(SE_ViewItemCheckIndicator, option, widget);
-                const int indicatorSpacing = proxy()->pixelMetric(PM_LayoutHorizontalSpacing, option, widget);
-                int totalXMod = qMax(0, qMax((checkBoxRect.isValid() ? checkBoxRect.topRight().x() : 0),
-                                     (iconRect.isValid() ? iconRect.topRight().x() : 0)));
-                const int widthMod = checkBoxRect.width() + iconRect.width() + indicatorSpacing;
-                totalXMod = (itemView->direction == Qt::LeftToRight) ? qMax(0, totalXMod - elementSize.topLeft().x()): 0;
-                totalXMod += indicatorSpacing;
-                elementSize.translate(totalXMod, 0);
-                elementSize.setWidth(itemView->rect.width() - widthMod);
-                elementSize = visualRect(itemView->direction, itemView->rect, elementSize);
+                if (itemView->decorationPosition == QStyleOptionViewItem::Left ||
+                    itemView->decorationPosition == QStyleOptionViewItem::Right) {
+                    const QRect iconRect = subElementRect(SE_ItemViewItemDecoration, option, widget);
+                    const QRect checkBoxRect = subElementRect(SE_ViewItemCheckIndicator, option, widget);
+                    const int indicatorSpacing = proxy()->pixelMetric(PM_LayoutHorizontalSpacing, option, widget);
+                    int totalXMod = qMax(0, qMax((checkBoxRect.isValid() ? checkBoxRect.topRight().x() : 0),
+                                         (iconRect.isValid() ? iconRect.topRight().x() : 0)));
+                    const int widthMod = checkBoxRect.width() + iconRect.width() + indicatorSpacing;
+                    totalXMod = (itemView->direction == Qt::LeftToRight) ? qMax(0, totalXMod - elementSize.topLeft().x()): 0;
+                    totalXMod += indicatorSpacing;
+                    elementSize.translate(totalXMod, 0);
+                    elementSize.setWidth(itemView->rect.width() - widthMod);
+                    elementSize = visualRect(itemView->direction, itemView->rect, elementSize);
+                } else {
+                    const QRect iconRect = subElementRect(SE_ItemViewItemDecoration, option, widget);
+                    const bool decoratorOnTop = (itemView->decorationPosition == QStyleOptionViewItem::Top);
+                    if (decoratorOnTop)
+                        elementSize.translate(0, iconRect.height());
+                    else
+                        elementSize.translate(0, -iconRect.height());
+                }
             }
             break;
         }
@@ -1423,16 +1498,28 @@
                         QRect frameRect = QRect(cmb->rect);
                         int frameWidth = pixelMetric(PM_DefaultFrameWidth, cmb, widget);
                         int maxRight = cmb->rect.height() - 2 * frameWidth;
-                        frameRect.adjust(0, 0, -maxRight, 0);
+                        if(cmb->direction == Qt::RightToLeft) {
+                            frameRect.adjust(+ 0.25 * buttonWidth, 0, -0.25 * buttonWidth, 0);
+                        }else{
+                            frameRect.adjust(0, 0, -maxRight-4, 0);
+                        }
                         elementSize = frameRect;
                         break;
                     }
                     case SC_ComboBoxEditField: {
-                        const int withFrameX = cmb->rect.x() + cmb->rect.width() - frameThickness - buttonSize.width();
+                        int withFrameX = 0;
+                        int offSet = 0;
+                        if(cmb->direction == Qt::RightToLeft) {
+                            withFrameX = cmb->rect.x() + cmb->rect.width() - frameThickness;
+                            offSet = buttonWidth;
+                        }
+                        else{
+                            withFrameX = cmb->rect.x() + cmb->rect.width() - frameThickness - buttonSize.width();
+                        }
                         elementSize = QRect(
-                            frameThickness,
+                            frameThickness + offSet,
                             frameThickness - 2,
-                            withFrameX - frameThickness,
+                            withFrameX - frameThickness - offSet,
                             cmb->rect.height() - 2 * frameThickness );
                         break;
                     }
@@ -1648,27 +1735,32 @@
         case CC_SpinBox: {
             if (const QStyleOptionSpinBox *spinbox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
                 const int buttonIconSize = pixelMetric(PM_ButtonIconSize);
-                const int buttonWidth = qMax(spinbox->rect.height(), buttonIconSize);
+                // Spinbox buttons should be no larger than one fourth of total width.
+                const int maxSize = qMax(spinbox->rect.width() / 4, buttonIconSize + 4); //@magic
+                QSize buttonSize;
+                buttonSize.setHeight(qMin(maxSize, qMax(8, spinbox->rect.height())));
+                buttonSize.setWidth(buttonSize.height()); //make buttons square
+
                 switch (sc) {
                     case SC_SpinBoxFrame:
-                         elementSize = option->rect.adjusted(0, 0, -buttonWidth + 5, 0);
+                         elementSize = option->rect.adjusted(0, 0, -buttonSize.width() + 5, 0); //@magic
                          break;
                     case SC_SpinBoxDown: {
                         if (option->direction == Qt::RightToLeft)
-                            elementSize = QRect(option->rect.right() - buttonWidth, option->rect.y(),buttonWidth, option->rect.height());
+                            elementSize = QRect(option->rect.right() - buttonSize.width(), option->rect.y(), buttonSize.width(), option->rect.height());
                         else
-                            elementSize = QRect( option->rect.x(), option->rect.y(), buttonWidth,option->rect.height());
+                            elementSize = QRect(option->rect.x(), option->rect.y(), buttonSize.width(), option->rect.height());
                     }
                     break;
                     case SC_SpinBoxUp: {
                         if (option->direction == Qt::RightToLeft)
-                            elementSize = QRect( option->rect.x(), option->rect.y(), buttonWidth,option->rect.height());
+                            elementSize = QRect(option->rect.x(), option->rect.y(), buttonSize.width(), option->rect.height());
                         else
-                            elementSize = QRect(option->rect.right() - buttonWidth,option->rect.y(),buttonWidth,option->rect.height());
+                            elementSize = QRect(option->rect.right() - buttonSize.width(), option->rect.y(), buttonSize.width(), option->rect.height());
                     }
                     break;
                     case SC_SpinBoxEditField:
-                        elementSize = option->rect.adjusted(buttonWidth, 0, -buttonWidth, 0);
+                        elementSize = option->rect.adjusted(buttonSize.width(), 0, -buttonSize.width(), 0);
                         break;
                     default:
                         break;
@@ -2195,6 +2287,8 @@
 
 void QHbStyle::polish(QWidget *widget)
 {
+    QCommonStyle::polish(widget);
+
     if (!widget)
         return;
 
@@ -2211,8 +2305,7 @@
     }
 
     m_private->polishFont(widget);
-
-    QCommonStyle::polish(widget);
+    m_private->polishPalette(widget);
 
 #ifndef QT_NO_PROGRESSBAR
     if (qobject_cast<QProgressBar *>(widget))
@@ -2228,66 +2321,6 @@
 void QHbStyle::polish(QPalette &palette)
 {
     QCommonStyle::polish(palette);
-
-    palette.setBrush(QPalette::Disabled, QPalette::WindowText, QColor(QRgb(0xff808080)));
-    palette.setBrush(QPalette::Disabled, QPalette::Button, QColor(QRgb(0xffdddfe4)));
-    palette.setBrush(QPalette::Disabled, QPalette::Light, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Disabled, QPalette::Midlight, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Disabled, QPalette::Dark, QColor(QRgb(0xff555555)));
-    palette.setBrush(QPalette::Disabled, QPalette::Mid, QColor(QRgb(0xffc7c7c7)));
-    palette.setBrush(QPalette::Disabled, QPalette::Text, QColor(QRgb(0xffc7c7c7)));
-    palette.setBrush(QPalette::Disabled, QPalette::BrightText, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Disabled, QPalette::ButtonText, QColor(QRgb(0xff808080)));
-    palette.setBrush(QPalette::Disabled, QPalette::Base, QColor(QRgb(0xffefefef)));
-    palette.setBrush(QPalette::Disabled, QPalette::AlternateBase, palette.color(QPalette::Disabled, QPalette::Base).darker(110));
-    palette.setBrush(QPalette::Disabled, QPalette::Window, QColor(QRgb(0xffefefef)));
-    palette.setBrush(QPalette::Disabled, QPalette::Shadow, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Disabled, QPalette::Highlight, QColor(QRgb(0xff567594)));
-    palette.setBrush(QPalette::Disabled, QPalette::HighlightedText, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Disabled, QPalette::Link, QColor(QRgb(0xff0000ee)));
-    palette.setBrush(QPalette::Disabled, QPalette::LinkVisited, QColor(QRgb(0xff52188b)));
-    palette.setBrush(QPalette::Disabled, QPalette::ToolTipBase, QColor(QRgb(0xff0000ee)));
-    palette.setBrush(QPalette::Disabled, QPalette::ToolTipText, QColor(QRgb(0xff52188b)));
-
-    palette.setBrush(QPalette::Active, QPalette::WindowText, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Active, QPalette::Button, QColor(QRgb(0xffdddfe4)));
-    palette.setBrush(QPalette::Active, QPalette::Light, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Active, QPalette::Midlight, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Active, QPalette::Dark, QColor(QRgb(0xff555555)));
-    palette.setBrush(QPalette::Active, QPalette::Mid, QColor(QRgb(0xffc7c7c7)));
-    palette.setBrush(QPalette::Active, QPalette::Text, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Active, QPalette::BrightText, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Active, QPalette::ButtonText, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Active, QPalette::Base, QColor(QRgb(0xE4E4E4)));
-    palette.setBrush(QPalette::Active, QPalette::AlternateBase, palette.color(QPalette::Active, QPalette::Base).darker(110));
-    palette.setBrush(QPalette::Active, QPalette::Window, QColor(QRgb(0xffefefef)));
-    palette.setBrush(QPalette::Active, QPalette::Shadow, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Active, QPalette::Highlight, QColor(QRgb(0xffE4E4E4)));
-    palette.setBrush(QPalette::Active, QPalette::HighlightedText, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Active, QPalette::Link, QColor(QRgb(0xff0000ee)));
-    palette.setBrush(QPalette::Active, QPalette::LinkVisited, QColor(QRgb(0xff52188b)));
-    palette.setBrush(QPalette::Active, QPalette::ToolTipBase, QColor(QRgb(0xff0000ee)));
-    palette.setBrush(QPalette::Active, QPalette::ToolTipText, QColor(QRgb(0xff52188b)));
-
-    palette.setBrush(QPalette::Inactive, QPalette::WindowText, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Inactive, QPalette::Button, QColor(QRgb(0xffdddfe4)));
-    palette.setBrush(QPalette::Inactive, QPalette::Light, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Inactive, QPalette::Midlight, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Inactive, QPalette::Dark, QColor(QRgb(0xff555555)));
-    palette.setBrush(QPalette::Inactive, QPalette::Mid, QColor(QRgb(0xffc7c7c7)));
-    palette.setBrush(QPalette::Inactive, QPalette::Text, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Inactive, QPalette::BrightText, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Inactive, QPalette::ButtonText, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Inactive, QPalette::Base, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Inactive, QPalette::AlternateBase, palette.color(QPalette::Inactive, QPalette::Base).darker(110));
-    palette.setBrush(QPalette::Inactive, QPalette::Window, QColor(QRgb(0xffefefef)));
-    palette.setBrush(QPalette::Inactive, QPalette::Shadow, QColor(QRgb(0xff000000)));
-    palette.setBrush(QPalette::Inactive, QPalette::Highlight, QColor(QRgb(0xff678db2)));
-    palette.setBrush(QPalette::Inactive, QPalette::HighlightedText, QColor(QRgb(0xffffffff)));
-    palette.setBrush(QPalette::Inactive, QPalette::Link, QColor(QRgb(0xff0000ee)));
-    palette.setBrush(QPalette::Inactive, QPalette::LinkVisited, QColor(QRgb(0xff52188b)));
-    palette.setBrush(QPalette::Inactive, QPalette::ToolTipBase, QColor(QRgb(0xff0000ee)));
-    palette.setBrush(QPalette::Inactive, QPalette::ToolTipText, QColor(QRgb(0xff52188b)));
 }
 
 void QHbStyle::unpolish(QWidget *widget)
@@ -2391,19 +2424,14 @@
             break;
         }
         case SP_ComputerIcon: {
-            iconName = QLatin1String("qtg_mono_mobile");
-            break;
-        }
-        case SP_DriveFDIcon: {
+            iconName = QLatin1String("qtg_small_mobile");
             break;
         }
-        case SP_DriveHDIcon: {
-            break;
-        }
-        case SP_DriveCDIcon: {
-            break;
-        }
+        case SP_DriveFDIcon:
+        case SP_DriveHDIcon:
+        case SP_DriveCDIcon:
         case SP_DriveDVDIcon: {
+            iconName = QLatin1String("qtg_large_mmc");
             break;
         }
         case SP_DriveNetIcon: {
@@ -2419,15 +2447,18 @@
             break;
         }
         case SP_FileIcon: {
+            iconName = QLatin1String("qtg_large_notes");
             break;
         }
         case SP_FileLinkIcon: {
             break;
         }
         case SP_ToolBarHorizontalExtensionButton: {
+            iconName = QLatin1String("qtg_mono_more");
             break;
         }
         case SP_ToolBarVerticalExtensionButton: {
+            iconName = QLatin1String("qtg_mono_more");
             break;
         }
         case SP_FileDialogStart: {
@@ -2446,6 +2477,7 @@
             break;
         }
         case SP_FileDialogInfoView: {
+            iconName = QLatin1String("qtg_large_info");
             break;
         }
         case SP_FileDialogContentsView: {
@@ -2461,12 +2493,14 @@
             break;
         }
         case SP_DialogOkButton: {
+            iconName = QLatin1String("qtg_large_ok");
             break;
         }
         case SP_DialogCancelButton: {
             break;
         }
         case SP_DialogHelpButton: {
+            iconName = QLatin1String("qtg_large_help");
             break;
         }
         case SP_DialogOpenButton: {
@@ -2479,12 +2513,14 @@
             break;
         }
         case SP_DialogApplyButton: {
+            iconName = QLatin1String("qtg_large_ok");
             break;
         }
         case SP_DialogResetButton: {
             break;
         }
         case SP_DialogDiscardButton: {
+            iconName = QLatin1String("qtg_small_fail");
             break;
         }
         case SP_DialogYesButton: {
@@ -2564,7 +2600,7 @@
 
     QIcon icon;
     if (!iconName.isNull()) {
-        HbIcon* hbicon = q_check_ptr(new HbIcon(iconName));
+        HbIcon* hbicon = new HbIcon(iconName);
         hbicon->setSize(iconRect.size());
         icon =  QIcon(hbicon->qicon());
         delete hbicon;
@@ -2645,9 +2681,9 @@
                          }
                      }
                      if (!alreadyAnimated) {
-                         QHbStyleAnimation* target = q_check_ptr(new QHbStyleAnimation(const_cast<QProgressBar*>(bar)));
+                         QHbStyleAnimation* target = new QHbStyleAnimation(const_cast<QProgressBar*>(bar));
                          target->createAnimationIcon(CE_ProgressBarContents, bar->orientation());
-                         QPropertyAnimation* animation = q_check_ptr(new QPropertyAnimation(target, "point"));
+                         QPropertyAnimation* animation = new QPropertyAnimation(target, "point");
                          animation->setLoopCount(-1); //run until stopped
                          const int chunk = pixelMetric(PM_ProgressBarChunkWidth, option, widget)-1;
                          if (bar->orientation()== Qt::Horizontal) {
@@ -2769,11 +2805,11 @@
             break;
         }
         case SP_TreeViewExpanded: {
-            iconName = QLatin1String("qtg_small_hl_opened");
+            iconName = QLatin1String("qtg_small_expand");
             break;
         }
         case SP_TreeViewCollapsed: {
-            iconName = QLatin1String("qtg_small_hl_closed");
+            iconName = QLatin1String("qtg_small_collapse");
             break;
         }
         case SP_SubMenuIndicator:
@@ -2782,7 +2818,7 @@
         }
     }
     if (!iconName.isNull() && !rect.isEmpty()) {
-        HbIcon *icon = q_check_ptr(new HbIcon(iconName));
+        HbIcon *icon = new HbIcon(iconName);
         icon->setSize(rect.size());
         if (color.spec() != QColor::Invalid)
             icon->setColor(color);
@@ -2809,8 +2845,8 @@
 {
     //Q_Q(QHbStyle);
 
-    if (!m_frameDrawer)
-        m_frameDrawer = q_check_ptr(new HbFrameDrawer());
+    if (m_frameDrawer.isNull())
+        m_frameDrawer.reset(new HbFrameDrawer());
 
     HbFrameDrawer::FrameType frameType = HbFrameDrawer::Undefined;
     QString frameName;
@@ -2858,28 +2894,22 @@
             frameType = HbFrameDrawer::NinePieces;
             break;
         }
-        case SM_ItemViewHighlight: {
-            frameName = QLatin1String("qtg_fr_list_highlight");
-            frameType = HbFrameDrawer::NinePieces;
-            break;
-        }
         case SM_ItemViewItem: {
             if (state & SS_Pressed)
                 frameName = QLatin1String("qtg_fr_list_pressed");
             else if (state & SS_Focused)
                 frameName = QLatin1String("qtg_fr_list_highlight");
-            else
-                frameName = QLatin1String("qtg_fr_list_normal");
             frameType = HbFrameDrawer::NinePieces;
             styleManager()->parameter(QLatin1String("hb-param-background-list-main"), border);
             break;
         }
+        case SM_TextEdit: //@todo: fallthrough for now, since no specific graphic for editors in releases
         case SM_LineEdit: {
             styleManager()->parameter(QLatin1String("hb-param-background-editor"), border);
             if (state & SS_Selected)
-                frameName = QLatin1String("qtg_fr_editor_highlight");
+                frameName = QLatin1String("qtg_fr_lineedit_highlight");
             else
-                frameName = QLatin1String("qtg_fr_editor_normal");
+                frameName = QLatin1String("qtg_fr_lineedit_normal");
             frameType = HbFrameDrawer::NinePieces;
             break;
         }
@@ -2918,7 +2948,7 @@
             break;
         }
         case SM_Panel: {
-            frameName = QLatin1String("qtg_fr_settingform");
+            frameName = QLatin1String("qtg_fr_groupbox_normal");
             frameType = HbFrameDrawer::NinePieces;
             styleManager()->parameter(QLatin1String("hb-param-background-list-main"), border);
             break;
@@ -2945,6 +2975,16 @@
             }
             break;
         }
+        //@todo: enable separate graphic for texteditor. Graphic was not included in the wk12 release.
+        /*case SM_TextEdit: {
+            styleManager()->parameter(QLatin1String("hb-param-background-editor"), border);
+            if (state & SS_Selected)
+                frameName = QLatin1String("qtg_fr_textedit_highlight");
+            else
+                frameName = QLatin1String("qtg_fr_textedit_normal");
+            frameType = HbFrameDrawer::NinePieces;
+            break;
+        }*/
         case SM_ToolButton: {
             frameType = HbFrameDrawer::ThreePiecesHorizontal;
             frameGraphicsHeader = QLatin1String("qtg_fr_tb_h_");
@@ -3040,6 +3080,15 @@
             }
             break;
         }
+        case SM_TableItem: {
+            if (state & SS_Pressed)
+                frameName = QLatin1String("qtg_fr_grid_pressed");
+            else if (state & SS_Focused)
+                frameName = QLatin1String("qtg_fr_grid_highlight");
+            frameType = HbFrameDrawer::NinePieces;
+            styleManager()->parameter(QLatin1String("hb-param-background-list-main"), border);
+            break;
+        }
         case SM_TabShape: {
             if (state & SS_Horizontal) {
                 frameType = HbFrameDrawer::ThreePiecesHorizontal;
@@ -3075,12 +3124,6 @@
                 frameGraphicsFooter = QLatin1String("normal");
             break;
         }
-        case SM_TextEdit: { //@todo: combine this and  case SM_LineEdit to "case SM_TextEditor"?
-            styleManager()->parameter(QLatin1String("hb-param-background-editor"), border);
-            frameName = QLatin1String("qtg_fr_editor");
-            frameType = HbFrameDrawer::NinePieces;
-            break;
-        }
         case SM_ToolBarButton: {
             if (state & SS_Horizontal) {
                 frameType = HbFrameDrawer::ThreePiecesHorizontal;
@@ -3110,6 +3153,13 @@
             styleManager()->parameter(QLatin1String("hb-param-background-button"), border);
             break;
         }
+        case SM_ToolBarExtension:{
+//            fillRect = true;
+//            styleManager()->parameter(QLatin1String("hb-param-background-editor"), border);
+            frameName = QLatin1String("qtg_fr_tb_ext");
+            frameType = HbFrameDrawer::NinePieces;
+            }
+            break;
         case SM_ToolTip: {
             fillRect = true;
             frameType = HbFrameDrawer::NinePieces;
@@ -3117,7 +3167,6 @@
             break;
         }
         case SM_HeaderItem:
-        case SM_TableItem:
         case SM_ThemeBackground:
         case SM_ToolBar:
         default: {
@@ -3277,7 +3326,7 @@
         valueFound = styleManager()->parameter(QLatin1String("hb-param-text-height-tiny"), fontSize);
     }
 
-    HbFontSpec *fontSpec = q_check_ptr(new HbFontSpec(fontRole));
+    HbFontSpec *fontSpec = new HbFontSpec(fontRole);
     if (valueFound) {
         fontSpec->setTextHeight(fontSize);
         QFont widgetFont = fontSpec->font();
@@ -3287,4 +3336,29 @@
     delete fontSpec;
 }
 
+void QHbStylePrivate::polishPalette(QWidget *widget)
+{
+    QPalette widgetPalette = widget->palette();
+    if (false
+#ifndef QT_NO_TEXTEDIT
+        || qobject_cast<QTextEdit *>(widget)
+#endif
+    ) {
+        widgetPalette.setColor(QPalette::Active, QPalette::Highlight, HbColorScheme::color("qtc_lineedit_marker_normal"));
+        widgetPalette.setColor(QPalette::Active, QPalette::HighlightedText, HbColorScheme::color("qtc_lineedit_selected"));
+        widgetPalette.setColor(QPalette::Active, QPalette::Text, HbColorScheme::color("qtc_lineedit_normal"));
+        //QTextEdits have specific graphic in QHbStyle for background
+        widgetPalette.setColor(QPalette::Active, QPalette::Base, Qt::transparent);
+    } else if (false
+#ifndef QT_NO_LINEEDIT
+        || qobject_cast<QLineEdit *>(widget)
+#endif
+        ) {
+        widgetPalette.setColor(QPalette::Active, QPalette::Highlight, HbColorScheme::color("qtc_lineedit_marker_normal"));
+        widgetPalette.setColor(QPalette::Active, QPalette::HighlightedText, HbColorScheme::color("qtc_lineedit_selected"));
+        widgetPalette.setColor(QPalette::Active, QPalette::Text, HbColorScheme::color("qtc_lineedit_normal"));
+    }
+    widget->setPalette(widgetPalette);
+}
+
 QT_END_NAMESPACE
diff -r 71781823f776 -r 06b8e2af4411 qhbstyle/qhbstyle_p.h
--- a/qhbstyle/qhbstyle_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qhbstyle/qhbstyle_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -65,7 +65,6 @@
     SM_GroupBox,
     SM_GroupBoxTitle,
     SM_HeaderItem,
-    SM_ItemViewHighlight,
     SM_ItemViewItem,
     SM_LineEdit,
     SM_ListParent,
@@ -88,6 +87,7 @@
     SM_ToolBarButton,
     SM_ToolButton,
     SM_ToolTip,
+    SM_ToolBarExtension,
 };
 
 enum ItemState {
@@ -140,13 +140,12 @@
     bool isDialog(const QWidget *widget);
     bool hbParameter(const QString &parameterName, int &value);
     void polishFont(QWidget *widget);
+    void polishPalette(QWidget *widget);
 
 private:
     HbStyle *m_styleManager;
-    HbFrameDrawer *m_frameDrawer;
-    QParallelAnimationGroup* m_animationGroup;
-
-    //QHbStyle *q_ptr;
+    QScopedPointer<HbFrameDrawer> m_frameDrawer;
+    QScopedPointer<QParallelAnimationGroup> m_animationGroup;
 };
 
 QT_END_NAMESPACE
diff -r 71781823f776 -r 06b8e2af4411 qhbstyle/qhbstyleanimation.cpp
--- a/qhbstyle/qhbstyleanimation.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qhbstyle/qhbstyleanimation.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -36,13 +36,11 @@
 
 QHbStyleAnimation::~QHbStyleAnimation()
 {
-    delete m_animationIcon;
-    delete m_mask;
 }
 
 const QWidget* QHbStyleAnimation::target()const
 {
-    return m_target;
+    return m_target.data();
 }
 
 QPoint QHbStyleAnimation::point()
@@ -69,11 +67,9 @@
         drawer.setFrameType(HbFrameDrawer::ThreePiecesVertical);
     }
     drawer.setFillWholeRect(true);
-    if (m_mask)
-        delete m_mask;
-    m_mask = new QPixmap(m_target->rect().size());
+    m_mask.reset(new QPixmap(m_target->rect().size()));
     m_mask->fill(Qt::transparent);
-    QPainter p(m_mask);
+    QPainter p(m_mask.data());
     drawer.paint(&p, m_target->rect());
     p.end();
 
@@ -92,7 +88,7 @@
     }
 
     if (!iconName.isNull() && !m_target->rect().isEmpty()) {
-        HbIcon* icon = q_check_ptr(new HbIcon(iconName));
+        HbIcon* icon = new HbIcon(iconName);
         if(orientation == Qt::Horizontal)
             icon->setSize(QSize(icon->width(), m_target->rect().height()));
         else
@@ -103,15 +99,12 @@
         const qreal rectHeight = m_target->rect().height();
         const qreal iconHeight = icon->height();
 
-        if (m_animationIcon)
-            delete m_animationIcon;
-
         const int animationWidth = (orientation == Qt::Horizontal) ?  int(rectWidth + iconWidth) : int(rectWidth);
         const int animationHeight = (orientation == Qt::Horizontal) ?  int(rectHeight) : int(rectHeight + iconHeight);
 
-        m_animationIcon = q_check_ptr(new QPixmap(animationWidth, animationHeight));
+        m_animationIcon.reset(new QPixmap(animationWidth, animationHeight));
         m_animationIcon->fill(Qt::transparent);
-        QPainter p(m_animationIcon);
+        QPainter p(m_animationIcon.data());
 
         if (orientation == Qt::Horizontal) {
             if (iconWidth > 0)
diff -r 71781823f776 -r 06b8e2af4411 qhbstyle/qhbstyleanimation.h
--- a/qhbstyle/qhbstyleanimation.h	Thu May 27 13:42:11 2010 +0300
+++ b/qhbstyle/qhbstyleanimation.h	Fri Jun 11 14:26:25 2010 +0300
@@ -47,10 +47,10 @@
     void paintAnimation(QPainter *painter);
 
 private:
-    QPixmap* m_animationIcon;
-    QWidget* m_target;
+    QScopedPointer<QPixmap> m_animationIcon;
+    QScopedPointer<QWidget> m_target;
     QPoint m_point;
-    QPixmap* m_mask;
+    QScopedPointer<QPixmap> m_mask;
 };
 
 #endif // QHBSTYLEANIMATION_H
diff -r 71781823f776 -r 06b8e2af4411 qthighway/examples/appmgrclient/DrmTestFiles.zip
Binary file qthighway/examples/appmgrclient/DrmTestFiles.zip has changed
diff -r 71781823f776 -r 06b8e2af4411 qthighway/examples/appmgrclient/src/appmgrclient.cpp
--- a/qthighway/examples/appmgrclient/src/appmgrclient.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qthighway/examples/appmgrclient/src/appmgrclient.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -145,7 +145,7 @@
     mSynchronous->setCheckState(Qt::Checked);
     mGenericSend->setCheckState(Qt::Checked);  // Apply one send() for both embedded/non-embedded
     
-    mReqArg = new QLineEdit("0");
+    mReqArg = new QLineEdit("?");
     
     mTextRetValue = new QLineEdit("no ret value set");
 
@@ -408,12 +408,6 @@
 
     qDebug("%s::isRunning=%d", qPrintable(mAppName), testRunning("com.nokia.services.serviceapp", IDIAL));
     
-    
-    /*
-    mReqArg->setText("77777"); 
-    qDebug() << mAppName <<  " test1 second call";
-    test(&req1, IDIAL, OPERATION1);
-    */
 }
 
 
@@ -475,8 +469,8 @@
     qDebug() << mAppName << " test3 START";
     
     test(&req3,IDIAL,ERR_OPERATION1);
-    test(&req3,ERR_IDIAL,ERR_OPERATION1);
-    test(&req3,ERR_IDIAL,ERR_OPERATION1);
+    // test(&req3,ERR_IDIAL,ERR_OPERATION1);
+    // test(&req3,ERR_IDIAL,ERR_OPERATION1);
     
     qDebug() << mAppName << " test3 END";
     
@@ -595,10 +589,17 @@
 {
     qDebug() << mAppName << " test6 START";
 
-    QUrl uri("testto://authority?param1=value1&param1=value2"); 
+    QUrl uri("test2to://authority?param1=value1&param1=value2"); 
+    // QUrl uri(mReqArg->text()); 
     qDebug() << mAppName << " Uri=" << uri.toString();
     qDebug() << mAppName << " isValid=" << uri.isValid();
     qDebug() << mAppName << " Uri authority=" << uri.authority();
+    
+    if (!uri.isValid())
+    {
+        qDebug() << mAppName << " Invalid URI " << mReqArg->text();
+        return;
+    }
 
     QList<XQAiwInterfaceDescriptor> uriHandlers = appmgr.list(uri);
     // Note : Only services supporting custom property are returned
@@ -613,7 +614,7 @@
     if (!req6)
     {
         req6 = appmgr.create(uri);
-        connectSignals(req6); 
+        connectSignals(req6);
     }
 
     test(&req6, uri.toString());
@@ -630,8 +631,8 @@
     // Create test file
     createTestFile("C:/data/Others", "test.txt");
 
-    
-    QFile file("C:/data/Others/test.txt");
+    // Copy files from DrmTestFiles.zip into correct location
+    QFile file("C:/data/Others/one.jpg");
     qDebug() << mAppName << " File=" << file.fileName();
     qDebug() << mAppName << " exists=" << file.exists();
 
@@ -660,7 +661,12 @@
     qDebug() << mAppName << " test8 START";
 
     // E0022E73 == ServiceApp
-    QUrl uri("http://www.nokia.com"); 
+    QUrl uri("http://www.nokia.com");
+    
+    // Copy files from DrmTestFiles.zip into correct location
+    // Uncomment for "file" scheme testing
+    // QUrl uri("file:///C:/data/Others/one.jpg");
+    
     qDebug() << mAppName << " Uri=" << uri.toString();
     qDebug() << mAppName << " isValid=" << uri.isValid();
     qDebug() << mAppName << " Uri authority=" << uri.authority();
diff -r 71781823f776 -r 06b8e2af4411 qthighway/examples/serviceapp/service_conf.xml
--- a/qthighway/examples/serviceapp/service_conf.xml	Thu May 27 13:42:11 2010 +0300
+++ b/qthighway/examples/serviceapp/service_conf.xml	Fri Jun 11 14:26:25 2010 +0300
@@ -14,7 +14,7 @@
      <name>com.nokia.symbian.IUriView</name>
      <version>1.0</version>
      <description>Interface for showing URIs</description>
-     <customproperty key="schemes">testto</customproperty>
+     <customproperty key="schemes">testto,test2to</customproperty>
      <customproperty key="deprecatedsn">com.nokia.services.serviceapp</customproperty>
   </interface>
   <interface>
diff -r 71781823f776 -r 06b8e2af4411 qthighway/examples/serviceapp/src/serviceapp.cpp
--- a/qthighway/examples/serviceapp/src/serviceapp.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qthighway/examples/serviceapp/src/serviceapp.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -33,6 +33,7 @@
 #include <QLineEdit>
 #include <QListView>
 #include <QMessageBox>
+#include <QUrl>
 #include <xqsharablefile.h>
 
 #include "serviceapp.h"
@@ -741,7 +742,18 @@
 bool NewUriService::view(const QString& uri)
 {
     XQSERVICE_DEBUG_PRINT("NewUriService::view(1)");
-    return view(uri, true);
+    QUrl url(uri);
+    XQSERVICE_DEBUG_PRINT("NewUriService::scheme=%s", qPrintable(url.scheme()));
+    if (url.scheme() == QLatin1String("testto"))
+    {
+        XQSERVICE_DEBUG_PRINT("NewUriService::return true");
+        return view(uri, true);
+    }
+    else
+    {
+        XQSERVICE_DEBUG_PRINT("NewUriService::return false");
+        return view(uri, false);
+    }
 }
 
 bool NewUriService::view(const QString& uri, bool retValue)
@@ -763,8 +775,10 @@
         mAsyncReqIds.insertMulti(info.clientSecureId(), setCurrentRequestAsync());
         connect(this, SIGNAL(clientDisconnected()), this, SLOT(handleClientDisconnect()));
     }
-
-    return retValue;
+    else
+    {
+        return retValue;
+    }
 }
 
 void NewUriService::handleClientDisconnect()
diff -r 71781823f776 -r 06b8e2af4411 qthighway/xqservice/src/xqaiwrequest.cpp
--- a/qthighway/xqservice/src/xqaiwrequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qthighway/xqservice/src/xqaiwrequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -33,7 +33,8 @@
       currentRequest(NULL),
       errorMsg(),
       errorCode(0),
-      asyncErrorSet(false)
+      completeSignalConnected(false),
+      errorSignalConnected(false)
 {
 
     XQSERVICE_DEBUG_PRINT("XQAiwRequest::XQAiwRequest: %s %s,%d,%x",
@@ -57,7 +58,8 @@
       currentRequest(NULL),
       errorMsg(),
       errorCode(0),
-      asyncErrorSet(false)
+      completeSignalConnected(false),
+      errorSignalConnected(false)
 {
     XQSERVICE_DEBUG_PRINT("XQAiwRequest::XQAiwRequest (uri): %s %s,%x",
                           qPrintable(descriptor.interfaceName()),
@@ -85,7 +87,8 @@
      currentRequest(NULL),
       errorMsg(),
       errorCode(0),
-      asyncErrorSet(false)
+      completeSignalConnected(false),
+      errorSignalConnected(false)
 {
 
    XQSERVICE_DEBUG_PRINT("XQAiwRequest::XQAiwRequest (file): %s %x",
@@ -116,7 +119,8 @@
       currentRequest(NULL),
       errorMsg(),
       errorCode(0),
-      asyncErrorSet(false)
+      completeSignalConnected(false),
+      errorSignalConnected(false)
 {
 
     XQSERVICE_DEBUG_PRINT("XQAiwRequest::XQAiwRequest (file handle): %x",
@@ -139,10 +143,13 @@
 {
     XQSERVICE_DEBUG_PRINT("~XQAiwRequest::XQAiwRequest");
 
-    // Disconnect error
-    if (asyncErrorSet)
+    // Disconnect signals
+    if (completeSignalConnected)
     {
         disconnect(currentRequest, SIGNAL(requestOk(const QVariant&)), this, SLOT(handleAsyncResponse(const QVariant&)));
+    }
+    if (errorSignalConnected)
+    {
         disconnect(currentRequest, SIGNAL(requestError(int,const QString&)), this, SLOT(handleAsyncError(int)));
     }
     
@@ -387,13 +394,18 @@
 
     QStringList list;
     bool res = true;
-    if (!isSynchronous() && !asyncErrorSet)
+    if (!isSynchronous() && !completeSignalConnected)
     {
         // Set async request signals once
         XQSERVICE_DEBUG_PRINT("request::async send");
         connect(currentRequest, SIGNAL(requestOk(const QVariant&)), this, SLOT(handleAsyncResponse(const QVariant&)));
+        completeSignalConnected = true;
+    }
+    if (!errorSignalConnected)
+    {
+        // Connect always error signal  once
         connect(currentRequest, SIGNAL(requestError(int,const QString&)), this, SLOT(handleAsyncError(int)));
-        asyncErrorSet = true;
+        errorSignalConnected = true;
     }
     
     XQSERVICE_DEBUG_PRINT("request::send>>>");
diff -r 71781823f776 -r 06b8e2af4411 qthighway/xqservice/src/xqaiwrequest.h
--- a/qthighway/xqservice/src/xqaiwrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qthighway/xqservice/src/xqaiwrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -108,7 +108,8 @@
     int errorCode;
     QVariant result;  // Client can use results whenever wants
     QList<QAction*> actionList;
-    bool asyncErrorSet;
+    bool completeSignalConnected;
+    bool errorSignalConnected;
     
     };
 
diff -r 71781823f776 -r 06b8e2af4411 qthighway/xqservice/src/xqaiwservicedriver.cpp
--- a/qthighway/xqservice/src/xqaiwservicedriver.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qthighway/xqservice/src/xqaiwservicedriver.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -40,7 +40,8 @@
 XQAiwServiceDriver::XQAiwServiceDriver(const XQAiwInterfaceDescriptor& descriptor, const QString &operation)
     : XQAiwRequestDriver(),
       currentRequest(NULL),
-      asyncErrorSet(false)
+      completeSignalConnected(false),
+      errorSignalConnected(false)
     {
     mErrorMsg = "";
     mDescr = descriptor; 
@@ -58,10 +59,13 @@
 {
     XQSERVICE_DEBUG_PRINT("~XQAiwServiceDriver::XQAiwServiceDriver");
 
-    // Disconnect error
-    if (asyncErrorSet)
+    // Disconnect signals
+    if (completeSignalConnected)
     {
         disconnect(currentRequest, SIGNAL(requestCompleted(const QVariant&)), this, SLOT(handleAsyncResponse(const QVariant&)));
+    }
+    if (errorSignalConnected)
+    {
         disconnect(currentRequest, SIGNAL(requestError(int)), this, SLOT(handleAsyncError(int)));
     }
     
@@ -143,15 +147,19 @@
     
     QStringList list;
     bool res = true;
-    if (!currentRequest->isSynchronous() && !asyncErrorSet)
+    if (!currentRequest->isSynchronous() && !completeSignalConnected)
     {
-        // Async request 
+        // Async request. Connect signal only once
         XQSERVICE_DEBUG_PRINT("request::async send");
         connect(currentRequest, SIGNAL(requestCompleted(const QVariant&)), this, SLOT(handleAsyncResponse(const QVariant&)));
+        completeSignalConnected = true;
+    }
+    if (!errorSignalConnected)
+    {
+        // Connect error signal only once
         connect(currentRequest, SIGNAL(requestError(int)), this, SLOT(handleAsyncError(int)));
-        asyncErrorSet = true;
+        errorSignalConnected = true;
     }
-
     
     XQSERVICE_DEBUG_PRINT("request::send>>>");
     res = currentRequest->send(retValue);  // Result is valid for sync request only
diff -r 71781823f776 -r 06b8e2af4411 qthighway/xqservice/src/xqaiwservicedriver.h
--- a/qthighway/xqservice/src/xqaiwservicedriver.h	Thu May 27 13:42:11 2010 +0300
+++ b/qthighway/xqservice/src/xqaiwservicedriver.h	Fri Jun 11 14:26:25 2010 +0300
@@ -86,7 +86,8 @@
 private:
 
     XQServiceRequest * currentRequest;
-    bool asyncErrorSet;
+    bool completeSignalConnected;
+    bool errorSignalConnected;
     QTranslator translator;
     QString lastLang;
     };
diff -r 71781823f776 -r 06b8e2af4411 qthighway/xqservice/src/xqaiwuridriver.cpp
--- a/qthighway/xqservice/src/xqaiwuridriver.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qthighway/xqservice/src/xqaiwuridriver.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -185,8 +185,7 @@
     QString scheme = uri.scheme();
     return  (scheme.compare(XQURI_SCHEME_ACTIVITY,Qt::CaseInsensitive) == 0 ||
             scheme.compare(XQURI_SCHEME_HTTP,Qt::CaseInsensitive) == 0 ||
-            scheme.compare(XQURI_SCHEME_HTTPS,Qt::CaseInsensitive) == 0 || 
-            scheme.compare(QLatin1String(XQURI_SCHEME_FILE),Qt::CaseInsensitive) == 0);
+            scheme.compare(XQURI_SCHEME_HTTPS,Qt::CaseInsensitive) == 0);
 }
 
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobileextensions/examples/examples.pro
--- a/qtmobileextensions/examples/examples.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobileextensions/examples/examples.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -24,6 +24,7 @@
 SUBDIRS= settingsmanagerex \
          sysinfoex \
          utilsex \
-         keycaptureex 
+         keycaptureex \
+         systemtoneserviceex
 
 symbian:BLD_INF_RULES.prj_exports += "./rom/qtmobileextensionsexamples.iby $$CUSTOMER_VARIANT_APP_LAYER_IBY_EXPORT_PATH(qtmobileextensionsexamples.iby)"
diff -r 71781823f776 -r 06b8e2af4411 qtmobileextensions/examples/systemtoneserviceex/sis/stsqt.pkg
--- a/qtmobileextensions/examples/systemtoneserviceex/sis/stsqt.pkg	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobileextensions/examples/systemtoneserviceex/sis/stsqt.pkg	Fri Jun 11 14:26:25 2010 +0300
@@ -31,12 +31,6 @@
 :"Nokia"
 
 ;Files To Copy...<src> <destination>
-;"/epoc32/release/armv5/udeb/systemtoneservice.dll" -"!:/sys/bin/systemtoneservice.dll"
-;"/epoc32/release/armv5/udeb/stsserver.exe"         -"!:/sys/bin/stsserver.exe"
-
-"/epoc32/release/armv5/udeb/stsserver.exe"         -"!:/sys/bin/stsserver.exe"
-
-;"/epoc32/release/armv5/udeb/xqsystemtoneservice.dll"         -"!:/sys/bin/xqsystemtoneservice.dll"
-"/epoc32/release/armv5/udeb/sts_testapp.exe"         -"!:/sys/bin/sts_testapp.exe"
-"/epoc32/data/z/resource/apps/sts_testapp.rsc"    - "!:\resource\apps\sts_testapp.rsc"
-"/epoc32/data/z/private/10003a3f/import/apps/sts_testapp_reg.rsc"    - "!:\private\10003a3f\import\apps\sts_testapp_reg.rsc"
+"/epoc32/release/armv5/urel/SystemToneServiceEx2.exe"         -"!:/sys/bin/SystemToneServiceEx.exe"
+"/epoc32/data/z/resource/apps/SystemToneServiceEx2.rsc"    - "!:\resource\apps\SystemToneServiceEx2.rsc"
+"/epoc32/data/z/private/10003a3f/import/apps/SystemToneServiceEx2_reg.rsc"    - "!:\private\10003a3f\import\apps\SystemToneServiceEx2_reg.rsc"
diff -r 71781823f776 -r 06b8e2af4411 qtmobileextensions/examples/systemtoneserviceex/ststest.cpp
--- a/qtmobileextensions/examples/systemtoneserviceex/ststest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobileextensions/examples/systemtoneserviceex/ststest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -51,16 +51,16 @@
     callbackCleanTimer.setSingleShot(true);
     connect(&callbackCleanTimer, SIGNAL(timeout()), this, SLOT(cleanCallback()));
     
-    QPushButton *quitButton = new QPushButton(tr("QUIT"));
+    QPushButton *quitButton = new QPushButton("QUIT");
     connect(quitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
 
-    QPushButton *playToneButton = new QPushButton(tr("Play Tone"));
+    QPushButton *playToneButton = new QPushButton("Play Tone");
     connect(playToneButton, SIGNAL(clicked()), this, SLOT(playTone()));
 
-    QPushButton *playAlarmButton = new QPushButton(tr("Play Alarm"));
+    QPushButton *playAlarmButton = new QPushButton("Play Alarm");
     connect(playAlarmButton, SIGNAL(clicked()), this, SLOT(playAlarm()));
 
-    QPushButton *stopAlarmButton = new QPushButton(tr("Stop Alarm"));
+    QPushButton *stopAlarmButton = new QPushButton("Stop Alarm");
     connect(stopAlarmButton, SIGNAL(clicked()), this, SLOT(stopAlarm()));
     
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobileextensions/qtmobileextensions.pro
--- a/qtmobileextensions/qtmobileextensions.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobileextensions/qtmobileextensions.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -23,9 +23,8 @@
 SUBDIRS = src/settingsmanager \
           src/sysinfo \
           src/utils \
-          src/keycapture 
-# Excluded for build for now as dependencies are not met:
-#          src/systemtoneservice
+          src/keycapture \
+          src/systemtoneservice
 
 symbian {
 BLD_INF_RULES.prj_exports += "./src/settingsmanager/settingsmanager_global.h               $$MW_LAYER_PLATFORM_EXPORT_PATH(settingsmanager_global.h)"
diff -r 71781823f776 -r 06b8e2af4411 qtmobileextensions/rom/qtmobileextensions.iby
--- a/qtmobileextensions/rom/qtmobileextensions.iby	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobileextensions/rom/qtmobileextensions.iby	Fri Jun 11 14:26:25 2010 +0300
@@ -28,6 +28,6 @@
 file=ABI_DIR\BUILD_DIR\xqsysinfo.dll             SHARED_LIB_DIR\xqsysinfo.dll            PAGED
 file=ABI_DIR\BUILD_DIR\xqutils.dll               SHARED_LIB_DIR\xqutils.dll              PAGED
 file=ABI_DIR\BUILD_DIR\xqkeycapture.dll          SHARED_LIB_DIR\xqkeycapture.dll         PAGED
-/* file=ABI_DIR\BUILD_DIR\xqsystemtoneservice.dll   SHARED_LIB_DIR\xqsystemtoneservice.dll  PAGED */
+file=ABI_DIR\BUILD_DIR\xqsystemtoneservice.dll   SHARED_LIB_DIR\xqsystemtoneservice.dll  PAGED
 
 #endif // __QT_MOBILEEXTENSIONS_IBY__
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/.gitignore
--- a/qtmobility/.gitignore	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/.gitignore	Fri Jun 11 14:26:25 2010 +0300
@@ -30,6 +30,29 @@
 bin/icheck*
 install/*
 lib/*
+doc/src/snippets/sensors/sensors
+examples/audiorecorder/audiorecorder
+examples/bearercloud/bearercloud
+examples/bearermonitor/bearermonitor
+examples/flickrdemo/flickrdemo
+examples/lightmaps/lightmaps_with_location
+examples/logfilepositionsource/logfilepositionsource
+examples/player/player
+examples/publish-subscribe/publish-subscribe
+examples/radio/radio
+examples/samplephonebook/samplephonebook
+examples/satellitedialog/satellitedialog
+examples/sensors/accel/accel
+examples/sensors/cubehouse/cubehouse
+examples/sensors/grueapp/grueapp
+examples/sensors/reading_perf/reading_perf
+examples/sensors/sensor_explorer/sensor_explorer
+examples/sensors/small_screen_sensors/SmallSensors
+examples/servicebrowser/servicebrowser
+examples/sfw-notes/sfw-notes
+examples/slideshow/slideshow
+examples/sysinfo/sysinfo
+examples/weatherinfo/weatherinfo_with_location
 *.app
 config.tests/networkmanager/networkmanager
 config.tests/qmf/qmf
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/bin/purge.sh
--- a/qtmobility/bin/purge.sh	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/bin/purge.sh	Fri Jun 11 14:26:25 2010 +0300
@@ -1,7 +1,7 @@
 #!/bin/bash
 #############################################################################
 ##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
 ## Contact: Nokia Corporation (qt-info@nokia.com)
 ##
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/bin/rununittests.bat
--- a/qtmobility/bin/rununittests.bat	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/bin/rununittests.bat	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 :: All rights reserved.
 :: Contact: Nokia Corporation (qt-info@nokia.com)
 ::
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/bin/rununittests.sh
--- a/qtmobility/bin/rununittests.sh	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/bin/rununittests.sh	Fri Jun 11 14:26:25 2010 +0300
@@ -1,7 +1,7 @@
 #!/bin/bash
 #############################################################################
 ##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
 ## Contact: Nokia Corporation (qt-info@nokia.com)
 ##
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/bin/syncheaders
--- a/qtmobility/bin/syncheaders	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/bin/syncheaders	Fri Jun 11 14:26:25 2010 +0300
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #############################################################################
 ##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
 ## Contact: Nokia Corporation (qt-info@nokia.com)
 ##
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/bin/syncheaders.bat
--- a/qtmobility/bin/syncheaders.bat	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/bin/syncheaders.bat	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 :: All rights reserved.
 :: Contact: Nokia Corporation (qt-info@nokia.com)
 ::
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/common.pri
--- a/qtmobility/common.pri	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/common.pri	Fri Jun 11 14:26:25 2010 +0300
@@ -92,8 +92,14 @@
             DESTDIR = $$OUTPUT_DIR/bin
         }
     } else {
-        testplugin:DESTDIR = $$OUTPUT_DIR/build/tests/bin/plugins/$$PLUGIN_TYPE
-        !testplugin:DESTDIR = $$OUTPUT_DIR/plugins/$$PLUGIN_TYPE
+        testplugin {
+            DESTDIR = $$OUTPUT_DIR/build/tests/bin/plugins/$$PLUGIN_TYPE 
+        } else {
+            #check that plugin_type is set or warn otherwise
+            isEmpty(PLUGIN_TYPE):message(PLUGIN_TYPE not specified - install rule may not work)
+            target.path=$${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE}
+            INSTALLS += target
+        }
     }
 
     MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
@@ -169,4 +175,4 @@
 DEPENDPATH += . $$SOURCE_DIR
 INCLUDEPATH += $$SOURCE_DIR/src/global
 
-!symbian:!wince*:DEFINES += QTM_PLUGIN_PATH=\\\"$$replace(QT_MOBILITY_PREFIX, \\\\, /)\\\"
+!symbian:!wince*:DEFINES += QTM_PLUGIN_PATH=\\\"$$replace(QT_MOBILITY_PLUGINS, \\\\, /)\\\"
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/config.tests/corewlan/corewlantest.mm
--- a/qtmobility/config.tests/corewlan/corewlantest.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/config.tests/corewlan/corewlantest.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/config.tests/lbt/main.cpp
--- a/qtmobility/config.tests/lbt/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/config.tests/lbt/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/config.tests/networkmanager/main.cpp
--- a/qtmobility/config.tests/networkmanager/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/config.tests/networkmanager/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/config.tests/occ/main.cpp
--- a/qtmobility/config.tests/occ/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/config.tests/occ/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/config.tests/qmf/main.cpp
--- a/qtmobility/config.tests/qmf/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/config.tests/qmf/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/config.tests/sensors_s60_31/main.cpp
--- a/qtmobility/config.tests/sensors_s60_31/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/config.tests/sensors_s60_31/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/config.tests/sensors_symbian/main.cpp
--- a/qtmobility/config.tests/sensors_symbian/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/config.tests/sensors_symbian/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/config.tests/snap/main.cpp
--- a/qtmobility/config.tests/snap/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/config.tests/snap/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/config.tests/symbiancntsim/main.cpp
--- a/qtmobility/config.tests/symbiancntsim/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/config.tests/symbiancntsim/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/configure
--- a/qtmobility/configure	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/configure	Fri Jun 11 14:26:25 2010 +0300
@@ -1,7 +1,7 @@
 #!/bin/sh
 #############################################################################
 ##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
 ## Contact: Nokia Corporation (qt-info@nokia.com)
 ##
@@ -86,6 +86,7 @@
 QT_MOBILITY_INCLUDE=
 QT_MOBILITY_LIB=
 QT_MOBILITY_BIN=
+QT_MOBILITY_PLUGINS=
 BUILD_UNITTESTS=
 BUILD_EXAMPLES=
 BUILD_DOCS=yes
@@ -96,6 +97,7 @@
 QMAKE_CACHE="$shadowpath/.qmake.cache"
 LIB_PATH="lib"
 BIN_PATH="bin"
+PLUGIN_PATH="plugins"
 MAC_SDK=
 MOBILITY_MODULES="bearer location contacts multimedia publishsubscribe versit messaging systeminfo serviceframework sensors"
 MOBILITY_MODULES_UNPARSED=
@@ -119,6 +121,8 @@
     echo "                    (default PREFIX/lib)"
     echo "-bindir <dir> ..... Executables will be installed to <dir>"
     echo "                    (default PREFIX/bin)"
+    echo "-plugindir <dir> .. Plug-ins will be installed to <dir>"
+    echo "                    (default PREFIX/plugins)"
     echo "-debug ............ Build with debugging symbols"
     echo "-release .......... Build without debugging symbols"
     echo "-silent ........... Reduces build output"
@@ -171,6 +175,10 @@
             QT_MOBILITY_BIN="$2"
             shift
             ;;
+        -plugindir)
+            QT_MOBILITY_PLUGINS="$2"
+            shift
+            ;;
         -tests)
             BUILD_UNITTESTS="yes"
             ;;
@@ -338,7 +346,7 @@
 fi
 echo "QT_MOBILITY_LIB = $QT_MOBILITY_LIB" >> "$CONFIG_IN"
 
-#process binary path
+#process bin path
 if [ -z "$QT_MOBILITY_BIN" ]; then
     QT_MOBILITY_BIN="$QT_MOBILITY_PREFIX/$BIN_PATH"
 elif [ -d "$QT_MOBILITY_BIN" ]; then
@@ -350,6 +358,19 @@
 fi
 echo "QT_MOBILITY_BIN = $QT_MOBILITY_BIN" >> "$CONFIG_IN"
 
+#process plugin path
+if [ -z "$QT_MOBILITY_PLUGINS" ]; then
+    QT_MOBILITY_PLUGINS="$QT_MOBILITY_PREFIX/$PLUGIN_PATH"
+elif [ -d "$QT_MOBILITY_PLUGINS" ]; then
+    QT_MOBILITY_PLUGINS=`absPath $QT_MOBILITY_PLUGINS $LINUX_TARGET`
+else
+    mkdir -p "$QT_MOBILITY_PLUGINS"
+    QT_MOBILITY_PLUGINS=`absPath $QT_MOBILITY_PLUGINS $LINUX_TARGET`
+    rm -rf "$QT_MOBILITY_PLUGINS"
+fi
+echo "QT_MOBILITY_PLUGINS = $QT_MOBILITY_PLUGINS" >> "$CONFIG_IN"
+
+
 echo "QT_MOBILITY_SOURCE_TREE = $relpath" >> "$QMAKE_CACHE"
 echo "QT_MOBILITY_BUILD_TREE = $shadowpath" >> "$QMAKE_CACHE"
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/configure.bat
--- a/qtmobility/configure.bat	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/configure.bat	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 :: All rights reserved.
 :: Contact: Nokia Corporation (qt-info@nokia.com)
 ::
@@ -80,6 +80,7 @@
 if "%1" == "-libdir"            goto libTag
 if "%1" == "-bindir"            goto binTag
 if "%1" == "-headerdir"         goto headerTag
+if "%1" == "-plugindir"         goto pluginTag
 if "%1" == "-tests"             goto testTag
 if "%1" == "-examples"          goto exampleTag
 if "%1" == "-qt"                goto qtTag
@@ -112,6 +113,8 @@
     echo                     (default PREFIX/lib)
     echo -bindir (dir) ..... Executables will be installed to dir
     echo                     (default PREFIX/bin)
+    echo -plugindir (dir) .. Plug-ins will be installed to dir
+    echo                     (default PREFIX/plugins)
     echo -debug ............ Build with debugging symbols
     echo -release .......... Build without debugging symbols
     echo -silent ........... Reduces build output
@@ -181,6 +184,13 @@
 shift
 goto cmdline_parsing
 
+:pluginTag
+shift
+echo QT_MOBILITY_PLUGINS = %1 >> %PROJECT_CONFIG%
+shift
+echo
+goto cmdline_parsing
+
 :unfrozenTag
 REM Should never be used in release builds
 REM Some SDK's seem to exclude Q_AUTOTEST_EXPORT symbols if the 
@@ -331,6 +341,7 @@
 echo isEmpty($$QT_MOBILITY_INCLUDE):QT_MOBILITY_INCLUDE=$$QT_MOBILITY_PREFIX/include >> %PROJECT_CONFIG%
 echo isEmpty($$QT_MOBILITY_LIB):QT_MOBILITY_LIB=$$QT_MOBILITY_PREFIX/lib >> %PROJECT_CONFIG%
 echo isEmpty($$QT_MOBILITY_BIN):QT_MOBILITY_BIN=$$QT_MOBILITY_PREFIX/bin >> %PROJECT_CONFIG%
+echo isEmpty($$QT_MOBILITY_PLUGINS):QT_MOBILITY_PLUGINS=$$QT_MOBILITY_PREFIX/plugins >> %PROJECT_CONFIG%
 
 echo mobility_modules = %MOBILITY_MODULES%  >> %PROJECT_CONFIG%
 REM no Sysinfo support on Maemo yet
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/audiorecorder/audiorecorder.cpp
--- a/qtmobility/examples/audiorecorder/audiorecorder.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/audiorecorder/audiorecorder.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/audiorecorder/audiorecorder.h
--- a/qtmobility/examples/audiorecorder/audiorecorder.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/audiorecorder/audiorecorder.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/audiorecorder/main.cpp
--- a/qtmobility/examples/audiorecorder/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/audiorecorder/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/battery-charge/battery-publisher/batterypublisher.cpp
--- a/qtmobility/examples/battery-charge/battery-publisher/batterypublisher.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/battery-charge/battery-publisher/batterypublisher.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/battery-charge/battery-publisher/batterypublisher.h
--- a/qtmobility/examples/battery-charge/battery-publisher/batterypublisher.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/battery-charge/battery-publisher/batterypublisher.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/battery-charge/battery-publisher/main.cpp
--- a/qtmobility/examples/battery-charge/battery-publisher/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/battery-charge/battery-publisher/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/battery-charge/battery-subscriber/main.cpp
--- a/qtmobility/examples/battery-charge/battery-subscriber/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/battery-charge/battery-subscriber/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bearercloud/bearercloud.cpp
--- a/qtmobility/examples/bearercloud/bearercloud.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bearercloud/bearercloud.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bearercloud/bearercloud.h
--- a/qtmobility/examples/bearercloud/bearercloud.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bearercloud/bearercloud.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bearercloud/cloud.cpp
--- a/qtmobility/examples/bearercloud/cloud.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bearercloud/cloud.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bearercloud/cloud.h
--- a/qtmobility/examples/bearercloud/cloud.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bearercloud/cloud.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bearercloud/main.cpp
--- a/qtmobility/examples/bearercloud/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bearercloud/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bearermonitor/bearermonitor.cpp
--- a/qtmobility/examples/bearermonitor/bearermonitor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bearermonitor/bearermonitor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bearermonitor/bearermonitor.h
--- a/qtmobility/examples/bearermonitor/bearermonitor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bearermonitor/bearermonitor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bearermonitor/main.cpp
--- a/qtmobility/examples/bearermonitor/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bearermonitor/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.cpp
--- a/qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.h
--- a/qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bluetoothtransferplugin/bluetoothtransfer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp
--- a/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.h
--- a/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro
--- a/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/bluetoothtransferplugin/bluetoothtransferplugin.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,8 @@
 TEMPLATE = lib
 CONFIG += plugin
+PLUGIN_TYPE=serviceframework
 INCLUDEPATH += ../../src/serviceframework
+
 HEADERS += bluetoothtransferplugin.h \
            bluetoothtransfer.h
 SOURCES += bluetoothtransferplugin.cpp \
@@ -22,8 +24,6 @@
     TARGET.CAPABILITY = LocalServices Location NetworkServices ReadUserData WriteUserData UserEnvironment
 }
 
-xml.path = $$DESTDIR/xmldata
+xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata
 xml.files = bluetoothtransferservice.xml
-xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
 INSTALLS += xml
-build_pass:ALL_DEPS+=install_xml
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer.pro
--- a/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,5 +1,3 @@
 TEMPLATE = subdirs
-SUBDIRS += sfwexample \
-           voipdialer \
+SUBDIRS += voipdialer \
            landlinedialer
-#gsmdialer 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/README	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,9 @@
+This example requires the example Dialer services to be registered in order 
+for the application to obtain the default interface. This can be done by using the 
+service framework command line tool to add the corresponding service XML file:
+
+./servicefw add landlinedialerservice.xml
+./servicefw add voipdialerservice.xml
+
+The XML files for all example services can be found in the QtMobility build directory
+under install/bin/xmldata
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialButton.qml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialButton.qml	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,72 @@
+import Qt 4.6
+
+//Implementation of the dialButton control.
+Item {
+    id: dialButton
+    width: 50
+    height: 50
+    property alias buttonText: innerText.text;
+    property alias color: rectangleButton.color
+    property color hoverColor: "lightsteelblue"
+    property color pressColor: "slategray"
+    signal clicked
+
+    Rectangle {
+        id: rectangleButton
+        anchors.fill: parent
+        radius: 5
+        color: "steelblue"
+        border.width: 3
+        border.color: "black"
+
+        Text {
+            id: innerText
+            font.pointSize: 20
+            anchors.centerIn: parent
+        }
+    }
+   
+    states: [
+        State {
+            name: "Hovering"
+            PropertyChanges {
+                target: rectangleButton
+                color: hoverColor
+            }
+        },
+        State {
+            name: "Pressed"
+            PropertyChanges {
+                target: rectangleButton
+                color: pressColor
+            }
+        }
+    ]
+   
+   
+    transitions: [
+        Transition {
+            from: ""; to: "Hovering"
+            ColorAnimation { duration: 100 }
+        },
+        Transition {
+            from: "*"; to: "Pressed"
+            ColorAnimation { duration: 10 }
+        }
+    ]
+   
+    MouseArea {
+        hoverEnabled: true
+        anchors.fill: dialButton
+        onEntered: { dialButton.state='Hovering'}
+        onExited: { dialButton.state=''}
+        onClicked: { dialButton.clicked();}
+        onPressed: { dialButton.state="Pressed" }
+        onReleased: {
+            if (containsMouse)
+            dialButton.state="Hovering";
+            else
+            dialButton.state="";
+        }
+    }
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialScreen.qml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialScreen.qml	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,126 @@
+import Qt 4.6
+
+//Layout of the DialScreen control
+//------------------------------------
+//|DialScreen                        |  
+//| ---------------------  ____  numberPad
+//| |dialNumber         | /          |
+//| ---------------------/          _|__  hangUpButton
+//| --------------------/- ------- / |
+//| |      |      |      | |     |/  |      
+//| |   1  |   2  |   3  | |     |   |    
+//| |      |      |      | |     |   |    
+//| ---------------------- |     |   |
+//| |      |      |      | |     |   |    
+//| |   4  |   5  |   6  | |     |   |    
+//| |      |      |      | -------   |         
+//| ----------------------          _|__  callButton
+//| |      |      |      | ------- / |          
+//| |   7  |   8  |   9  | |     |/  |
+//| |      |      |      | |     |   |         
+//| ---------------------- |     |   |
+//| |      |      |      | |     |   |         
+//| |   *  |   0  |   #  | |     |   |         
+//| |      |      |      | |     |   |         
+//| ---------------------- -------   |
+//|                                  |
+//------------------------------------
+
+//! [0]
+Item {
+    width: childrenRect.width
+    height: childrenRect.height
+    property string dialString
+    signal dial(string numberToDial)
+    signal hangup
+    //! [0]
+
+    Rectangle {
+        id: dialNumber
+        height: 20
+        width: numberPad.width
+        anchors.top: parent.top
+        anchors.left: parent.left
+        color: "white"
+        radius: 5
+        border.width: 3
+        border.color: "black"
+        
+        Text { 
+            text: dialString
+            anchors.centerIn: parent
+        }
+    }
+
+    Grid {
+        id: numberPad
+        width: childrenRect.width
+        height: childrenRect.height
+        anchors.top: dialNumber.bottom
+        anchors.left: parent.left
+        anchors.topMargin: 5
+        columns: 3
+        spacing: 5
+        
+        DialButton { buttonText: "1"; onClicked: { dialString += "1";} }
+        DialButton { buttonText: "2"; onClicked: { dialString += "2";} }
+        DialButton { buttonText: "3"; onClicked: { dialString += "3";} }
+        DialButton { buttonText: "4"; onClicked: { dialString += "4";} }
+        DialButton { buttonText: "5"; onClicked: { dialString += "5";} }
+        DialButton { buttonText: "6"; onClicked: { dialString += "6";} }
+        DialButton { buttonText: "7"; onClicked: { dialString += "7";} }
+        DialButton { buttonText: "8"; onClicked: { dialString += "8";} }
+        DialButton { buttonText: "9"; onClicked: { dialString += "9";} }
+        DialButton { buttonText: "*"; onClicked: { dialString += "*";} }
+        DialButton { buttonText: "0"; onClicked: { dialString += "0";} }
+        DialButton { buttonText: "#"; onClicked: { dialString += "#";} }
+    }
+    
+    //! [1]
+    DialButton {
+        id: hangUpButton
+        height: { (numberPad.height / 2) - 2 }
+        width: 50
+        anchors.top: numberPad.top
+        anchors.left: numberPad.right
+        anchors.leftMargin: 5
+        hoverColor: "red"
+        color: "crimson"
+        onClicked: {
+            dialString = ""
+            hangup()
+        }
+        //! [1]       
+        Image {
+            anchors.centerIn: parent
+            source: "hangup.png"
+            transformOrigin: "Center"
+        }
+    }
+    
+    //! [2]
+    DialButton {
+        id: callButton
+        width: 50
+        height: {(numberPad.height/2) -2}
+        anchors.top: hangUpButton.bottom
+        anchors.left: numberPad.right
+        anchors.leftMargin: 5
+        anchors.topMargin: 4
+        color: "mediumseagreen"
+        hoverColor: "lightgreen"
+        onClicked: {
+            if (dialString != "") {
+                dial(dialString)
+                dialString = ""
+            }
+        }
+        //! [2]
+        
+        Image {
+            anchors.centerIn: parent
+            source: "call.png"
+            transformOrigin: "Center"
+        }
+    }
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialerList.qml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/DialerList.qml	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,146 @@
+import Qt 4.7
+// ![4]
+import QtMobility.serviceframework 1.0
+// ![4]
+
+//Layout of the ServiceList control
+//---------------------------------
+//|ServiceList                    |
+//| ----------------------------- |
+//| |title                      | |
+//| ----------------------------- |
+//| ----------------------------- |
+//| |listFrame                  | |
+//| |-------------------------- | |
+//| ||serviceListView         | | |
+//| ||- listItem              | | |
+//| ||- listItem              | | |
+//| ||- listItem              | | |
+//| |---------------------------| |
+//| ----------------------------- |
+//---------------------------------
+    
+Rectangle {
+    property variant dialService: 0
+    signal signalSelected
+    
+    Text {
+        id: title
+        height: 20
+        width: 200
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.topMargin: 5
+        anchors.leftMargin: 5
+        text: "<b>Select dial service:</b>"
+    }
+    
+    Rectangle {
+        id : listFrame
+        width: childrenRect.width
+        height: childrenRect.height
+        anchors.top: title.bottom
+        anchors.left: parent.left;
+        anchors.topMargin: 5
+        anchors.leftMargin: 5
+        anchors.rightMargin: 5
+        border.color: "black"
+        border.width: 3
+        property bool nohighlightlistitem : true
+        //! [1]
+        Component {
+            id: delegate
+            //! [1]
+            //Rectangle item to draw a list view item
+            //This includes 2 line of text:
+            // ------------------------------------------
+            // |Service: LandDialer (1.0)               |
+            // |Interface: com.nokia.qt.examples Dialer |
+            // ------------------------------------------
+            Rectangle {
+                id: listItem
+                width: serviceListView.width
+                height: 40
+                border.color: "black"
+                border.width: 1
+                opacity: 0.6
+
+                //! [2]
+                MouseArea {
+                    id: listItemMouseRegion
+                    anchors.fill: parent
+                    onClicked: {
+                        if(listFrame.nohighlightlistitem){
+                            serviceListView.highlight = highlight
+                            listFrame.nohighlightlistitem = false;
+                        }
+                        serviceListView.currentIndex = index;
+                        dialService = model.modelData;
+                        signalSelected()
+                    }
+                }
+
+                Text { 
+                    id: serviceItemInfo
+                    anchors.top: parent.top
+                    anchors.left: parent.left
+                    anchors.topMargin: 5
+                    anchors.leftMargin: 3
+                    text: " <b>Service:</b> " + serviceName + "  (" + versionNumber + ")"
+                }
+                
+                Text { 
+                    id: serviceItemInterfaceName
+                    anchors.top: serviceItemInfo.bottom
+                    anchors.left: parent.left
+                    anchors.topMargin: 2
+                    anchors.leftMargin: 3
+                    text: " <b>Interface:</b> " + interfaceName;
+                }
+                //! [2]
+            }
+        }
+        
+        //! [3]
+        Component {
+            id: highlight
+            
+            Rectangle {
+                width: childrenRect.width
+                border.color: "black"; border.width: 2
+                height: 30
+                color : "lightsteelblue"
+                gradient: Gradient {
+                    GradientStop {position: 0.0; color: "steelblue"}
+                    GradientStop {position: 0.5; color: "lightsteelblue"}
+                    GradientStop {position: 1.0; color: "steelblue"}
+                }
+            }
+        }
+        //! [3]
+        
+        //! [0]
+        ListView {
+            id: serviceListView
+            height: 100
+            width: 260
+            anchors.topMargin: 5
+            anchors.leftMargin: 5
+            anchors.rightMargin: 5
+            model: dialerServiceList.services
+            opacity: 1
+            delegate: delegate
+            currentIndex: -1
+            clip: true
+        }
+        //! [0]
+    }
+
+    //! [5]
+    ServiceList {
+        id: dialerServiceList
+        interfaceName: "com.nokia.qt.examples.Dialer"
+        minVersion: "1.0"
+    }
+    //! [5]
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/call.png
Binary file qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/call.png has changed
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/hangup.png
Binary file qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/hangup.png has changed
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/qmldir
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/content/qmldir	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+DialButton DialButton.qml
+DialerList DialerList.qml
+DialScreen DialScreen.qml
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.qml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/declarative-sfw-dialer/declarative-sfw-dialer.qml	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,158 @@
+import Qt 4.7
+import QtMobility.serviceframework 1.0
+import "content"
+
+//Layout of the mainPage
+//----------------------------------------------  ____ mainPage
+//| ------------------- ---------------------- | /
+//| | dialerList     | | dialScreen         | |/
+//| |                 | |                    | |
+//| |                 | |                    | |
+//| |                 | |                    | |
+//| ------------------- |                    | |
+//| ------------------- |                    | |
+//| | serviceDetails  | |                    | |
+//| ------------------- |                    | |
+//|                     |                    | |
+//|                     |                    | |
+//|                     |                    | |
+//|                     |                    | |
+//| ------------------- |                    | |
+//| | status          | |                    | |
+//| ------------------- ---------------------- |
+//----------------------------------------------
+
+Rectangle {
+    property variant dialerObject: defaultService.serviceObject
+    
+    id: mainPage
+    width: 500
+    height: 250
+    color: "white"
+
+    DialerList {
+        id: dialerList
+        height: childrenRect.height + 10
+        width: childrenRect.width
+        anchors.top: parent.top
+        anchors.left: parent.left
+        anchors.right: dialScreen.left
+        anchors.topMargin: 5
+        anchors.leftMargin: 5
+        anchors.rightMargin: 5
+        radius: 5
+        color: "steelblue"
+        border.color: "black"
+        border.width: 3
+        gradient:     
+            Gradient {
+                GradientStop {
+                    position: 0.0
+                    color: "lightsteelblue"
+                }
+                
+                GradientStop {
+                    position: 1.0
+                    color: "steelblue"
+                }
+            }
+        onSignalSelected: { serviceSelected(); }
+    }
+
+    function serviceSelected()
+    {
+        dialerObject = dialerList.dialService.serviceObject
+
+        serviceDetails.text = "Selected dial service:" + "\n   " + 
+                               dialerList.dialService.serviceName + 
+                               "\n   (" + dialerList.dialService.versionNumber + ")";
+    }
+    
+    Text {
+        id: serviceDetails
+        text: "Selected dial service:"
+        anchors.topMargin: 5
+        anchors.leftMargin: 5
+        anchors.rightMargin: 5;
+        anchors.left: parent.left
+        anchors.top: dialerList.bottom
+    }
+    
+    Text {
+        id: status
+        anchors.top: parent.bottom
+        anchors.left: parent.left
+        anchors.topMargin: -40
+        anchors.leftMargin: 5
+    }
+    
+    Timer {
+        id: clearStatusTimer
+        interval: 2000
+        running: false
+        repeat: false
+        onTriggered: {
+            status.text = ""
+        }
+    }
+
+    //! [0]
+    DialScreen {
+        id: dialScreen
+        property bool activeCall : false
+        property variant currentDialer: 0;
+        anchors.topMargin: 5
+        anchors.leftMargin: 5
+        anchors.rightMargin: 5
+        anchors.right: parent.right
+        anchors.top: parent.top
+        onDial: {
+            if (activeCall == false) {
+                if (dialerList.dialService != 0) {
+                    var o = dialerObject;
+                    status.text = "Dialing " + numberToDial +"...";
+                    dialScreen.currentDialer = o;
+                    o.dialNumber(numberToDial);
+                    activeCall = true;
+                }
+            }
+        }
+        onHangup: {
+            if (activeCall) {
+                if (dialScreen.currentDialer != 0) {
+                    dialScreen.currentDialer.hangup();
+                }
+                status.text = "Hang up";
+            }
+        }
+    }
+    //! [0]
+
+    //! [1]
+    Connections {
+        target: dialerObject
+        
+        onStateChanged: {
+            if (dialScreen.currentDialer.state == 1) {
+                status.text += "\nRinging";
+            } 
+            else if (dialScreen.currentDialer.state == 2) {
+                status.text += "\nConnected";
+            } 
+            else if (dialScreen.currentDialer.state == 0) {
+                status.text += "\nConnection terminated";
+                dialScreen.activeCall = false;
+                clearStatusTimer.running = true;
+            } 
+            else if (dialScreen.currentDialer.state == 3) {
+                status.text += "\nPhone already engaged";
+            }
+        }
+    }
+    //! [1]
+
+    Service {
+        id: defaultService
+        interfaceName: "com.nokia.qt.examples.Dialer"
+    }
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.cpp
--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,39 +1,40 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+**
+**
+**
+**
+**
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.h
--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,39 +1,40 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+**
+**
+**
+**
+**
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro
--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialer.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 INCLUDEPATH += ../../../src/serviceframework
+PLUGIN_TYPE = serviceframework
 TARGET = serviceframework_landlinedialerservice
 include(../../examples.pri)
 
@@ -17,8 +18,6 @@
     TARGET.CAPABILITY = ALL -TCB
 }
 
-xml.path = $$DESTDIR/xmldata
+xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata
 xml.files = landlinedialerservice.xml
-xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
 INSTALLS += xml
-build_pass:ALL_DEPS+=install_xml
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp
--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,39 +1,40 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+**
+**
+**
+**
+**
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h
--- a/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/landlinedialer/landlinedialerplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,39 +1,40 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+**
+**
+**
+**
+**
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/content/DialButton.qml
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/content/DialButton.qml	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-import Qt 4.6
-
-//Implementation of the dialButton control.
-Item {
-    id: dialButton
-    width: 50
-    height: 50
-    property alias buttonText: innerText.text;
-    property alias color: rectangleButton.color
-    property color hoverColor: "lightsteelblue"
-    property color pressColor: "slategray"
-    signal clicked
-
-    Rectangle {
-        id: rectangleButton
-        anchors.fill: parent
-        radius: 5
-        color: "steelblue"
-        border.width: 3
-        border.color: "black"
-
-        Text {
-            id: innerText
-            font.pointSize: 20
-            anchors.centerIn: parent
-        }
-    }
-   
-    states: [
-        State {
-            name: "Hovering"
-            PropertyChanges {
-                target: rectangleButton
-                color: hoverColor
-            }
-        },
-        State {
-            name: "Pressed"
-            PropertyChanges {
-                target: rectangleButton
-                color: pressColor
-            }
-        }
-    ]
-   
-   
-    transitions: [
-        Transition {
-            from: ""; to: "Hovering"
-            ColorAnimation { duration: 100 }
-        },
-        Transition {
-            from: "*"; to: "Pressed"
-            ColorAnimation { duration: 10 }
-        }
-    ]
-   
-    MouseArea {
-        hoverEnabled: true
-        anchors.fill: dialButton
-        onEntered: { dialButton.state='Hovering'}
-        onExited: { dialButton.state=''}
-        onClicked: { dialButton.clicked();}
-        onPressed: { dialButton.state="Pressed" }
-        onReleased: {
-            if (containsMouse)
-            dialButton.state="Hovering";
-            else
-            dialButton.state="";
-        }
-    }
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/content/DialScreen.qml
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/content/DialScreen.qml	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-import Qt 4.6
-
-//Layout of the DialScreen control
-//------------------------------------
-//|DialScreen                        |  
-//| ---------------------  ____  numberPad
-//| |dialNumber         | /          |
-//| ---------------------/          _|__  hangUpButton
-//| --------------------/- ------- / |
-//| |      |      |      | |     |/  |      
-//| |   1  |   2  |   3  | |     |   |    
-//| |      |      |      | |     |   |    
-//| ---------------------- |     |   |
-//| |      |      |      | |     |   |    
-//| |   4  |   5  |   6  | |     |   |    
-//| |      |      |      | -------   |         
-//| ----------------------          _|__  callButton
-//| |      |      |      | ------- / |          
-//| |   7  |   8  |   9  | |     |/  |
-//| |      |      |      | |     |   |         
-//| ---------------------- |     |   |
-//| |      |      |      | |     |   |         
-//| |   *  |   0  |   #  | |     |   |         
-//| |      |      |      | |     |   |         
-//| ---------------------- -------   |
-//|                                  |
-//------------------------------------
-
-//! [0]
-Item {
-    width: childrenRect.width
-    height: childrenRect.height
-    property string dialString
-    signal dial(string numberToDial)
-    signal hangup
-    //! [0]
-
-    Rectangle {
-        id: dialNumber
-        height: 20
-        width: numberPad.width
-        anchors.top: parent.top
-        anchors.left: parent.left
-        color: "white"
-        radius: 5
-        border.width: 3
-        border.color: "black"
-        
-        Text { 
-            text: dialString
-            anchors.centerIn: parent
-        }
-    }
-
-    Grid {
-        id: numberPad
-        width: childrenRect.width
-        height: childrenRect.height
-        anchors.top: dialNumber.bottom
-        anchors.left: parent.left
-        anchors.topMargin: 5
-        columns: 3
-        spacing: 5
-        
-        DialButton { buttonText: "1"; onClicked: { dialString += "1";} }
-        DialButton { buttonText: "2"; onClicked: { dialString += "2";} }
-        DialButton { buttonText: "3"; onClicked: { dialString += "3";} }
-        DialButton { buttonText: "4"; onClicked: { dialString += "4";} }
-        DialButton { buttonText: "5"; onClicked: { dialString += "5";} }
-        DialButton { buttonText: "6"; onClicked: { dialString += "6";} }
-        DialButton { buttonText: "7"; onClicked: { dialString += "7";} }
-        DialButton { buttonText: "8"; onClicked: { dialString += "8";} }
-        DialButton { buttonText: "9"; onClicked: { dialString += "9";} }
-        DialButton { buttonText: "*"; onClicked: { dialString += "*";} }
-        DialButton { buttonText: "0"; onClicked: { dialString += "0";} }
-        DialButton { buttonText: "#"; onClicked: { dialString += "#";} }
-    }
-    
-    //! [1]
-    DialButton {
-        id: hangUpButton
-        height: { (numberPad.height / 2) - 2 }
-        width: 50
-        anchors.top: numberPad.top
-        anchors.left: numberPad.right
-        anchors.leftMargin: 5
-        hoverColor: "red"
-        color: "crimson"
-        onClicked: {
-            dialString = ""
-            hangup()
-        }
-        //! [1]       
-        Image {
-            anchors.centerIn: parent
-            source: "hangup.png"
-            transformOrigin: "Center"
-        }
-    }
-    
-    //! [2]
-    DialButton {
-        id: callButton
-        width: 50
-        height: {(numberPad.height/2) -2}
-        anchors.top: hangUpButton.bottom
-        anchors.left: numberPad.right
-        anchors.leftMargin: 5
-        anchors.topMargin: 4
-        color: "mediumseagreen"
-        hoverColor: "lightgreen"
-        onClicked: {
-            if (dialString != "") {
-                dial(dialString)
-                dialString = ""
-            }
-        }
-        //! [2]
-        
-        Image {
-            anchors.centerIn: parent
-            source: "call.png"
-            transformOrigin: "Center"
-        }
-    }
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/content/DialerList.qml
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/content/DialerList.qml	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-import Qt 4.7
-// ![4]
-import QtMobility.serviceframework 1.0
-// ![4]
-
-//Layout of the ServiceList control
-//---------------------------------
-//|ServiceList                    |
-//| ----------------------------- |
-//| |title                      | |
-//| ----------------------------- |
-//| ----------------------------- |
-//| |listFrame                  | |
-//| |-------------------------- | |
-//| ||serviceListView         | | |
-//| ||- listItem              | | |
-//| ||- listItem              | | |
-//| ||- listItem              | | |
-//| |---------------------------| |
-//| ----------------------------- |
-//---------------------------------
-    
-Rectangle {
-    property var dialService: 0
-    signal signalSelected
-    
-    Text {
-        id: title
-        height: 20
-        width: 200
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.topMargin: 5
-        anchors.leftMargin: 5
-        text: "<b>Select dial service:</b>"
-    }
-    
-    Rectangle {
-        id : listFrame
-        width: childrenRect.width
-        height: childrenRect.height
-        anchors.top: title.bottom
-        anchors.left: parent.left;
-        anchors.topMargin: 5
-        anchors.leftMargin: 5
-        anchors.rightMargin: 5
-        border.color: "black"
-        border.width: 3
-        property bool nohighlightlistitem : true
-        //! [1]
-        Component {
-            id: delegate
-            //! [1]
-            //Rectangle item to draw a list view item
-            //This includes 2 line of text:
-            // ------------------------------------------
-            // |Service: LandDialer (1.0)               |
-            // |Interface: com.nokia.qt.examples Dialer |
-            // ------------------------------------------
-            Rectangle {
-                id: listItem
-                width: serviceListView.width
-                height: 40
-                border.color: "black"
-                border.width: 1
-                opacity: 0.6
-
-                //! [2]
-                MouseArea {
-                    id: listItemMouseRegion
-                    anchors.fill: parent
-                    onClicked: {
-                        if(listFrame.nohighlightlistitem){
-                            serviceListView.highlight = highlight
-                            listFrame.nohighlightlistitem = false;
-                        }
-                        serviceListView.currentIndex = index;
-                        dialService = model.modelData;
-                        signalSelected()
-                    }
-                }
-
-                Text { 
-                    id: serviceItemInfo
-                    anchors.top: parent.top
-                    anchors.left: parent.left
-                    anchors.topMargin: 5
-                    anchors.leftMargin: 3
-                    text: " <b>Service:</b> " + serviceName + "  (" + versionNumber + ")"
-                }
-                
-                Text { 
-                    id: serviceItemInterfaceName
-                    anchors.top: serviceItemInfo.bottom
-                    anchors.left: parent.left
-                    anchors.topMargin: 2
-                    anchors.leftMargin: 3
-                    text: " <b>Interface:</b> " + interfaceName;
-                }
-                //! [2]
-            }
-        }
-        
-        //! [3]
-        Component {
-            id: highlight
-            
-            Rectangle {
-                width: childrenRect.width
-                border.color: "black"; border.width: 2
-                height: 30
-                color : "lightsteelblue"
-                gradient: Gradient {
-                    GradientStop {position: 0.0; color: "steelblue"}
-                    GradientStop {position: 0.5; color: "lightsteelblue"}
-                    GradientStop {position: 1.0; color: "steelblue"}
-                }
-            }
-        }
-        //! [3]
-        
-        //! [0]
-        ListView {
-            id: serviceListView
-            height: 100
-            width: 260
-            anchors.topMargin: 5
-            anchors.leftMargin: 5
-            anchors.rightMargin: 5
-            model: dialerServiceList.services
-            opacity: 1
-            delegate: delegate
-            currentIndex: -1
-            clip: true
-        }
-        //! [0]
-    }
-
-    //! [5]
-    ServiceList {
-        id: dialerServiceList
-        interfaceName: "com.nokia.qt.examples.Dialer"
-        minVersion: "1.0"
-    }
-    //! [5]
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/content/call.png
Binary file qtmobility/examples/declarative-sfw-dialer/sfwexample/content/call.png has changed
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/content/hangup.png
Binary file qtmobility/examples/declarative-sfw-dialer/sfwexample/content/hangup.png has changed
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/main.cpp
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/***************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QUrl>
-#include <QtCore>
-
-//! [0]
-//Includes for using the declarative viewer
-#include <QDeclarativeView>
-
-//Includes for using the service framework wrapper
-#include "qdeclarativeservice.h"
-//! [0]
-
-#include "sfwexample.h"
-
-int main(int argc, char* argv[])
-{
-    //! [1]
-    qmlRegisterType<QServiceWrapper>("QtMobility.serviceframework", 1, 0, "Service");
-    qmlRegisterType<QServiceListWrapper>("QtMobility.serviceframework", 1, 0, "ServiceList");
-    //! [1]
-
-    QApplication app(argc, argv);
-
-    DialerServices *ds = new DialerServices();
-
-    //! [2]
-    QDeclarativeView canvas;
-    canvas.setSource(QUrl("qrc:/sfwexample.qml"));
-    canvas.show();
-    //! [2]
-
-    return app.exec();
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/****************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativeservice.h"
-
-QServiceWrapper::QServiceWrapper()
-: serviceInstance(0)
-{
-    serviceManager = new QServiceManager();
-}
-
-QServiceWrapper::~QServiceWrapper()
-{
-    delete serviceInstance;
-}
-
-bool QServiceWrapper::isValid() const
-{
-    return m_descriptor.isValid();
-}
-
-void QServiceWrapper::setInterfaceDesc(const QServiceInterfaceDescriptor &desc)
-{
-    if (desc == m_descriptor)
-        return;
-
-    m_descriptor = desc;
-
-    if (serviceInstance)
-        delete serviceInstance;
-
-    serviceInstance = 0;
-}
-
-QServiceInterfaceDescriptor QServiceWrapper::interfaceDesc() const
-{
-    return m_descriptor;
-}
-
-void QServiceWrapper::setInterfaceName(const QString &interface)
-{
-    m_descriptor = serviceManager->interfaceDefault(interface);
-
-    if (!isValid())
-        qWarning() << "WARNING: No default service found for interface name: " << interface;
-}
-
-QString QServiceWrapper::interfaceName() const
-{
-    if (isValid())
-        return m_descriptor.interfaceName();
-    else
-        return "No Interface";
-}
-
-QString QServiceWrapper::serviceName() const
-{
-    if (isValid())
-        return m_descriptor.serviceName();
-    else
-        return "No Service";
-}
-
-QString QServiceWrapper::versionNumber() const
-{
-    if (isValid())
-        return (QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion()));
-    else
-        return "0.0";
-}
-
-QObject* QServiceWrapper::serviceObject()
-{
-    if (serviceInstance) {
-        return serviceInstance;
-    }
-
-    if (isValid()) {
-        QServiceManager manager;
-        serviceInstance = manager.loadInterface(m_descriptor);
-        return serviceInstance;
-    } else {
-        return 0;
-    }
-}
-
-QServiceListWrapper::QServiceListWrapper()
-{
-    serviceManager = new QServiceManager();
-}
-
-QServiceListWrapper::~QServiceListWrapper()
-{
-}
-
-void QServiceListWrapper::setInterfaceName(const QString &interface)
-{
-    m_interface = interface;
-
-    // ![0]
-    QServiceWrapper *service;
-    QServiceFilter filter(m_interface, m_version);
-    QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter);
-    for (int i = 0; i < list.size(); i++) {
-        service = new QServiceWrapper();
-        service->setInterfaceDesc(list.at(i));
-        m_services.append(service);
-    }
-    // ![0]
-}
-
-QString QServiceListWrapper::interfaceName() const
-{
-    return m_interface;
-}
-
-void QServiceListWrapper::setMinVersion(const QString &version)
-{
-    m_version = version;
-}
-
-QString QServiceListWrapper::minVersion() const
-{
-    return m_version;
-}
-
-QDeclarativeListProperty<QServiceWrapper> QServiceListWrapper::services()
-{
-    return QDeclarativeListProperty<QServiceWrapper>(this, m_services);
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.h
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/qdeclarativeservice.h	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/****************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-***************************************************************************/
-
-#ifndef QDECLARATIVESERVICE_H
-#define QDECLARATIVESERVICE_H
-
-#include <QtCore>
-#include <qserviceinterfacedescriptor.h>
-#include <qservicemanager.h>
-#include <qdeclarative.h>
-#include <qdeclarativelist.h>
-
-QTM_USE_NAMESPACE
-
-Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
-
-class QServiceWrapper : public QObject {
-    Q_OBJECT
-    // ![0]
-    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
-    Q_PROPERTY(QString serviceName READ serviceName);
-    Q_PROPERTY(QString versionNumber READ versionNumber);
-    Q_PROPERTY(bool valid READ isValid NOTIFY validChanged);
-    Q_PROPERTY(QObject* serviceObject READ serviceObject NOTIFY serviceObjectChanged);
-    // ![0]
-
-public:
-    QServiceWrapper();
-    ~QServiceWrapper();
-
-    void setInterfaceDesc(const QServiceInterfaceDescriptor& desc);
-    QServiceInterfaceDescriptor interfaceDesc() const;
-
-    void setInterfaceName(const QString& interface);
-    QString interfaceName() const;
-    QString serviceName() const;
-    QString versionNumber() const;
-
-    bool isValid() const;
-    QObject* serviceObject();
-
-Q_SIGNALS:
-    void validChanged();
-    void serviceObjectChanged();
-
-private:
-    QServiceManager* serviceManager;
-
-    QServiceInterfaceDescriptor m_descriptor;
-    QObject* serviceInstance;
-};
-
-QML_DECLARE_TYPE(QServiceWrapper);
-
-class QServiceListWrapper : public QObject {
-    Q_OBJECT
-    // ![1]
-    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
-    Q_PROPERTY(QString minVersion READ minVersion WRITE setMinVersion);
-    Q_PROPERTY(QDeclarativeListProperty<QServiceWrapper> services READ services NOTIFY servicesChanged);
-    // ![1]
-
-public:
-    QServiceListWrapper();
-    ~QServiceListWrapper();
-
-    QDeclarativeListProperty<QServiceWrapper> services();
-    
-    void setInterfaceName(const QString& interface);
-    QString interfaceName() const;
-
-    void setMinVersion(const QString& interface);
-    QString minVersion() const;
-    
-private:
-    QServiceManager* serviceManager;
-    QList<QServiceWrapper *> m_services;
-    QString m_interface;
-    QString m_version;
-
-Q_SIGNALS:
-    void servicesChanged(const QDeclarativeListProperty<QServiceWrapper>&);
-};
-
-QML_DECLARE_TYPE(QServiceListWrapper)
-
-#endif
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/resource.qrc
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/resource.qrc	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<RCC>
-    <qresource prefix="/" >
-        <file>sfwexample.qml</file>
-        <file>content/DialScreen.qml</file>
-        <file>content/DialButton.qml</file>
-        <file>content/DialerList.qml</file>
-        <file>content/call.png</file>
-        <file>content/hangup.png</file>
-    </qresource>
-</RCC>
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.cpp	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "sfwexample.h"
-
-DialerServices::DialerServices()
-{
-    serviceManager = new QServiceManager();
-
-    registerExampleServices();
-}
-
-DialerServices::~DialerServices()
-{
-    unregisterExampleServices();
-}
-
-void DialerServices::registerExampleServices()
-{
-    // ![0]
-    QStringList exampleXmlFiles;
-    exampleXmlFiles << "landlinedialerservice.xml" << "voipdialerservice.xml";
-    foreach (const QString &fileName, exampleXmlFiles) {
-        QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
-        serviceManager->addService(path);
-    }
-    // ![0]
-}
-
-void DialerServices::unregisterExampleServices()
-{
-    serviceManager->removeService("LandlineDialer");
-    serviceManager->removeService("VoipDialer");
-}
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.h
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.h	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-***************************************************************************/
-
-#ifndef SFWEXAMPLE_H
-#define SFWEXAMPLE_H
-
-#include <QtCore>
-#include <qserviceinterfacedescriptor.h>
-#include <qservicemanager.h>
-
-QTM_USE_NAMESPACE
-
-class DialerServices : public QObject {
-    Q_OBJECT
-
-public:
-    DialerServices();
-    ~DialerServices();
-
-private:
-    void registerExampleServices();
-    void unregisterExampleServices();
-
-    QServiceManager* serviceManager;
-};
-
-#endif
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.pro
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.pro	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-TEMPLATE = app
-TARGET = declarative-sfw-dialer
-INCLUDEPATH += ../../../src/serviceframework
-
-include(../../examples.pri)
-
-QT += gui declarative
-
-HEADERS += sfwexample.h \
-           qdeclarativeservice.h
-SOURCES += sfwexample.cpp \
-           qdeclarativeservice.cpp \
-           main.cpp
-
-CONFIG += mobility
-MOBILITY = serviceframework
-
-RESOURCES += resource.qrc
-
-symbian {
-    TARGET.CAPABILITY = ALL -TCB
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.qml
--- a/qtmobility/examples/declarative-sfw-dialer/sfwexample/sfwexample.qml	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +0,0 @@
-import Qt 4.7
-import QtMobility.serviceframework 1.0
-import "content"
-
-//Layout of the mainPage
-//----------------------------------------------  ____ mainPage
-//| ------------------- ---------------------- | /
-//| | dialerList     | | dialScreen         | |/
-//| |                 | |                    | |
-//| |                 | |                    | |
-//| |                 | |                    | |
-//| ------------------- |                    | |
-//| ------------------- |                    | |
-//| | serviceDetails  | |                    | |
-//| ------------------- |                    | |
-//|                     |                    | |
-//|                     |                    | |
-//|                     |                    | |
-//|                     |                    | |
-//| ------------------- |                    | |
-//| | status          | |                    | |
-//| ------------------- ---------------------- |
-//----------------------------------------------
-
-Rectangle {
-    property var dialerObject: defaultService.serviceObject
-    
-    id: mainPage
-    width: 500
-    height: 250
-    color: "white"
-
-    DialerList {
-        id: dialerList
-        height: childrenRect.height + 10
-        width: childrenRect.width
-        anchors.top: parent.top
-        anchors.left: parent.left
-        anchors.right: dialScreen.left
-        anchors.topMargin: 5
-        anchors.leftMargin: 5
-        anchors.rightMargin: 5
-        radius: 5
-        color: "steelblue"
-        border.color: "black"
-        border.width: 3
-        gradient:     
-            Gradient {
-                GradientStop {
-                    position: 0.0
-                    color: "lightsteelblue"
-                }
-                
-                GradientStop {
-                    position: 1.0
-                    color: "steelblue"
-                }
-            }
-        onSignalSelected: { serviceSelected(); }
-    }
-
-    function serviceSelected()
-    {
-        dialerObject = dialerList.dialService.serviceObject
-
-        serviceDetails.text = "Selected dial service:" + "\n   " + 
-                               dialerList.dialService.serviceName + 
-                               "\n   (" + dialerList.dialService.versionNumber + ")";
-    }
-    
-    Text {
-        id: serviceDetails
-        text: "Selected dial service:"
-        anchors.topMargin: 5
-        anchors.leftMargin: 5
-        anchors.rightMargin: 5;
-        anchors.left: parent.left
-        anchors.top: dialerList.bottom
-    }
-    
-    Text {
-        id: status
-        anchors.top: parent.bottom
-        anchors.left: parent.left
-        anchors.topMargin: -40
-        anchors.leftMargin: 5
-    }
-    
-    Timer {
-        id: clearStatusTimer
-        interval: 2000
-        running: false
-        repeat: false
-        onTriggered: {
-            status.text = ""
-        }
-    }
-
-    //! [0]
-    DialScreen {
-        id: dialScreen
-        property bool activeCall : false
-        property var currentDialer: 0;
-        anchors.topMargin: 5
-        anchors.leftMargin: 5
-        anchors.rightMargin: 5
-        anchors.right: parent.right
-        anchors.top: parent.top
-        onDial: {
-            if (activeCall == false) {
-                if (dialerList.dialService != 0) {
-                    var o = dialerObject;
-                    status.text = "Dialing " + numberToDial +"...";
-                    dialScreen.currentDialer = o;
-                    o.dialNumber(numberToDial);
-                    activeCall = true;
-                }
-            }
-        }
-        onHangup: {
-            if (activeCall) {
-                if (dialScreen.currentDialer != 0) {
-                    dialScreen.currentDialer.hangup();
-                }
-                status.text = "Hang up";
-            }
-        }
-    }
-    //! [0]
-
-    //! [1]
-    Connections {
-        target: dialerObject
-        
-        onStateChanged: {
-            if (dialScreen.currentDialer.state == 1) {
-                status.text += "\nRinging";
-            } 
-            else if (dialScreen.currentDialer.state == 2) {
-                status.text += "\nConnected";
-            } 
-            else if (dialScreen.currentDialer.state == 0) {
-                status.text += "\nConnection terminated";
-                dialScreen.activeCall = false;
-                clearStatusTimer.running = true;
-            } 
-            else if (dialScreen.currentDialer.state == 3) {
-                status.text += "\nPhone already engaged";
-            }
-        }
-    }
-    //! [1]
-
-    Service {
-        id: defaultService
-        interfaceName: "com.nokia.qt.examples.Dialer"
-    }
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.cpp
--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,39 +1,40 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+**
+**
+**
+**
+**
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.h
--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,39 +1,40 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+**
+**
+**
+**
+**
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro
--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialer.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,8 @@
 TEMPLATE = lib
 CONFIG += plugin
 INCLUDEPATH += ../../../src/serviceframework
+PLUGIN_TYPE = serviceframework
+
 HEADERS += voipdialer.h \
            voipdialerplugin.h
 SOURCES += voipdialer.cpp \
@@ -17,8 +19,6 @@
     TARGET.CAPABILITY = ALL -TCB
 }
 
-xml.path = $$DESTDIR/xmldata
+xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata
 xml.files = voipdialerservice.xml
-xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
 INSTALLS += xml
-build_pass:ALL_DEPS+=install_xml
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp
--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,39 +1,40 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+**
+**
+**
+**
+**
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.h
--- a/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/voipdialerplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,39 +1,40 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
+** 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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 **
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+**
+**
+**
+**
+**
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-dialer/voipdialer/xmldata/voipdialerservice.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-dialer/voipdialer/xmldata/voipdialerservice.xml	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<service>
+    <name>VoipDialer</name>
+    <filepath>serviceframework_voipdialerservice</filepath>
+    <description>Voip Dialer</description>
+    <interface>
+        <name>com.nokia.qt.examples.Dialer</name>
+        <version>1.0</version>
+        <description>VoIP based implementation Dialer</description>
+    </interface>
+</service>
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-notes/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/declarative-sfw-notes/README	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,8 @@
+This example requires the example Notes Manager service to be registered in order 
+for the application to obtain the default interface. This can be done by using the 
+service framework command line tool to add the corresponding service XML file:
+
+./servicefw add notesmanagerservice.xml
+
+The XML files for all example services can be found in the QtMobility build directory
+under install/bin/xmldata
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-notes/declarative-sfw-notes.pro
--- a/qtmobility/examples/declarative-sfw-notes/declarative-sfw-notes.pro	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-TEMPLATE = app
-TARGET = declarative-sfw-notes
-INCLUDEPATH += ../../src/serviceframework
-
-include(../examples.pri)
-
-QT += declarative
-
-HEADERS += sfwnotes.h \
-           qdeclarativeservice.h
-SOURCES += sfwnotes.cpp \
-           qdeclarativeservice.cpp \
-           main.cpp
-
-CONFIG += mobility
-MOBILITY = serviceframework
-
-RESOURCES += sfwnotes.qrc
-
-OTHER_FILES = declarative-sfw-notes.qml
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-notes/declarative-sfw-notes.qml
--- a/qtmobility/examples/declarative-sfw-notes/declarative-sfw-notes.qml	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/declarative-sfw-notes/declarative-sfw-notes.qml	Fri Jun 11 14:26:25 2010 +0300
@@ -11,7 +11,7 @@
     property bool validService: false
 
     // ![1]
-    property var notesManager: notesService.serviceObject
+    property variant notesManager: notesService.serviceObject
     // ![1]
 
     id: mainWindow
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-notes/main.cpp
--- a/qtmobility/examples/declarative-sfw-notes/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QUrl>
-#include <QtCore>
-
-#include <QDeclarativeView>
-#include <qdeclarative.h>
-
-#include "sfwnotes.h"
-#include "qdeclarativeservice.h"
-
-int main(int argc, char* argv[])
-{
-    qmlRegisterType<QServiceWrapper>("QtMobility.serviceframework", 1, 0, "Service");
-
-    QApplication app(argc, argv);
-
-    ToDoTool *td = new ToDoTool();
-
-    QDeclarativeView canvas;
-    canvas.setSource(QUrl("qrc:/declarative-sfw-notes.qml"));
-    canvas.show();
-
-    return app.exec();
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-notes/qdeclarativeservice.cpp
--- a/qtmobility/examples/declarative-sfw-notes/qdeclarativeservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-/****************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativeservice.h"
-
-QServiceWrapper::QServiceWrapper()
-: serviceInstance(0)
-{
-    serviceManager = new QServiceManager();
-}
-
-QServiceWrapper::~QServiceWrapper()
-{
-    delete serviceInstance;
-}
-
-bool QServiceWrapper::isValid() const
-{
-    return m_descriptor.isValid();
-}
-
-void QServiceWrapper::setInterfaceDesc(const QServiceInterfaceDescriptor &desc)
-{
-    if (desc == m_descriptor)
-        return;
-
-    m_descriptor = desc;
-
-    if (serviceInstance)
-        delete serviceInstance;
-
-    serviceInstance = 0;
-}
-
-QServiceInterfaceDescriptor QServiceWrapper::interfaceDesc() const
-{
-    return m_descriptor;
-}
-
-void QServiceWrapper::setInterfaceName(const QString &interface)
-{
-    m_descriptor = serviceManager->interfaceDefault(interface);
-
-    if (!isValid())
-        qWarning() << "WARNING: No default service found for interface name: " << interface;
-}
-
-QString QServiceWrapper::interfaceName() const
-{
-    if (isValid())
-        return m_descriptor.interfaceName();
-    else
-        return "No Interface";
-}
-
-QString QServiceWrapper::serviceName() const
-{
-    if (isValid())
-        return m_descriptor.serviceName();
-    else
-        return "No Service";
-}
-
-QString QServiceWrapper::versionNumber() const
-{
-    if (isValid())
-        return (QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion()));
-    else
-        return "0.0";
-}
-
-QObject* QServiceWrapper::serviceObject()
-{
-    if (serviceInstance) {
-        return serviceInstance;
-    }
-
-    if (isValid()) {
-        QServiceManager manager;
-        serviceInstance = manager.loadInterface(m_descriptor);
-        return serviceInstance;
-    } else {
-        return 0;
-    }
-}
-
-QServiceListWrapper::QServiceListWrapper()
-{
-    serviceManager = new QServiceManager();
-}
-
-QServiceListWrapper::~QServiceListWrapper()
-{
-}
-
-void QServiceListWrapper::setInterfaceName(const QString &interface)
-{
-    m_interface = interface;
-
-    QServiceWrapper *service;
-    QServiceFilter filter(m_interface, m_version);
-    QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter);
-    for (int i = 0; i < list.size(); i++) {
-        service = new QServiceWrapper();
-        service->setInterfaceDesc(list.at(i));
-        m_services.append(service);
-    }
-}
-
-QString QServiceListWrapper::interfaceName() const
-{
-    return m_interface;
-}
-
-void QServiceListWrapper::setMinVersion(const QString &version)
-{
-    m_version = version;
-}
-
-QString QServiceListWrapper::minVersion() const
-{
-    return m_version;
-}
-
-QDeclarativeListProperty<QServiceWrapper> QServiceListWrapper::services()
-{
-    return QDeclarativeListProperty<QServiceWrapper>(this, m_services);
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-notes/qdeclarativeservice.h
--- a/qtmobility/examples/declarative-sfw-notes/qdeclarativeservice.h	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/****************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-***************************************************************************/
-
-#ifndef QDECLARATIVESERVICE_H
-#define QDECLARATIVESERVICE_H
-
-#include <QtCore>
-#include <qserviceinterfacedescriptor.h>
-#include <qservicemanager.h>
-#include <qdeclarative.h>
-#include <qdeclarativelist.h>
-
-QTM_USE_NAMESPACE
-
-Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
-
-class QServiceWrapper : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
-    Q_PROPERTY(QString serviceName READ serviceName);
-    Q_PROPERTY(QString versionNumber READ versionNumber);
-    Q_PROPERTY(bool valid READ isValid NOTIFY validChanged);
-    Q_PROPERTY(QObject* serviceObject READ serviceObject NOTIFY serviceObjectChanged);
-
-public:
-    QServiceWrapper();
-    ~QServiceWrapper();
-
-    void setInterfaceDesc(const QServiceInterfaceDescriptor& desc);
-    QServiceInterfaceDescriptor interfaceDesc() const;
-
-    void setInterfaceName(const QString& interface);
-    QString interfaceName() const;
-    QString serviceName() const;
-    QString versionNumber() const;
-
-    bool isValid() const;
-    QObject* serviceObject();
-
-Q_SIGNALS:
-    void validChanged();
-    void serviceObjectChanged();
-
-private:
-    QServiceManager* serviceManager;
-
-    QServiceInterfaceDescriptor m_descriptor;
-    QObject* serviceInstance;
-};
-
-QML_DECLARE_TYPE(QServiceWrapper);
-
-class QServiceListWrapper : public QObject {
-    Q_OBJECT
-    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
-    Q_PROPERTY(QString minVersion READ minVersion WRITE setMinVersion);
-    Q_PROPERTY(QDeclarativeListProperty<QServiceWrapper> services READ services NOTIFY servicesChanged);
-
-public:
-    QServiceListWrapper();
-    ~QServiceListWrapper();
-
-    QDeclarativeListProperty<QServiceWrapper> services();
-    
-    void setInterfaceName(const QString& interface);
-    QString interfaceName() const;
-
-    void setMinVersion(const QString& interface);
-    QString minVersion() const;
-    
-private:
-    QServiceManager* serviceManager;
-    QList<QServiceWrapper *> m_services;
-    QString m_interface;
-    QString m_version;
-
-Q_SIGNALS:
-    void servicesChanged(const QDeclarativeListProperty<QServiceWrapper>&);
-};
-
-QML_DECLARE_TYPE(QServiceListWrapper)
-
-#endif
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-notes/sfwnotes.cpp
--- a/qtmobility/examples/declarative-sfw-notes/sfwnotes.cpp	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "sfwnotes.h"
-
-ToDoTool::ToDoTool()
-{
-    serviceManager = new QServiceManager();
-    
-    registerExampleServices();
-}
-
-ToDoTool::~ToDoTool()
-{
-    unregisterExampleServices();
-}
-
-void ToDoTool::registerExampleServices()
-{
-    QStringList exampleXmlFiles;
-    exampleXmlFiles << "notesmanagerservice.xml";
-    foreach (const QString &fileName, exampleXmlFiles) {
-        QString path = QCoreApplication::applicationDirPath() + "/xmldata/" + fileName;
-        serviceManager->addService(path);
-    }
-}
-
-void ToDoTool::unregisterExampleServices()
-{
-    serviceManager->removeService("NotesManagerService");
-}
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-notes/sfwnotes.h
--- a/qtmobility/examples/declarative-sfw-notes/sfwnotes.h	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** 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:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-***************************************************************************/
-
-#ifndef SFWNOTES_H
-#define SFWNOTES_H
-
-#include <QtCore>
-#include <qserviceinterfacedescriptor.h>
-#include <qservicemanager.h>
-
-QTM_USE_NAMESPACE
-
-class ToDoTool : public QObject {
-    Q_OBJECT
-
-public:
-    ToDoTool();
-    ~ToDoTool();
-    
-private:
-    void registerExampleServices();
-    void unregisterExampleServices();
-    
-    QServiceManager* serviceManager;
-};
-
-#endif
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/declarative-sfw-notes/sfwnotes.qrc
--- a/qtmobility/examples/declarative-sfw-notes/sfwnotes.qrc	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-<RCC>
-    <qresource prefix="/" >
-        <file>declarative-sfw-notes.qml</file>
-        <file>content/Button.qml</file>
-        <file>content/Dialog.qml</file> 
-        <file>content/InputDialog.qml</file>
-        <file>content/icons/addIcon.png</file>
-        <file>content/icons/deleteIcon.png</file>
-        <file>content/icons/searchIcon.png</file>
-        <file>content/icons/nextIcon.png</file>
-        <file>content/icons/prevIcon.png</file>
-    </qresource>
-</RCC>
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/examples.pri
--- a/qtmobility/examples/examples.pri	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/examples.pri	Fri Jun 11 14:26:25 2010 +0300
@@ -20,7 +20,6 @@
 }
 
 OUTPUT_DIR = $$QT_MOBILITY_BUILD_TREE
-DESTDIR = $$OUTPUT_DIR/bin/examples
 MOC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/moc
 RCC_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/rcc
 UI_DIR = $$OUTPUT_DIR/build/$$SUBDIRPART/$$TARGET/ui
@@ -30,6 +29,13 @@
 QMAKE_RPATHDIR+=$$OUTPUT_DIR/lib
 INCLUDEPATH+= $$QT_MOBILITY_SOURCE_TREE/src/global
 
+!plugin {
+    target.path=$$QT_MOBILITY_PREFIX/bin
+} else {
+    target.path = $${QT_MOBILITY_PLUGINS}/$${PLUGIN_TYPE}
+}
+INSTALLS += target
+
 maemo6 {
     DEFINES+= Q_WS_MAEMO_6
     DEFINES+= QTM_EXAMPLES_SMALL_SCREEN
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/examples.pro
--- a/qtmobility/examples/examples.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/examples.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -12,11 +12,16 @@
     !symbian:SUBDIRS+= sfw-notes
     
     contains(QT_CONFIG, declarative) {
-        SUBDIRS += declarative-sfw-notes \
-                   declarative-sfw-dialer
+        SUBDIRS += declarative-sfw-dialer
+
+        sources.files += declarative-sfw-notes \
+                         declarative-sfw-dialer/declarative-sfw-dialer
     }
 }
 
+sources.path = $$QT_MOBILITY_PREFIX/bin
+INSTALLS += sources
+
 #BearerManagement examples
 contains(mobility_modules,bearer) {
     SUBDIRS += bearermonitor bearercloud
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/fetchgooglemaps/fetchgooglemaps.pro
--- a/qtmobility/examples/fetchgooglemaps/fetchgooglemaps.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/fetchgooglemaps/fetchgooglemaps.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -16,19 +16,22 @@
 include(../examples.pri)
 
 CONFIG += mobility
-MOBILITY = location
-!maemo5:MOBILITY += bearer
+MOBILITY = location bearer
 
-symbian: {
-    addFiles.sources = nmealog.txt
-    DEPLOYMENT += addFiles
-    
-    TARGET.CAPABILITY = Location NetworkServices
+symbian|wince* {
+    symbian {
+        addFiles.sources = nmealog.txt
+        DEPLOYMENT += addFiles
+        TARGET.CAPABILITY += Location \
+                NetworkServices
+    }
+    wince* {
+        addFiles.sources = ./nmealog.txt
+        addFiles.path = .
+        DEPLOYMENT += addFiles
+    }
 } else {
-    logfile.path = $$DESTDIR
+    logfile.path = $$QT_MOBILITY_PREFIX/bin
     logfile.files = nmealog.txt
-    logfile.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
     INSTALLS += logfile
-    build_pass:ALL_DEPS+=install_logfile
 }
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/fetchgooglemaps/main.cpp
--- a/qtmobility/examples/fetchgooglemaps/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/fetchgooglemaps/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/fetchgooglemaps/mapwindow.cpp
--- a/qtmobility/examples/fetchgooglemaps/mapwindow.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/fetchgooglemaps/mapwindow.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,10 +44,8 @@
 #include <qgeopositioninfosource.h>
 #include <qnmeapositioninfosource.h>
 #include <qgeosatelliteinfosource.h>
-#ifndef Q_WS_MAEMO_5
 #include <qnetworksession.h>
 #include <qnetworkconfigmanager.h>
-#endif
 
 #include "satellitedialog.h"
 
@@ -136,9 +134,7 @@
 MapWindow::~MapWindow()
 {
     location->stopUpdates();
-#ifndef Q_WS_MAEMO_5
     session->close();
-#endif
 }
 
 void MapWindow::delayedInit()
@@ -151,7 +147,6 @@
         location->stopUpdates();
     }
 
-#ifndef Q_WS_MAEMO_5
     // Set Internet Access Point
     QNetworkConfigurationManager manager;
     const bool canStartIAP = (manager.capabilities()
@@ -167,7 +162,6 @@
     session = new QTM_PREPEND_NAMESPACE(QNetworkSession)(cfg, this);
     session->open();
     session->waitForOpened(-1);
-#endif
     connect(location, SIGNAL(updateTimeout()), this, SLOT(waitForFix()));
 
     location->startUpdates();
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/fetchgooglemaps/mapwindow.h
--- a/qtmobility/examples/fetchgooglemaps/mapwindow.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/fetchgooglemaps/mapwindow.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -53,9 +53,7 @@
 QTM_BEGIN_NAMESPACE
 class QGeoPositionInfo;
 class QGeoPositionInfoSource;
-#ifndef Q_WS_MAEMO_5
 class QNetworkSession;
-#endif
 QTM_END_NAMESPACE
 
 QTM_USE_NAMESPACE
@@ -81,9 +79,7 @@
     QLabel *headingAndSpeedLabel;
     QLabel *dateTimeLabel;
     bool loading;
-#ifndef Q_WS_MAEMO_5
     QTM_PREPEND_NAMESPACE(QNetworkSession) *session;
-#endif
     bool usingLogFile;
     QGeoPositionInfoSource *location;
     bool waitingForFix;
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/filemanagerplugin/filemanagerplugin.cpp
--- a/qtmobility/examples/filemanagerplugin/filemanagerplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagerplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/filemanagerplugin/filemanagerplugin.h
--- a/qtmobility/examples/filemanagerplugin/filemanagerplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagerplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/filemanagerplugin/filemanagerplugin.pro
--- a/qtmobility/examples/filemanagerplugin/filemanagerplugin.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagerplugin.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,5 +1,6 @@
 TEMPLATE = lib
 CONFIG += plugin
+PLUGIN_TYPE=serviceframework
 INCLUDEPATH += ../../src/serviceframework
 HEADERS += filemanagerplugin.h \
            filemanagerstorage.h \
@@ -24,8 +25,6 @@
     TARGET.CAPABILITY = LocalServices Location NetworkServices ReadUserData WriteUserData UserEnvironment
 }
 
-xml.path = $$DESTDIR/xmldata
+xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata
 xml.files = filemanagerservice.xml
-xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
 INSTALLS += xml
-build_pass:ALL_DEPS+=install_xml
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/filemanagerplugin/filemanagerstorage.cpp
--- a/qtmobility/examples/filemanagerplugin/filemanagerstorage.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagerstorage.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/filemanagerplugin/filemanagerstorage.h
--- a/qtmobility/examples/filemanagerplugin/filemanagerstorage.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagerstorage.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/filemanagerplugin/filemanagertransfer.cpp
--- a/qtmobility/examples/filemanagerplugin/filemanagertransfer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagertransfer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/filemanagerplugin/filemanagertransfer.h
--- a/qtmobility/examples/filemanagerplugin/filemanagertransfer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/filemanagerplugin/filemanagertransfer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/flickrdemo/connectivityhelper.cpp
--- a/qtmobility/examples/flickrdemo/connectivityhelper.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/flickrdemo/connectivityhelper.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/flickrdemo/connectivityhelper.h
--- a/qtmobility/examples/flickrdemo/connectivityhelper.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/flickrdemo/connectivityhelper.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/flickrdemo/flickrdemo.cpp
--- a/qtmobility/examples/flickrdemo/flickrdemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/flickrdemo/flickrdemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/flickrdemo/flickrdemo.h
--- a/qtmobility/examples/flickrdemo/flickrdemo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/flickrdemo/flickrdemo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/flickrdemo/flickrdemo.pro
--- a/qtmobility/examples/flickrdemo/flickrdemo.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/flickrdemo/flickrdemo.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -24,19 +24,24 @@
 
 ICON = flickr_icon.svg
 
-symbian:TARGET.CAPABILITY += Location \
-    NetworkServices \
-    ReadUserData
 
-symbian: {
-    addFiles.sources = nmealog.txt
-    DEPLOYMENT += addFiles
+symbian|wince* {
+    symbian {
+        addFiles.sources = nmealog.txt
+        DEPLOYMENT += addFiles
+        TARGET.CAPABILITY += Location \
+                NetworkServices \
+                ReadUserData
+    }
+    wince* {
+        addFiles.sources = ./nmealog.txt
+        addFiles.path = .
+        DEPLOYMENT += addFiles
+    }
 } else {
-    logfile.path = $$DESTDIR
+    logfile.path = $$QT_MOBILITY_PREFIX/bin
     logfile.files = nmealog.txt
-    logfile.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
     INSTALLS += logfile
-    build_pass:ALL_DEPS+=install_logfile
 }
 
 wince*: {
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/flickrdemo/main.cpp
--- a/qtmobility/examples/flickrdemo/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/flickrdemo/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/flickrdemo/xqlistwidget.cpp
--- a/qtmobility/examples/flickrdemo/xqlistwidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/flickrdemo/xqlistwidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/flickrdemo/xqlistwidget.h
--- a/qtmobility/examples/flickrdemo/xqlistwidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/flickrdemo/xqlistwidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/keepintouch/addressfinder.cpp
--- a/qtmobility/examples/keepintouch/addressfinder.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/keepintouch/addressfinder.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/keepintouch/addressfinder.h
--- a/qtmobility/examples/keepintouch/addressfinder.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/keepintouch/addressfinder.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/keepintouch/main.cpp
--- a/qtmobility/examples/keepintouch/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/keepintouch/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/lightmaps/lightmaps.cpp
--- a/qtmobility/examples/lightmaps/lightmaps.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/lightmaps/lightmaps.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/lightmaps/lightmaps.pro
--- a/qtmobility/examples/lightmaps/lightmaps.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/lightmaps/lightmaps.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -17,21 +17,23 @@
 
 include(../examples.pri)
 
-symbian {
-    TARGET.CAPABILITY = NetworkServices Location ReadUserData
-    TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
-}
-
 CONFIG += mobility
 MOBILITY = location bearer
 
-symbian: {
-    addFiles.sources = nmealog.txt
-    DEPLOYMENT += addFiles
+symbian|wince* {
+    symbian {
+        addFiles.sources = nmealog.txt
+        DEPLOYMENT += addFiles
+        TARGET.CAPABILITY = NetworkServices Location ReadUserData
+        TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+    }
+    wince*: {
+        addFiles.sources = ./nmealog.txt
+        addFiles.path = .
+        DEPLOYMENT += addFiles
+    }
 } else {
-    logfile.path = $$DESTDIR
+    logfile.path = $$QT_MOBILITY_PREFIX/bin
     logfile.files = nmealog.txt
-    logfile.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
     INSTALLS += logfile
-    build_pass:ALL_DEPS+=install_logfile
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/logfilepositionsource/clientapplication.cpp
--- a/qtmobility/examples/logfilepositionsource/clientapplication.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/clientapplication.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/logfilepositionsource/clientapplication.h
--- a/qtmobility/examples/logfilepositionsource/clientapplication.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/clientapplication.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/logfilepositionsource/logfilepositionsource.cpp
--- a/qtmobility/examples/logfilepositionsource/logfilepositionsource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/logfilepositionsource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/logfilepositionsource/logfilepositionsource.h
--- a/qtmobility/examples/logfilepositionsource/logfilepositionsource.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/logfilepositionsource.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/logfilepositionsource/logfilepositionsource.pro
--- a/qtmobility/examples/logfilepositionsource/logfilepositionsource.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/logfilepositionsource.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -14,23 +14,21 @@
 CONFIG += mobility
 MOBILITY = location
 
-symbian|wince*: {
-    symbian: {
+symbian|wince* {
+    symbian {
         addFiles.sources = simplelog.txt
         DEPLOYMENT += addFiles
     
         TARGET.CAPABILITY = Location
     }
-    wince*: {
+    wince* {
         addFiles.sources = ./simplelog.txt
         addFiles.path = .
         DEPLOYMENT += addFiles
     }
 } else {
-    logfileexample.path = $$DESTDIR
+    logfileexample.path = $$QT_MOBILITY_PREFIX/bin
     logfileexample.files = simplelog.txt
-    logfileexample.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
     INSTALLS += logfileexample
-    build_pass:ALL_DEPS+=install_logfileexample
 }
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/logfilepositionsource/main.cpp
--- a/qtmobility/examples/logfilepositionsource/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/logfilepositionsource/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/notesmanagerplugin/note.h
--- a/qtmobility/examples/notesmanagerplugin/note.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/note.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/notesmanagerplugin/notesmanager.cpp
--- a/qtmobility/examples/notesmanagerplugin/notesmanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/notesmanagerplugin/notesmanager.h
--- a/qtmobility/examples/notesmanagerplugin/notesmanager.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanager.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/notesmanagerplugin/notesmanagerplugin.cpp
--- a/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/notesmanagerplugin/notesmanagerplugin.h
--- a/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/notesmanagerplugin/notesmanagerplugin.pro
--- a/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/notesmanagerplugin/notesmanagerplugin.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,7 @@
 TEMPLATE = lib
 CONFIG += plugin
 INCLUDEPATH += ../../src/serviceframework
+PLUGIN_TYPE = serviceframework
 HEADERS += note.h \
            notesmanagerplugin.h \
            notesmanager.h
@@ -8,7 +9,6 @@
            notesmanager.cpp
 QT += sql
 TARGET = serviceframework_notesmanagerplugin
-DESTDIR = .
 
 contains(QT_CONFIG, declarative):DEFINES += DECLARATIVE
 
@@ -26,8 +26,6 @@
     TARGET.CAPABILITY = ALL -TCB
 }
 
-xml.path = $$DESTDIR/xmldata
+xml.path = $$QT_MOBILITY_PREFIX/bin/xmldata
 xml.files = notesmanagerservice.xml
-xml.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
 INSTALLS += xml
-build_pass:ALL_DEPS+=install_xml
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/main.cpp
--- a/qtmobility/examples/player/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/mediakeysobserver.cpp
--- a/qtmobility/examples/player/mediakeysobserver.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/mediakeysobserver.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/mediakeysobserver.h
--- a/qtmobility/examples/player/mediakeysobserver.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/mediakeysobserver.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/player.cpp
--- a/qtmobility/examples/player/player.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/player.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/player.h
--- a/qtmobility/examples/player/player.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/player.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/playercontrols.cpp
--- a/qtmobility/examples/player/playercontrols.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/playercontrols.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/playercontrols.h
--- a/qtmobility/examples/player/playercontrols.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/playercontrols.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/playlistmodel.cpp
--- a/qtmobility/examples/player/playlistmodel.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/playlistmodel.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/playlistmodel.h
--- a/qtmobility/examples/player/playlistmodel.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/playlistmodel.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/videowidget.cpp
--- a/qtmobility/examples/player/videowidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/videowidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/player/videowidget.h
--- a/qtmobility/examples/player/videowidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/player/videowidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/publish-subscribe/main.cpp
--- a/qtmobility/examples/publish-subscribe/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/publish-subscribe/publisherdialog.cpp
--- a/qtmobility/examples/publish-subscribe/publisherdialog.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/publisherdialog.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/publish-subscribe/publisherdialog.h
--- a/qtmobility/examples/publish-subscribe/publisherdialog.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/publisherdialog.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/publish-subscribe/subscriberdialog.cpp
--- a/qtmobility/examples/publish-subscribe/subscriberdialog.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/subscriberdialog.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/publish-subscribe/subscriberdialog.h
--- a/qtmobility/examples/publish-subscribe/subscriberdialog.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/publish-subscribe/subscriberdialog.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/qmlcontacts/main.cpp
--- a/qtmobility/examples/qmlcontacts/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/qmlcontacts/qmlcontact.cpp
--- a/qtmobility/examples/qmlcontacts/qmlcontact.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/qmlcontact.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/qmlcontacts/qmlcontact.h
--- a/qtmobility/examples/qmlcontacts/qmlcontact.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/qmlcontact.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/qmlcontacts/qmlcontacts.cpp
--- a/qtmobility/examples/qmlcontacts/qmlcontacts.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/qmlcontacts.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/qmlcontacts/qmlcontactsa.h
--- a/qtmobility/examples/qmlcontacts/qmlcontactsa.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/qmlcontacts/qmlcontactsa.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/querymessages/main.cpp
--- a/qtmobility/examples/querymessages/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/querymessages/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/quickstart/main.cpp
--- a/qtmobility/examples/quickstart/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/quickstart/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -42,11 +42,7 @@
 #include <QApplication>
 #include <QLabel>
 
-#ifdef Q_OS_SYMBIAN
-#include <qsysteminfo.h>
-#else
 #include <QSystemInfo> //(1)
-#endif
 
 QTM_USE_NAMESPACE //(2)
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/radio/main.cpp
--- a/qtmobility/examples/radio/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/radio/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/radio/radio.cpp
--- a/qtmobility/examples/radio/radio.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/radio/radio.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/radio/radio.h
--- a/qtmobility/examples/radio/radio.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/radio/radio.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/samplephonebook/contacteditor.cpp
--- a/qtmobility/examples/samplephonebook/contacteditor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/samplephonebook/contacteditor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/samplephonebook/contacteditor.h
--- a/qtmobility/examples/samplephonebook/contacteditor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/samplephonebook/contacteditor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/samplephonebook/contactlistpage.cpp
--- a/qtmobility/examples/samplephonebook/contactlistpage.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/samplephonebook/contactlistpage.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/samplephonebook/contactlistpage.h
--- a/qtmobility/examples/samplephonebook/contactlistpage.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/samplephonebook/contactlistpage.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/samplephonebook/filterpage.cpp
--- a/qtmobility/examples/samplephonebook/filterpage.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/samplephonebook/filterpage.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/samplephonebook/filterpage.h
--- a/qtmobility/examples/samplephonebook/filterpage.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/samplephonebook/filterpage.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/samplephonebook/main.cpp
--- a/qtmobility/examples/samplephonebook/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/samplephonebook/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/samplephonebook/phonebook.cpp
--- a/qtmobility/examples/samplephonebook/phonebook.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/samplephonebook/phonebook.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/samplephonebook/phonebook.h
--- a/qtmobility/examples/samplephonebook/phonebook.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/samplephonebook/phonebook.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/satellitedialog/main.cpp
--- a/qtmobility/examples/satellitedialog/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/satellitedialog/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/satellitedialog/satellitedialog.cpp
--- a/qtmobility/examples/satellitedialog/satellitedialog.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/satellitedialog/satellitedialog.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/satellitedialog/satellitedialog.h
--- a/qtmobility/examples/satellitedialog/satellitedialog.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/satellitedialog/satellitedialog.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/accel/main.cpp
--- a/qtmobility/examples/sensors/accel/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/accel/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/arrowkeys/arrowkeys.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/arrowkeys/arrowkeys.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES=main.cpp
+TARGET=arrowkeys
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/arrowkeys/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/arrowkeys/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qaccelerometer.h>
+
+QTM_USE_NAMESPACE
+
+namespace arrows{
+    static const QString ARROW_UP="^", ARROW_DOWN="v", ARROW_LEFT="<",ARROW_RIGHT=">", ARROW_TO=".", ARROW_FROM="x";
+}
+
+class AccelerometerFilter : public QAccelerometerFilter
+{
+public:
+
+    bool filter(QAccelerometerReading *reading)
+    {
+        QString arrow = getArrowKey(reading->x(), reading->y(), reading->z());
+        if (arrow!=exArrow){
+            qDebug() << "direction:" << arrow;
+            exArrow = arrow;
+        }
+        return false; // don't store the reading in the sensor
+    }
+
+private:
+    QString exArrow;
+    static const qreal THRESHOLD;
+
+    QString getArrowKey(qreal x, qreal y, qreal z){
+
+        // axis_z: TO or FROM
+        if (abs(y)<THRESHOLD && abs(x)<THRESHOLD) return z>0?(arrows::ARROW_FROM):(arrows::ARROW_TO);
+
+        // axis_x: LEFT or RIGHT
+        if (abs(x)>abs(y)) return x>0?(arrows::ARROW_LEFT):(arrows::ARROW_RIGHT);
+
+        // axis_y: UP or DOWN
+        return y>0?(arrows::ARROW_DOWN):(arrows::ARROW_UP);
+    }
+
+    static qreal abs(qreal value) {return value<0?-value:value;}
+};
+
+const qreal AccelerometerFilter::THRESHOLD = 0.3;
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+    QAccelerometer sensor;
+    if (!sensor.connectToBackend()) {
+        qWarning("No Accelerometer available!");
+        return 1;
+    }
+    AccelerometerFilter filter;
+    sensor.addFilter(&filter);
+    sensor.start();
+
+    return app.exec();
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/grueapp/main.cpp
--- a/qtmobility/examples/sensors/grueapp/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/grueapp/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/grueplugin/grueplugin.pro
--- a/qtmobility/examples/sensors/grueplugin/grueplugin.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/grueplugin.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,14 +1,15 @@
+TEMPLATE = lib
+CONFIG += plugin
+TARGET = $$qtLibraryTarget(qtsensors_grueplugin)
+PLUGIN_TYPE = sensors
+
 INCLUDEPATH+=../../../src/sensors
 
 include(version.pri)
 include(grueplugin.pri)
-include(../../../common.pri)
-
-PLUGIN_TYPE = sensors
+include(../../examples.pri)
 
-TEMPLATE = lib
-CONFIG += plugin
-TARGET = $$qtLibraryTarget(sensors_grueplugin)
+
 symbian:TARGET.EPOCALLOWDLLDATA = 1
 
 QT=core
@@ -16,7 +17,3 @@
 MOBILITY+=sensors
 
 CONFIG+=strict_flags
-
-target.path = $${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS += target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/grueplugin/gruesensor.cpp
--- a/qtmobility/examples/sensors/grueplugin/gruesensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/grueplugin/gruesensor.h
--- a/qtmobility/examples/sensors/grueplugin/gruesensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/grueplugin/gruesensor_p.h
--- a/qtmobility/examples/sensors/grueplugin/gruesensor_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensor_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/grueplugin/gruesensorimpl.cpp
--- a/qtmobility/examples/sensors/grueplugin/gruesensorimpl.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensorimpl.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/grueplugin/gruesensorimpl.h
--- a/qtmobility/examples/sensors/grueplugin/gruesensorimpl.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/gruesensorimpl.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/grueplugin/main.cpp
--- a/qtmobility/examples/sensors/grueplugin/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/grueplugin/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/metadata/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/metadata/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,145 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qaccelerometer.h>
+#include <qambientlightsensor.h>
+#include <qcompass.h>
+#include <qmagnetometer.h>
+#include <qorientationsensor.h>
+#include <qproximitysensor.h>
+#include <qrotationsensor.h>
+#include <qtapsensor.h>
+
+QTM_USE_NAMESPACE
+
+bool checkSensor( QSensor *sensor )
+{
+    QTextStream out(stdout);
+    bool conclusion = true;
+    out << endl << "--- Metadata ---" << endl;
+
+    // Get readings from functions
+
+    // void     addFilter ( QSensorFilter * filter )
+    qrangelist sen_datarates = sensor->availableDataRates();
+    // bool     connectToBackend ()
+    int sen_datarate = sensor->dataRate();
+    QString sen_desc = sensor->description();
+    int sen_error = sensor->error();
+    QByteArray sen_ident = sensor->identifier();
+    bool sen_active = sensor->isActive();
+    bool sen_busy = sensor->isBusy();
+    bool sen_isConn = sensor->isConnectedToBackend();
+    int sen_outRange = sensor->outputRange();
+    qoutputrangelist sen_outRList = sensor->outputRanges();
+    QSensorReading *sen_reading = sensor->reading();
+    // void 	removeFilter ( QSensorFilter * filter )
+    // void 	setDataRate ( int rate )
+    // void 	setIdentifier ( const QByteArray & identifier )
+    // void 	setOutputRange ( int index )
+    QByteArray sen_type = sensor->type();
+
+    // Print findings
+
+    out << "Identifier: " << sen_ident
+        << " Type: " << sen_type << endl;
+    out << "Description: " << sen_desc << endl;
+    out << "Active: " << sen_active
+        << " Busy: " << sen_busy
+        << " Connected: " << sen_isConn
+        << " Last error: " << sen_error << endl;
+
+    out << "Using datarate: " << sen_datarate
+        << " Out of:";
+    for( int i = 0; i < sen_datarates.size(); ++i )
+    {
+        out << " [" << sen_datarates[i].first << "," << sen_datarates[i].second << "]";
+    }
+    out << endl;
+
+    out << "Using output range: " << sen_outRange
+        << " Out of (min,max,accuracy):";
+    for( int i = 0; i < sen_outRList.size(); ++i )
+    {
+        out << " (" << sen_outRList[i].minimum << "," << sen_outRList[i].maximum << "," << sen_outRList[i].accuracy << ")";
+    }
+    out << endl;
+
+    //out << sen_reading << endl; //QSensorReading *
+
+    return conclusion;
+}
+
+int main( int argc, char **argv )
+{
+    QCoreApplication app(argc, argv);
+    QTextStream out(stdout);
+    bool result = true;
+
+    QSensor *sensors[8];
+    sensors[0] = new QAccelerometer;
+    sensors[1] = new QAmbientLightSensor;
+    sensors[2] = new QCompass;
+    sensors[3] = new QMagnetometer;
+    sensors[4] = new QOrientationSensor;
+    sensors[5] = new QProximitySensor;
+    sensors[6] = new QRotationSensor;
+    sensors[7] = new QTapSensor;
+
+    for( int i = 0; i < 8; ++i )
+    {
+        if( ! sensors[i] )
+        {
+            out << "sensor number " << i << " unavailable" << endl;
+            continue;
+        }
+        if( ! sensors[i]->connectToBackend() )
+        {
+            out << "connectToBackend failed" << endl;
+            result = false;
+        } else {
+            if( ! checkSensor( sensors[i] ) )
+                result = false;
+        }
+    }
+
+    return result;
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/metadata/metadata.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/metadata/metadata.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES=main.cpp
+TARGET=metadata
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/orientation/main.cpp
--- a/qtmobility/examples/sensors/orientation/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/orientation/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/orientation/orientation.qml
--- a/qtmobility/examples/sensors/orientation/orientation.qml	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/orientation/orientation.qml	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/accelerometercontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/accelerometercontroller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,35 @@
+
+
+#include "inputcontroller.h"
+#include "accelerometercontroller.h"
+#include <QTime>
+#include <QDebug>
+
+AccelerometerController::AccelerometerController( ): TimedController(){}
+
+void AccelerometerController::startSensor()
+{
+    m_accelerometer.connectToBackend();
+    m_accelerometer.start();
+    connect(&m_accelerometer, SIGNAL(readingChanged()), this, SLOT(update()));
+    int dataRate = m_accelerometer.dataRate();
+    m_interval = dataRate>0?1000/m_accelerometer.dataRate():20;
+}
+
+void AccelerometerController::stopSensor(){ m_accelerometer.stop();}
+
+void AccelerometerController::update()
+{
+    qreal accX = m_accelerometer.reading()->x();
+    qreal accY= m_accelerometer.reading()->y();
+    m_dx = (int)(2*accX);
+    m_dy= (int)(-2*accY);
+    updateCoordinates();
+}
+
+
+void AccelerometerController::updateCoordinates(){
+    m_x +=m_dx * m_delay / m_interval;
+    m_y +=m_dy * m_delay / m_interval;
+}
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/accelerometercontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/accelerometercontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,34 @@
+#ifndef ACCELEROMETERCONTROLLER_H
+#define ACCELEROMETERCONTROLLER_H
+
+#include "timedcontroller.h"
+#include <qaccelerometer.h>
+#include <QTimer>
+#include <QTime>
+#include <QDebug>
+
+
+
+QTM_USE_NAMESPACE
+
+class AccelerometerController : public TimedController
+{
+    Q_OBJECT
+
+public:
+    AccelerometerController();
+    virtual void startSensor();
+    virtual void stopSensor();
+    virtual void updateCoordinates();
+
+
+public slots:
+    void update();
+
+private:
+    QAccelerometer m_accelerometer; 
+    int m_dx, m_dy;
+
+};
+
+#endif // ACCELEROMETERCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/compasscontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/compasscontroller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,29 @@
+
+
+#include "inputcontroller.h"
+#include "compasscontroller.h"
+#include "view.h"
+
+CompassController::CompassController( ): m_width(View::m_imageWidth){}
+
+
+
+void CompassController::startSensor()
+{
+    m_compass.connectToBackend();
+    m_compass.start();
+    connect(&m_compass, SIGNAL(readingChanged()), this, SLOT(update()));
+}
+
+
+void CompassController::stopSensor(){ m_compass.stop();}
+
+
+void CompassController::update()
+{
+    qreal azimuth = m_compass.reading()->azimuth();
+    m_x = (int)(azimuth * m_width/360);
+}
+
+
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/compasscontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/compasscontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,29 @@
+#ifndef COMPASSCONTROLLER_H
+#define COMPASSCONTROLLER_H
+
+#include "inputcontroller.h"
+#include <qcompass.h>
+
+QTM_USE_NAMESPACE
+
+class CompassController : public InputController
+{
+    Q_OBJECT
+
+public:
+    CompassController();
+    virtual void startSensor();
+    virtual void stopSensor();
+
+private slots:
+    void update();
+
+private:
+    QCompass m_compass;
+    int m_width;
+
+};
+
+
+
+#endif // COMPASSCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/images/foreshore_final.jpg
Binary file qtmobility/examples/sensors/panorama/images/foreshore_final.jpg has changed
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/images/koskipuisto_pieni.jpg
Binary file qtmobility/examples/sensors/panorama/images/koskipuisto_pieni.jpg has changed
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/inputcontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/inputcontroller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,45 @@
+
+#include "inputcontroller.h"
+#include "view.h"
+
+const QString InputController::QACCELEROMETER="QAccelerometer";
+const QString InputController::QORIENTATIONSENSOR = "QOrientationSensor";
+const QString InputController::QMAGNETOMETER = "QMagnetometer";
+const QString InputController::QROTATIONSENSOR = "QRotationSensor";
+const QString InputController::QTAPSENSOR = "QTapSensor";
+const QString InputController::QCOMPASS = "QCompass";
+const QString InputController::QKEYS = "Keys";
+
+
+
+InputController::InputController() : m_x(0), m_y(0) {}
+
+void InputController::keyPressEvent(QKeyEvent *e){}
+
+
+void InputController::start(){
+    startSensor();
+    startTimer();
+}
+
+
+void InputController::stop(){
+    stopSensor();
+    stopTimer();
+}
+
+
+int InputController::getX(){return m_x;}
+
+int InputController::getY() {return m_y;}
+
+void InputController::setX(int x){m_x = x;}
+
+void InputController::setY(int y){m_y = y;}
+
+
+void InputController::startTimer(){}
+void InputController::stopTimer(){}
+void InputController::startSensor(){}
+void InputController::stopSensor(){}
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/inputcontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/inputcontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,40 @@
+#ifndef INPUTCONTROLLER_H
+#define INPUTCONTROLLER_H
+
+#include <QString>
+#include <QWidget>
+
+
+class InputController : public QObject
+{
+//    Q_OBJECT
+public:
+
+    InputController();
+    void start();
+    void stop();
+    virtual void startTimer();
+    virtual void stopTimer();
+    virtual void startSensor();
+    virtual void stopSensor();
+    int getX(), getY();
+    void setX(int x), setY(int y);
+
+    virtual void keyPressEvent(QKeyEvent *e);
+
+    static const QString QACCELEROMETER,
+    QORIENTATIONSENSOR, QROTATIONSENSOR,
+    QMAGNETOMETER, QTAPSENSOR, QCOMPASS, QKEYS;
+
+
+protected:
+    //current coordinates
+    int m_x,m_y;
+
+
+
+
+};
+
+
+#endif // INPUTCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/keycontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/keycontroller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,39 @@
+
+#include "keycontroller.h"
+#include "view.h"
+
+KeyController::KeyController(): TimedController(){}
+
+void KeyController::keyPressEvent(QKeyEvent *e)
+{
+    int code = e->key();
+    handleKeyPress(code);
+    m_step = m_exCode==code && m_exCode > 0? m_step+2 : 5;
+}
+
+
+void KeyController::updateCoordinates() { handleKeyPress(m_exCode);}
+
+
+void KeyController::handleKeyPress(int code){
+    switch (code){
+    case Qt::Key_Right:
+        m_x+=m_step;
+        break;
+    case Qt::Key_Left:
+        m_x-=m_step;
+        break;
+    case Qt::Key_Up:
+        m_y-=m_step;
+        break;
+    case Qt::Key_Down:
+        m_y+=m_step;
+        break;
+    default:
+        m_exCode = 0;
+        return;
+    }
+    m_exCode = code;
+}
+
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/keycontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/keycontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,26 @@
+#ifndef KEYCONTROLLER_H
+#define KEYCONTROLLER_H
+
+#include "timedcontroller.h"
+#include <QKeyEvent>
+#include <QDebug>
+#include <QTimer>
+
+class KeyController : public TimedController
+{
+    Q_OBJECT
+
+public:
+    KeyController();
+    void handleKeyPress(int code);
+    virtual void updateCoordinates();
+
+protected:
+    virtual void keyPressEvent(QKeyEvent *e);
+    int m_exCode;
+    int m_step;
+
+};
+
+
+#endif // KEYCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/magnetometercontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/magnetometercontroller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,34 @@
+
+
+#include "inputcontroller.h"
+#include "magnetometercontroller.h"
+#include "view.h"
+#include <qmagnetometer.h>
+
+MagnetometerController::MagnetometerController(): m_width(View::m_imageWidth){}
+
+
+void MagnetometerController::startSensor()
+{
+    m_magnetometer.setProperty("returnGeoValues", true);
+    m_magnetometer.connectToBackend();
+    m_magnetometer.start();
+    connect(&m_magnetometer, SIGNAL(readingChanged()), this, SLOT(update()));
+}
+
+void MagnetometerController::stopSensor() { m_magnetometer.stop();}
+
+
+void MagnetometerController::update()
+{
+    qreal azimuth = -m_magnetometer.reading()->z();
+    azimuth = azimuth<0?360+azimuth:azimuth;
+    m_x = (int)(-azimuth * m_width/360);
+
+
+    //TODO: consider provide y values based on x and y
+}
+
+
+
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/magnetometercontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/magnetometercontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,30 @@
+#ifndef MAGNETOMETERCONTROLLER_H
+#define MAGNETOMETERCONTROLLER_H
+
+#include "inputcontroller.h"
+#include <qmagnetometer.h>
+
+
+
+class MagnetometerController : public InputController
+{
+    Q_OBJECT
+
+public:
+    MagnetometerController();
+    virtual void startSensor();
+    virtual void stopSensor();
+
+private slots:
+    void update();
+
+private:
+    QTM_NAMESPACE::QMagnetometer  m_magnetometer;
+    int m_width;
+    int m_height;
+
+};
+
+
+
+#endif // MAGNETOMETERCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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 QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.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.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "view.h"
+#include <QtGui>
+#include <QtCore/qstate.h>
+
+class Pixmap : public QObject, public QGraphicsPixmapItem
+{
+    Q_OBJECT
+    Q_PROPERTY(QPointF pos READ pos WRITE setPos)
+public:
+            Pixmap(const QPixmap &pix)
+                : QObject(), QGraphicsPixmapItem(pix)
+    {
+        setCacheMode(DeviceCoordinateCache);
+    }
+};
+
+
+int main(int argc, char **argv)
+{
+
+    QApplication app(argc, argv);
+
+    Q_INIT_RESOURCE(panorama);
+    QGraphicsScene scene(0, 0, 700, 700);
+    View *view = new View(&scene);
+    view->show();
+
+#ifdef QT_KEYPAD_NAVIGATION
+    QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
+#endif
+
+    return app.exec();
+}
+
+
+
+
+
+#include "main.moc"
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/orientationcontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/orientationcontroller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,54 @@
+
+
+#include "keycontroller.h"
+#include "orientationcontroller.h"
+#include "view.h"
+
+
+OrientationController::OrientationController( ): KeyController(){
+    m_delay=20;
+    m_step=7;
+}
+
+
+void OrientationController::startSensor()
+{
+    m_orientationSensor.connectToBackend();
+    m_orientationSensor.start();
+    connect(&m_orientationSensor, SIGNAL(readingChanged()), this, SLOT(update()));
+}
+
+void OrientationController::stopSensor(){ m_orientationSensor.stop();}
+
+
+void OrientationController::updateCoordinates(){
+    handleKeyPress(m_exCode);
+    m_step = m_exCode!=0? m_step+2 : 5;
+}
+
+
+void OrientationController::update()
+{
+    switch (m_orientationSensor.reading()->orientation()){
+    case QTM_NAMESPACE::QOrientationReading::TopUp:
+        m_exCode = Qt::Key_Up;
+        break;
+    case QTM_NAMESPACE::QOrientationReading::TopDown:
+        m_exCode = Qt::Key_Down;
+        break;
+    case QTM_NAMESPACE::QOrientationReading::LeftUp:
+        m_exCode = Qt::Key_Left;
+        break;
+    case QTM_NAMESPACE::QOrientationReading::RightUp:
+        m_exCode = Qt::Key_Right;
+        break;
+    default:
+        m_exCode = 0;
+        return;
+    }
+    handleKeyPress(m_exCode);
+}
+
+
+
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/orientationcontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/orientationcontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,33 @@
+#ifndef ORIENTATIONCONTROLLER_H
+#define ORIENTATIONCONTROLLER_H
+
+
+#include "keycontroller.h"
+#include <qorientationsensor.h>
+#include <QTime>
+#include <QTimer>
+
+
+//QTM_USE_NAMESPACE
+
+class OrientationController : public KeyController
+{
+    Q_OBJECT
+
+public:
+    OrientationController();
+    virtual void startSensor();
+    virtual void stopSensor();
+    virtual void updateCoordinates();
+
+private slots:
+    void update();
+
+private:
+    QTM_NAMESPACE::QOrientationSensor m_orientationSensor;
+
+};
+
+
+
+#endif // ORIENTATIONCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/panorama.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/panorama.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,28 @@
+include(../sensors.pri)
+QT += gui \
+    core
+CONFIG += mobility
+MOBILITY += sensors
+HEADERS += inputcontroller.h \
+    keycontroller.h \
+    timedcontroller.h \
+    view.h \
+    accelerometercontroller.h \
+    compasscontroller.h \
+    magnetometercontroller.h \
+    orientationcontroller.h \
+    rotationcontroller.h \
+    tapcontroller.h
+SOURCES += main.cpp \
+    inputcontroller.cpp \
+    keycontroller.cpp \
+    timedcontroller.cpp \
+    view.cpp \
+    accelerometercontroller.cpp \
+    compasscontroller.cpp \
+    magnetometercontroller.cpp \
+    orientationcontroller.cpp \
+    rotationcontroller.cpp \
+    tapcontroller.cpp
+RESOURCES += panorama.qrc
+TARGET = panorama
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/panorama.qrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/panorama.qrc	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>images/foreshore_final.jpg</file>
+        <file>images/koskipuisto_pieni.jpg</file>
+    </qresource>
+</RCC>
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/rotationcontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/rotationcontroller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,40 @@
+#include "inputcontroller.h"
+#include "rotationcontroller.h"
+#include <QTime>
+#include <QDebug>
+#include <math.h>
+
+
+RotationController::RotationController( ): TimedController(), m_factor(0.5){}
+
+void RotationController::startSensor()
+{
+    m_rotationSensor.connectToBackend();
+    m_rotationSensor.start();
+    connect(&m_rotationSensor, SIGNAL(readingChanged()), this, SLOT(update()));
+
+    int dataRate = m_rotationSensor.dataRate();
+    m_interval = dataRate>0?1000/m_rotationSensor.dataRate():20;
+}
+
+void RotationController::stopSensor(){ m_rotationSensor.stop();}
+
+
+void RotationController::update()
+{
+    qreal pitch = m_rotationSensor.reading()->x();
+    qreal roll= m_rotationSensor.reading()->y();
+
+    m_dx = - m_factor* roll;
+    m_dy =  - m_factor * pitch;
+
+    updateCoordinates();
+}
+
+
+void RotationController::updateCoordinates(){
+    m_x +=m_dx * m_delay / m_interval;
+    m_y +=m_dy * m_delay / m_interval;
+}
+
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/rotationcontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/rotationcontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,35 @@
+#ifndef ROTATIONCONTROLLER_H
+#define ROTATIONCONTROLLER_H
+
+
+#include "timedcontroller.h"
+#include <qrotationsensor.h>
+#include <QTimer>
+#include <QTime>
+
+QTM_USE_NAMESPACE
+
+class RotationController : public TimedController
+{
+    Q_OBJECT
+
+public:
+    RotationController();
+    virtual void startSensor();
+    virtual void stopSensor();
+    virtual void updateCoordinates();
+
+
+public slots:
+    void update();
+
+private:
+    QTM_NAMESPACE::QRotationSensor m_rotationSensor;
+    int m_dx, m_dy;
+    qtimestamp m_exTimestamp;
+    qreal m_factor;
+
+};
+
+
+#endif // ROTATIONCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/rotationsensorcontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/rotationsensorcontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,4 @@
+#ifndef ROTATIONSENSORCONTROLLER_H
+#define ROTATIONSENSORCONTROLLER_H
+
+#endif // ROTATIONSENSORCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/tapcontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/tapcontroller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,128 @@
+
+
+#include "tapcontroller.h"
+
+const qreal TapController::m_timewindow=1000;
+
+
+TapController::TapController(): m_step(20){}
+
+
+void TapController::startSensor()
+{
+    m_tap.connectToBackend();
+    m_tap.start();
+    connect(&m_tap, SIGNAL(readingChanged()), this, SLOT(update()));
+    m_accelerometer.connectToBackend();
+    m_accelerometer.start();
+    connect(&m_tap, SIGNAL(readingChanged()), this, SLOT(updateAcce()));
+}
+
+
+void TapController::stopSensor(){
+    m_tap.stop();
+    m_accelerometer.stop();
+}
+
+
+void TapController::update()
+{
+    int direction = m_tap.reading()->tapDirection();
+    switch(direction){
+    case QTapReading::X:
+    case QTapReading::X_Pos:
+    case QTapReading::X_Neg:
+        m_dy=0;
+        setDx(direction);
+        break;
+    case QTapReading::Y:
+    case QTapReading::Y_Pos:
+    case QTapReading::Y_Neg:
+        m_dx = 0;
+        setDy(direction);
+        break;
+    case QTapReading::Undefined:
+    case QTapReading::Z:
+    case QTapReading::Z_Pos:
+    case QTapReading::Z_Neg:
+    default:
+        return;
+    }    
+
+}
+
+
+void TapController::updateAcce()
+{
+    qreal accX = m_accelerometer.reading()->x();
+    qreal accY= m_accelerometer.reading()->y();
+    m_now = m_accelerometer.reading()->timestamp();
+
+    checkX(accX);
+    checkY(accY);
+}
+
+
+void TapController::updateCoordinates(){
+
+    if (m_now - m_timestampX > m_timewindow){
+        m_absMaxX = 0;
+        m_timestampX = m_now;
+    }
+
+    if (m_now - m_timestampY > m_timewindow){
+        m_absMaxY = 0;
+        m_timestampY = m_now;
+    }
+
+    if (m_dx!=0) m_dx = m_dx>0? m_dx-1: m_dx+1;
+    if (m_dy!=0) m_dy = m_dy>0? m_dy-1: m_dy+1;
+
+    m_x +=m_dx;
+    m_y +=m_dy;
+}
+
+
+void TapController::checkX(qreal accX){
+    if (qAbs(accX)>qAbs(m_absMaxX)){
+        m_absMaxX = accX;
+        m_timestampX = m_now;
+    }
+}
+
+
+void TapController::checkY(qreal accY){
+    if (qAbs(accY)>qAbs(m_absMaxY)){
+        m_absMaxY = accY;
+        m_timestampY = m_now;
+    }
+}
+
+
+void TapController::setDx(int direction){
+    switch(direction){
+    case QTapReading::X:
+        m_dx = m_absMaxX>0?m_step : -m_step;
+        break;
+    case QTapReading::X_Pos:
+        m_dx = m_step;
+        break;
+    case QTapReading::X_Neg:
+        m_dx = -m_step;
+        break;
+    }
+}
+
+void TapController::setDy(int direction){
+    switch(direction){
+    case QTapReading::Y:
+        m_dy = m_absMaxY>0?m_step : - m_step;
+        break;
+    case QTapReading::Y_Pos:
+        m_dy = m_step;
+        break;
+    case QTapReading::Y_Neg:
+        m_dy = -m_step;
+        break;
+    }
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/tapcontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/tapcontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,38 @@
+#ifndef TAPCONTROLLER_H
+#define TAPCONTROLLER_H
+#include "timedcontroller.h"
+#include <qtapsensor.h>
+#include <qaccelerometer.h>
+
+QTM_USE_NAMESPACE
+
+class TapController : public TimedController
+{
+    Q_OBJECT
+
+public:
+    TapController();
+    virtual void startSensor();
+    virtual void stopSensor();
+    virtual void updateCoordinates();
+
+private slots:
+    void update();
+    void updateAcce();
+
+private:
+    void checkX(qreal);
+    void checkY(qreal);
+    void setDx(int);
+    void setDy(int);
+    QTapSensor m_tap;
+    QAccelerometer m_accelerometer;
+    qreal m_absMaxX, m_absMaxY;
+    qtimestamp m_timestampX, m_timestampY, m_now;
+    static const qreal m_timewindow;
+    int m_dx,m_dy;
+    int m_step;
+
+};
+
+#endif // TAPCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/timedcontroller.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/timedcontroller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,30 @@
+
+
+#include "inputcontroller.h"
+#include "timedcontroller.h"
+#include <QTime>
+#include <QDebug>
+
+TimedController::TimedController( ): m_delay(10){ m_exTime = QTime::currentTime(); }
+
+void TimedController::startTimer()
+{
+    m_timer.setSingleShot(false);
+    m_timer.start(m_delay);
+    connect(&m_timer, SIGNAL(timeout()), this, SLOT(handleTimedUpdate()));
+}
+
+void TimedController::stopTimer(){ m_timer.stop();}
+
+
+void TimedController::handleTimedUpdate()
+{
+    int timeDiff = m_exTime.msecsTo(QTime::currentTime());
+    if (timeDiff<  m_delay) return;
+    updateCoordinates();
+    m_exTime = QTime::currentTime();
+}
+
+
+void TimedController::updateCoordinates(){}
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/timedcontroller.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/timedcontroller.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,31 @@
+#ifndef TIMEDCONTROLLER_H
+#define TIMEDCONTROLLER_H
+
+
+#include <QTime>
+#include <QTimer>
+#include "inputcontroller.h"
+
+class TimedController : public InputController
+{
+    Q_OBJECT
+
+public:
+    TimedController();
+    virtual void startTimer();
+    virtual void stopTimer();
+    virtual void updateCoordinates();
+
+private slots:
+    void handleTimedUpdate();
+
+protected:
+    QTimer m_timer;
+    QTime m_exTime;
+    int m_delay;
+    int m_interval;
+
+};
+
+
+#endif // TIMEDCONTROLLER_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/view.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/view.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,306 @@
+#include "view.h"
+#include "inputcontroller.h"
+#include "keycontroller.h"
+#include "accelerometercontroller.h"
+#include "magnetometercontroller.h"
+#include "rotationcontroller.h"
+#include "orientationcontroller.h"
+#include "compasscontroller.h"
+
+int View::m_imageWidth;
+int View::m_imageHeight;
+QString View::m_currentSensor;
+
+View::View(QGraphicsScene *scene) :
+        QGraphicsView(scene), m_timer(this) ,m_delay(30){
+
+    m_controller = 0;
+
+    QPixmap bgPix(":/images/koskipuisto_pieni.jpg");
+    m_pix = bgPix;
+    m_imageWidth = bgPix.width();
+    m_imageHeight = bgPix.height();
+    int h= height();
+    int y = qAbs(m_imageHeight-h)/2;
+    setSceneRect(0, y, width(), h);
+
+    setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
+    setBackgroundBrush(bgPix);
+    setCacheMode(QGraphicsView::CacheBackground);
+    setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
+    setWindowTitle("Panorama");
+
+    m_sensors.append(InputController::QACCELEROMETER);
+    m_sensors.append(InputController::QORIENTATIONSENSOR);
+    m_sensors.append(InputController::QMAGNETOMETER);
+    m_sensors.append(InputController::QROTATIONSENSOR);
+    m_sensors.append(InputController::QTAPSENSOR);
+    m_sensors.append(InputController::QCOMPASS);
+    m_sensors.append(InputController::QKEYS);
+
+
+    m_menu = new QMenu(this);
+
+    createActions();
+    handleAction(NULL,InputController::QACCELEROMETER);
+
+    m_timer.setSingleShot(false);
+    m_timer.start(m_delay);
+    connect(&m_timer, SIGNAL(timeout()), this, SLOT(update()));
+}
+
+View::~View(){ if (m_controller) delete m_controller;}
+
+
+void View::resizeEvent(QResizeEvent *event)
+{
+    QGraphicsView::resizeEvent(event);
+    fitInView(sceneRect(), Qt::KeepAspectRatio);
+}
+
+
+
+void View::handleAction(QString oldSensor, QString newSensor){
+
+    m_menu->setVisible(false);
+
+    if (oldSensor==newSensor) return;
+
+
+    QList<QAction*> tmpActions = m_menu->actions();
+    for (int i=0; i<tmpActions.length(); i++){
+        if (tmpActions.at(i)->text() ==  oldSensor){
+            tmpActions.at(i)->setEnabled(true);
+            continue;
+        }
+        if (tmpActions.at(i)->text() == newSensor){
+            tmpActions.at(i)->setEnabled(false);
+        }
+    }
+    m_currentSensor = newSensor;
+    switchController(m_currentSensor);
+
+}
+
+
+
+void View::createActions()
+{
+
+    for (int i=0; i<m_sensors.length();i++){
+        QAction* tmp = new QAction(m_sensors.at(i), this);
+
+        const QString sensor = m_sensors.at(i);
+        do{
+            if (sensor==InputController::QACCELEROMETER){
+                connect(tmp, SIGNAL(triggered()), this, SLOT(startAccelerometer()));
+                break;
+            }
+            if (sensor==InputController::QORIENTATIONSENSOR){
+                connect(tmp, SIGNAL(triggered()), this, SLOT(startOrientationSensor()));
+                break;
+            }
+            if (sensor==InputController::QROTATIONSENSOR){
+                connect(tmp, SIGNAL(triggered()), this, SLOT(startRotationSensor()));
+                break;
+            }
+            if (sensor==InputController::QMAGNETOMETER){
+                connect(tmp, SIGNAL(triggered()), this, SLOT(startMagnetometer()));
+                break;
+            }
+            if (sensor==InputController::QTAPSENSOR){
+                connect(tmp, SIGNAL(triggered()), this, SLOT(startTapSensor()));
+                break;
+            }
+            if (sensor==InputController::QCOMPASS){
+                connect(tmp, SIGNAL(triggered()), this, SLOT(startCompass()));
+                break;
+            }
+            if (sensor==InputController::QKEYS){
+                connect(tmp, SIGNAL(triggered()), this, SLOT(startKeys()));
+                break;
+            }
+        }while (true);
+        m_menu->addAction(tmp);
+    }
+
+}
+
+void View::startAccelerometer(){
+    handleAction(m_currentSensor, InputController::QACCELEROMETER);
+}
+
+void View::startOrientationSensor(){
+    handleAction(m_currentSensor, InputController::QORIENTATIONSENSOR);
+}
+
+void View::startTapSensor(){
+    handleAction(m_currentSensor, InputController::QTAPSENSOR);
+}
+
+void View::startMagnetometer(){
+    handleAction(m_currentSensor, InputController::QMAGNETOMETER);
+}
+
+void View::startRotationSensor(){
+    handleAction(m_currentSensor, InputController::QROTATIONSENSOR);
+}
+
+void View::startKeys(){
+    handleAction(m_currentSensor, InputController::QKEYS);
+}
+
+void View::startCompass(){
+    handleAction(m_currentSensor, InputController::QCOMPASS);
+}
+
+
+void View::update(){
+    if (m_mouseMode){
+        m_x = checkX(m_x + m_dx);
+        m_y = checkY(m_y+ m_dy);
+    }
+    else{
+        if (m_controller){
+            m_x = checkX(m_controller->getX());
+            m_y = checkY(m_controller->getY());
+        }
+    }
+    setSceneRect(m_x, m_y, width(), height());
+}
+
+
+void View::keyPressEvent(QKeyEvent *e)
+{
+    if (m_currentSensor!=InputController::QKEYS) return;
+
+    if (m_controller) m_controller->keyPressEvent(e);
+}
+
+
+void View::switchController(QString sensor){
+
+    if (m_controller){
+        delete m_controller;
+        m_controller =0;
+    }
+
+    do{
+        if (sensor==InputController::QACCELEROMETER){
+            m_controller = new AccelerometerController();
+            break;
+        }
+        if (sensor==InputController::QROTATIONSENSOR){
+            m_controller = new RotationController();
+            break;
+        }
+        if (sensor==InputController::QMAGNETOMETER){
+            m_controller = new MagnetometerController();
+            break;
+        }
+        if (sensor==InputController::QORIENTATIONSENSOR){
+            m_controller = new OrientationController();
+            break;
+        }
+
+        if (sensor==InputController::QTAPSENSOR){
+            break;
+        }
+        if (sensor==InputController::QCOMPASS){
+            m_controller = new CompassController();
+            break;
+        }
+        if (sensor==InputController::QKEYS){
+            m_controller = new KeyController();
+            break;
+        }
+
+    }while (true);
+
+    if (m_controller) m_controller->start();
+
+}
+
+
+int View::checkX(int x){
+    return qAbs(x) < m_imageWidth ? x : x % m_imageWidth;
+
+}
+
+int View::checkY(int y){
+    int limit = m_imageHeight-height();
+    if (y<0){
+        y = limit<0?-limit/2:0;
+        if (m_controller) m_controller->setY(y);
+        return y;
+    }
+
+    if (limit<0){
+        y=-limit/2;
+        if (m_controller) m_controller->setY(y);
+        return y;
+    }
+
+
+    if (y< limit){ return y;}
+
+    y = limit;
+    if (m_controller) m_controller->setY(y);
+    return y;
+}
+
+
+
+void View::mousePressEvent ( QMouseEvent* ){
+    m_mousePressTime = QTime::currentTime();
+    m_exController = m_controller;
+    m_mouseMode = false;
+}
+
+
+
+void View::mouseMoveEvent(QMouseEvent* event){
+
+    if (m_mouseMode){
+
+        m_dx = m_eventX - event->x();
+        m_dy = m_eventY - event->y();
+
+        update();
+
+        m_eventX = event->x();
+        m_eventY = event->y();
+        return;
+    }
+
+    if (m_mousePressTime.msecsTo(QTime::currentTime())>200){
+        m_menu->setVisible(false);
+        m_mouseMode = true;
+        m_eventX = event->x();
+        m_eventY = event->y();
+        m_controller = 0;
+    }
+
+}
+
+
+
+void View::mouseReleaseEvent(QMouseEvent* event){
+    m_controller = m_exController;
+
+    if (m_mouseMode){
+        if (m_controller){
+            m_controller->setX(m_x);
+            m_controller->setY(m_y);
+        }
+    }
+    m_mouseMode = false;
+
+    if (m_mousePressTime.msecsTo(QTime::currentTime())>200) return;
+
+    int x = event->x();
+    int y = event->y();
+    m_menu->move(x, y);
+    m_menu->setVisible(true);
+
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/panorama/view.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/panorama/view.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,69 @@
+#ifndef VIEW_H
+#define VIEW_H
+
+#include <QPixmap>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QResizeEvent>
+#include <QDebug>
+#include <QMenu>
+#include <QMessageBox>
+#include <QTimer>
+#include <QTime>
+#include "inputcontroller.h"
+
+
+
+class View : public QGraphicsView
+{
+    Q_OBJECT
+
+public:
+    View(QGraphicsScene *scene);
+    virtual ~View();
+    static int m_imageWidth;
+
+protected:
+    QPixmap m_pix;
+
+    virtual void resizeEvent(QResizeEvent *event);
+    virtual void keyPressEvent(QKeyEvent *e);
+    virtual void mousePressEvent ( QMouseEvent * event );
+    virtual void mouseMoveEvent(QMouseEvent* event);
+    virtual void mouseReleaseEvent(QMouseEvent* event);
+
+private slots:
+    void startAccelerometer();
+    void startTapSensor();
+    void startMagnetometer();
+    void startRotationSensor();
+    void startOrientationSensor();
+    void startCompass();
+    void startKeys();
+    void update();
+
+private:
+    int checkX(int x);
+    int checkY(int y);
+    void switchController(QString sensor);
+    void createActions();
+    void handleAction(QString oldSensor, QString newSensor);
+    static int m_imageHeight;
+
+    static QString m_currentSensor;
+    QList<QString> m_sensors;
+    QTimer m_timer;
+    InputController *m_controller;
+    InputController *m_exController;
+    int m_delay;
+    QTime m_mousePressTime;
+    QMenu* m_menu;
+    bool m_mouseMode;
+    int m_x, m_y;
+    int m_eventX, m_eventY;
+    int m_dx, m_dy;
+
+};
+
+
+#endif // VIEW_H
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/reading_perf/main.cpp
--- a/qtmobility/examples/sensors/reading_perf/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/reading_perf/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/sensor_explorer/explorer.cpp
--- a/qtmobility/examples/sensors/sensor_explorer/explorer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/sensor_explorer/explorer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/sensor_explorer/explorer.h
--- a/qtmobility/examples/sensors/sensor_explorer/explorer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/sensor_explorer/explorer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/sensor_explorer/main.cpp
--- a/qtmobility/examples/sensors/sensor_explorer/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/sensor_explorer/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/sensors.pri
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/sensors.pri	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,6 @@
+include($$PWD/../examples.pri)
+CONFIG+=mobility
+INCLUDEPATH += $$PWD/../../src/sensors
+MOBILITY+=sensors
+QT=core
+TEMPLATE=app
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/sensors.pro
--- a/qtmobility/examples/sensors/sensors.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/sensors.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,8 +1,6 @@
 TEMPLATE = subdirs
 
-include(../../common.pri)
-
-SUBDIRS += accel
+SUBDIRS += accel arrowkeys metadata
 
 contains(QT_CONFIG, declarative) {
     SUBDIRS += orientation
@@ -18,3 +16,4 @@
 
 contains(QT_CONFIG,opengl):SUBDIRS += cubehouse
 
+SUBDIRS += show_acceleration show_als show_compass show_magneticflux show_orientation show_proximity show_rotation show_tap
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_acceleration/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_acceleration/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,77 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qaccelerometer.h>
+
+QTM_USE_NAMESPACE
+
+class AccelerometerFilter : public QAccelerometerFilter
+{
+public:
+    qtimestamp stamp;
+    bool filter(QAccelerometerReading *reading)
+    {
+        int diff = ( reading->timestamp() - stamp );
+        stamp = reading->timestamp();
+        QTextStream out(stdout);
+        out << QString("Acceleration: %1 x").arg(reading->x(), 5, 'f', 1)
+            << QString(" %1 y").arg(reading->y(), 5, 'f', 1)
+            << QString(" %1 z m/s^2").arg(reading->z(), 5, 'f', 1)
+            << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 5, 'f', 1) << endl;
+        return false; // don't store the reading in the sensor
+    }
+};
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QAccelerometer sensor;
+    if (!sensor.connectToBackend()) {
+        qWarning("No Accelerometer available!");
+        return 1;
+    }
+    AccelerometerFilter filter;
+    sensor.addFilter(&filter);
+    sensor.start();
+
+    return app.exec();
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_acceleration/show_acceleration.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_acceleration/show_acceleration.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES = main.cpp
+TARGET = show_acceleration
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_als/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_als/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qambientlightsensor.h>
+
+QTM_USE_NAMESPACE
+
+class AmbientLightFilter : public QAmbientLightFilter
+{
+public:
+    qtimestamp stamp;
+    bool filter(QAmbientLightReading *reading)
+    {
+        int diff = ( reading->timestamp() - stamp );
+        stamp = reading->timestamp();
+        QString output;
+        switch (reading->lightLevel()) {
+            case QAmbientLightReading::Dark:      output = "Dark    ";  break;
+            case QAmbientLightReading::Twilight:  output = "Twilight";  break;
+            case QAmbientLightReading::Light:     output = "Light   ";  break;
+            case QAmbientLightReading::Bright:    output = "Bright  ";  break;
+            case QAmbientLightReading::Sunny:     output = "Sunny   ";  break;
+            case QAmbientLightReading::Undefined: output = "Undefined"; break;
+            default: output = "Invalid enum value";
+        }
+        QTextStream out(stdout);
+        out << "Ambient light level: " << output
+            << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 5).arg( 1000000.0 / diff, 3, 'f', 1) << endl;
+        return false; // don't store the reading in the sensor
+    }
+};
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QAmbientLightSensor sensor;
+    if (!sensor.connectToBackend()) {
+        qWarning("No ambient light sensor available!");
+        return 1;
+    }
+    AmbientLightFilter filter;
+    sensor.addFilter(&filter);
+    sensor.start();
+
+    return app.exec();
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_als/show_als.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_als/show_als.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES = main.cpp
+TARGET = show_als
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_compass/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_compass/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,80 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qcompass.h>
+
+QTM_USE_NAMESPACE
+
+class CompassFilter : public QCompassFilter
+{
+public:
+    bool filter(QCompassReading *reading)
+    {
+        int diff = ( reading->timestamp() - stamp );
+        stamp = reading->timestamp();
+        QTextStream out(stdout);
+        out << QString("Compass heading: %1").arg(reading->azimuth(), 3, 'f', 0)
+            << QString(" calibration: %1").arg(reading->calibrationLevel(), 3, 'f', 1)
+            << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 4, 'f', 1) << endl;
+        return true;
+    }
+private:
+    qtimestamp stamp;
+};
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QCompass sensor;
+    if (!sensor.connectToBackend()) {
+        qWarning("No compass available!");
+        return 1;
+    }
+    CompassFilter filter;
+    sensor.addFilter(&filter);
+    sensor.start();
+    if (!sensor.isActive()) {
+        qWarning("Compasssensor didn't start!");
+        return 1;
+    }
+    return app.exec();
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_compass/show_compass.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_compass/show_compass.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES = main.cpp
+TARGET = show_compass
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_magneticflux/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_magneticflux/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qmagnetometer.h>
+
+QTM_USE_NAMESPACE
+
+class MagGeoFilter : public QMagnetometerFilter
+{
+public:
+    qtimestamp stamp;
+    bool filter(QMagnetometerReading *reading)
+    {
+        int diff = ( reading->timestamp() - stamp );
+        stamp = reading->timestamp();
+        QTextStream out(stdout);
+        out << QString("Geomagnetic flux density: %1 x").arg(reading->x() * 1000000, 6, 'f', 1)
+            << QString(" %1 y").arg(reading->y() * 1000000, 6, 'f', 1)
+            << QString(" %1 z uT").arg(reading->z() * 1000000, 6, 'f', 1)
+            << QString(" calibration: %1").arg(reading->calibrationLevel(), 3, 'f', 1)
+            << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 4, 'f', 1) << endl;
+        return false;
+    }
+};
+
+class MagRawFilter : public QMagnetometerFilter
+{
+public:
+    qtimestamp stamp;
+    bool filter(QMagnetometerReading *reading)
+    {
+        int diff = ( reading->timestamp() - stamp );
+        stamp = reading->timestamp();
+        QTextStream out(stdout);
+        out << QString("Raw magnetic flux density: %1 x").arg(reading->x() * 1000000, 6, 'f', 1)
+            << QString(" %1 y").arg(reading->y() * 1000000, 6, 'f', 1)
+            << QString(" %1 z uT").arg(reading->z() * 1000000, 6, 'f', 1)
+            << QString(" calibration: %1").arg(reading->calibrationLevel(), 3, 'f', 1)
+            << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 4, 'f', 1) << endl;
+        return false;
+    }
+};
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+
+    QMagnetometer geosensor;
+    if (!geosensor.connectToBackend()) {
+        qWarning("No magnetometer available!");
+        return 1;
+    }
+    MagGeoFilter geofilter;
+    geosensor.setProperty("returnGeoValues", true);
+    geosensor.addFilter(&geofilter);
+    geosensor.start();
+
+/*
+    QMagnetometer rawsensor;
+    if (!rawsensor.connectToBackend()) {
+        qWarning("No magnetometer available!");
+        return 1;
+    }
+    MagRawFilter rawfilter;
+    rawsensor.addFilter(&rawfilter);
+    rawsensor.start();
+*/
+    return app.exec();
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_magneticflux/show_magneticflux.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_magneticflux/show_magneticflux.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES = main.cpp
+TARGET = show_magneticflux
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_orientation/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_orientation/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qorientationsensor.h>
+
+QTM_USE_NAMESPACE
+
+class OrientationSensorFilter : public QOrientationFilter
+{
+public:
+    qtimestamp stamp;
+    bool filter(QOrientationReading *reading)
+    {
+        int diff = ( reading->timestamp() - stamp );
+        stamp = reading->timestamp();
+        QString output;
+        switch (reading->orientation()) {
+            case QOrientationReading::TopUp:     output = "Top up   "; break;
+            case QOrientationReading::TopDown:   output = "Top down "; break;
+            case QOrientationReading::LeftUp:    output = "Left up  "; break;
+            case QOrientationReading::RightUp:   output = "Right up "; break;
+            case QOrientationReading::FaceUp:    output = "Face up  "; break;
+            case QOrientationReading::FaceDown:  output = "Face down"; break;
+            case QOrientationReading::Undefined: output = "Undefined"; break;
+            default: output = "Invalid enum value";
+        }
+        QTextStream out(stdout);
+        out << "Orientation: " << output
+            << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 5).arg( 1000000.0 / diff, 4, 'f', 1) << endl;
+        return false; // don't store the reading in the sensor
+    }
+};
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QOrientationSensor sensor;
+    if (!sensor.connectToBackend()) {
+        qWarning("No orientation sensor available!");
+        return 1;
+    }
+    OrientationSensorFilter filter;
+    sensor.addFilter(&filter);
+    sensor.start();
+
+    return app.exec();
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_orientation/show_orientation.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_orientation/show_orientation.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES = main.cpp
+TARGET = show_orientation
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_proximity/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_proximity/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qproximitysensor.h>
+
+QTM_USE_NAMESPACE
+
+class ProximitySensorFilter : public QProximityFilter
+{
+public:
+    qtimestamp stamp;
+    bool filter(QProximityReading *reading)
+    {
+        int diff = ( reading->timestamp() - stamp );
+        stamp = reading->timestamp();
+        QTextStream out(stdout);
+        out << "Proximity: ";
+        if (reading->close())
+            out << "Close    ";
+        else
+            out << "Not close";
+        out << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 5).arg( 1000000.0 / diff, 3, 'f', 1) << endl;
+        return false; // don't store the reading in the sensor
+    }
+};
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QProximitySensor sensor;
+    if (!sensor.connectToBackend()) {
+        qWarning("No proximity sensor available!");
+        return 1;
+    }
+    ProximitySensorFilter filter;
+    sensor.addFilter(&filter);
+    sensor.start();
+
+    return app.exec();
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_proximity/show_proximity.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_proximity/show_proximity.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES = main.cpp
+TARGET = show_proximity
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_rotation/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_rotation/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qrotationsensor.h>
+
+QTM_USE_NAMESPACE
+
+class RotationFilter : public QRotationFilter
+{
+public:
+    bool filter(QRotationReading *reading)
+    {
+        int diff = ( reading->timestamp() - stamp );
+        stamp = reading->timestamp();
+        QTextStream out(stdout);
+        out << QString("Rotation: %1 x").arg(reading->x(), 4, 'f', 0)
+            << QString(" %1 y").arg(reading->y(), 4, 'f', 0)
+            << QString(" %1 z").arg(reading->z(), 4, 'f', 0)
+            << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 4).arg( 1000000.0 / diff, 4, 'f', 1) << endl;
+        return true;
+    }
+private:
+    qtimestamp stamp;
+};
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QRotationSensor sensor;
+    if (!sensor.connectToBackend()) {
+        qWarning("No rotation sensor available!");
+        return 1;
+    }
+    RotationFilter filter;
+    sensor.addFilter(&filter);
+    sensor.start();
+    if (!sensor.isActive()) {
+        qWarning("Rotationsensor didn't start!");
+        return 1;
+    }
+    if (sensor.property("hasZ").isValid()) {
+        if (sensor.property("hasZ").toBool())
+            qDebug() << "Sensor hasZ is set";
+        else
+            qDebug() << "Sensor hasZ is NOT set";
+    } else {
+        qDebug() << "Sensor hasZ error: no value";
+    }
+    return app.exec();
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_rotation/show_rotation.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_rotation/show_rotation.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES = main.cpp
+TARGET = show_rotation
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_tap/main.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_tap/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,93 @@
+/****************************************************************************
+**
+** 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:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore>
+#include <qtapsensor.h>
+
+QTM_USE_NAMESPACE
+
+class TapSensorFilter : public QTapFilter
+{
+public:
+    qtimestamp stamp;
+    bool filter(QTapReading *reading)
+    {
+        int diff = ( reading->timestamp() - stamp );
+        stamp = reading->timestamp();
+        QString output;
+        switch (reading->tapDirection()) {
+            case QTapReading::X:         output = "X";         break;
+            case QTapReading::Y:         output = "Y";         break;
+            case QTapReading::Z:         output = "Z";         break;
+            case QTapReading::X_Pos:     output = "X pos";     break;
+            case QTapReading::Y_Pos:     output = "Y pos";     break;
+            case QTapReading::Z_Pos:     output = "Z pos";     break;
+            case QTapReading::X_Neg:     output = "X neg";     break;
+            case QTapReading::Y_Neg:     output = "Y neg";     break;
+            case QTapReading::Z_Neg:     output = "Z neg";     break;
+            case QTapReading::Undefined: output = "Undefined"; break;
+            default: output = "Invalid enum value";
+        }
+        QTextStream out(stdout);
+        out << "Tap: ";
+        if(reading->isDoubleTap())
+            out << "Double ";
+        else
+            out << "Single ";
+        out << QString(" (%1 ms since last, %2 Hz)").arg(diff / 1000, 5).arg( 1000000.0 / diff, 3, 'f', 1) << endl;
+        return false; // don't store the reading in the sensor
+    }
+};
+
+int main(int argc, char **argv)
+{
+    QCoreApplication app(argc, argv);
+
+    QTapSensor sensor;
+    if (!sensor.connectToBackend()) {
+        qWarning("No tap sensor available!");
+        return 1;
+    }
+    TapSensorFilter filter;
+    sensor.addFilter(&filter);
+    sensor.start();
+
+    return app.exec();
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/show_tap/show_tap.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/examples/sensors/show_tap/show_tap.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,3 @@
+include(../sensors.pri)
+SOURCES = main.cpp
+TARGET = show_tap
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/small_screen_sensors/accelerationform.cpp
--- a/qtmobility/examples/sensors/small_screen_sensors/accelerationform.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/accelerationform.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/small_screen_sensors/accelerationform.h
--- a/qtmobility/examples/sensors/small_screen_sensors/accelerationform.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/accelerationform.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/small_screen_sensors/freefallform.cpp
--- a/qtmobility/examples/sensors/small_screen_sensors/freefallform.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/freefallform.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/small_screen_sensors/freefallform.h
--- a/qtmobility/examples/sensors/small_screen_sensors/freefallform.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/freefallform.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/small_screen_sensors/main.cpp
--- a/qtmobility/examples/sensors/small_screen_sensors/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/small_screen_sensors/orientationform.cpp
--- a/qtmobility/examples/sensors/small_screen_sensors/orientationform.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/orientationform.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/small_screen_sensors/orientationform.h
--- a/qtmobility/examples/sensors/small_screen_sensors/orientationform.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/orientationform.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/small_screen_sensors/sensorswindow.cpp
--- a/qtmobility/examples/sensors/small_screen_sensors/sensorswindow.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/sensorswindow.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sensors/small_screen_sensors/sensorswindow.h
--- a/qtmobility/examples/sensors/small_screen_sensors/sensorswindow.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sensors/small_screen_sensors/sensorswindow.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/serviceactions/attachmentlistwidget.cpp
--- a/qtmobility/examples/serviceactions/attachmentlistwidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/serviceactions/attachmentlistwidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/serviceactions/attachmentlistwidget.h
--- a/qtmobility/examples/serviceactions/attachmentlistwidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/serviceactions/attachmentlistwidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/serviceactions/main.cpp
--- a/qtmobility/examples/serviceactions/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/serviceactions/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/serviceactions/mainwindow.cpp
--- a/qtmobility/examples/serviceactions/mainwindow.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/serviceactions/mainwindow.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/serviceactions/mainwindow.h
--- a/qtmobility/examples/serviceactions/mainwindow.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/serviceactions/mainwindow.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/servicebrowser/main.cpp
--- a/qtmobility/examples/servicebrowser/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/servicebrowser/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/servicebrowser/servicebrowser.cpp
--- a/qtmobility/examples/servicebrowser/servicebrowser.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/servicebrowser/servicebrowser.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/servicebrowser/servicebrowser.h
--- a/qtmobility/examples/servicebrowser/servicebrowser.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/servicebrowser/servicebrowser.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp
--- a/qtmobility/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/serviceinstaller_sfw_symbian/exampleinstaller/exampleinstaller.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sfw-notes/main.cpp
--- a/qtmobility/examples/sfw-notes/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sfw-notes/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sfw-notes/sfwnotes.cpp
--- a/qtmobility/examples/sfw-notes/sfwnotes.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sfw-notes/sfwnotes.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sfw-notes/sfwnotes.h
--- a/qtmobility/examples/sfw-notes/sfwnotes.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sfw-notes/sfwnotes.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/slideshow/main.cpp
--- a/qtmobility/examples/slideshow/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/slideshow/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/slideshow/slideshow.cpp
--- a/qtmobility/examples/slideshow/slideshow.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/slideshow/slideshow.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/slideshow/slideshow.h
--- a/qtmobility/examples/slideshow/slideshow.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/slideshow/slideshow.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sysinfo/dialog.cpp
--- a/qtmobility/examples/sysinfo/dialog.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sysinfo/dialog.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sysinfo/dialog.h
--- a/qtmobility/examples/sysinfo/dialog.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sysinfo/dialog.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/sysinfo/main.cpp
--- a/qtmobility/examples/sysinfo/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/sysinfo/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/weatherinfo/weatherinfo.cpp
--- a/qtmobility/examples/weatherinfo/weatherinfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/weatherinfo/weatherinfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/weatherinfo/weatherinfo.pro
--- a/qtmobility/examples/weatherinfo/weatherinfo.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/weatherinfo/weatherinfo.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -22,16 +22,20 @@
                 ../flickrdemo
 
 symbian {
-    TARGET.CAPABILITY = NetworkServices Location ReadUserData
-}
-
-symbian: {
-    addFiles.sources = nmealog.txt
-    DEPLOYMENT += addFiles
+    symbian {
+        addFiles.sources = nmealog.txt
+        DEPLOYMENT += addFiles
+        TARGET.CAPABILITY += Location \
+                NetworkServices \
+                ReadUserData
+    }
+    wince* {
+        addFiles.sources = ./nmealog.txt
+        addFiles.path = .
+        DEPLOYMENT += addFiles
+    }
 } else {
-    logfile.path = $$DESTDIR
+    logfile.path = $$QT_MOBILITY_PREFIX/bin
     logfile.files = nmealog.txt
-    logfile.CONFIG = no_link no_dependencies explicit_dependencies no_build combine ignore_no_exist no_clean
     INSTALLS += logfile
-    build_pass:ALL_DEPS+=install_logfile
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/writemessage/main.cpp
--- a/qtmobility/examples/writemessage/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/writemessage/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/writemessage/messagesender.cpp
--- a/qtmobility/examples/writemessage/messagesender.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/writemessage/messagesender.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/examples/writemessage/messagesender.h
--- a/qtmobility/examples/writemessage/messagesender.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/examples/writemessage/messagesender.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/features/mobility.prf
--- a/qtmobility/features/mobility.prf	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/features/mobility.prf	Fri Jun 11 14:26:25 2010 +0300
@@ -18,6 +18,10 @@
 contains(MOBILITY, bearer) {
     DEFINES += QT_MOBILITY_BEARER
     qtAddLibrary(QtBearer)
+    !equals(QT_MAJOR_VERSION,4)|!equals(QT_MINOR_VERSION, 6) {
+        message(Qt Mobility Bearer API is deprecated when using Qt 4.7 or higher.)
+        message(Please use source compatible replacement Bearer API in QtNetwork.)
+    }
 }
 
 contains(MOBILITY, publishsubscribe) {
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/features/mobility.prf.template
--- a/qtmobility/features/mobility.prf.template	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/features/mobility.prf.template	Fri Jun 11 14:26:25 2010 +0300
@@ -18,6 +18,10 @@
 contains(MOBILITY, bearer) {
     DEFINES += QT_MOBILITY_BEARER
     qtAddLibrary(QtBearer)
+    !equals(QT_MAJOR_VERSION,4)|!equals(QT_MINOR_VERSION, 6) {
+        message(Qt Mobility Bearer API is deprecated when using Qt 4.7 or higher.)
+        message(Please use source compatible replacement Bearer API in QtNetwork.)
+    }
 }
 
 contains(MOBILITY, publishsubscribe) {
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/maemo5/maemo5.pro
--- a/qtmobility/plugins/contacts/maemo5/maemo5.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/maemo5.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -15,10 +15,6 @@
         qcontactmaemo5backend.cpp \
 
 INCLUDEPATH += $$SOURCE_DIR/src/contacts $$SOURCE_DIR/src/contacts/details $$SOURCE_DIR/src/contacts/filters $$SOURCE_DIR/src/contacts/requests
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS += target
 CONFIG += mobility link_pkgconfig
 MOBILITY = contacts
 PKGCONFIG += libosso-abook-1.0
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/maemo5/qcontactabook.cpp
--- a/qtmobility/plugins/contacts/maemo5/qcontactabook.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactabook.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/maemo5/qcontactabook_p.h
--- a/qtmobility/plugins/contacts/maemo5/qcontactabook_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactabook_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/maemo5/qcontactidshash.h
--- a/qtmobility/plugins/contacts/maemo5/qcontactidshash.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactidshash.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend.cpp
--- a/qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend_p.h
--- a/qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactmaemo5backend_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/maemo5/qcontactmaemo5debug_p.h
--- a/qtmobility/plugins/contacts/maemo5/qcontactmaemo5debug_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/maemo5/qcontactmaemo5debug_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qcontacttrackerbackend_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtcontacts-tracker.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -42,7 +42,3 @@
            qtrackerrelationshipsaverequest.cpp \
            qtrackercontactidfetchrequest.cpp \
            trackerchangelistener.cpp
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactasyncrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactfetchrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactidfetchrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactsaverequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackercontactslive.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipfetchrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/qtrackerrelationshipsaverequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_add_async/ut_qtcontacts_add_async.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_common/ut_qtcontacts_common.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_common/ut_qtcontacts_common.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_common/ut_qtcontacts_common.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_fetch/ut_qtcontacts_fetch.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_sparql/ut_qtcontacts_sparql.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/contactmanager.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin/ut_qtcontacts_trackerplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/tests/ut_qtcontacts_trackerplugin_definitions/ut_qtcontacts_trackerplugin_definitions.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/trackerchangelistener.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/qtcontacts-tracker/trackerchangelistener.h
--- a/qtmobility/plugins/contacts/qtcontacts-tracker/trackerchangelistener.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/qtcontacts-tracker/trackerchangelistener.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/cntabstractrelationship.h
--- a/qtmobility/plugins/contacts/symbian/inc/cntabstractrelationship.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/cntabstractrelationship.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/cntdisplaylabel.h
--- a/qtmobility/plugins/contacts/symbian/inc/cntdisplaylabel.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/cntdisplaylabel.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/cntrelationship.h
--- a/qtmobility/plugins/contacts/symbian/inc/cntrelationship.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/cntrelationship.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/cntrelationshipgroup.h
--- a/qtmobility/plugins/contacts/symbian/inc/cntrelationshipgroup.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/cntrelationshipgroup.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/cntsymbiandatabase.h
--- a/qtmobility/plugins/contacts/symbian/inc/cntsymbiandatabase.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/cntsymbiandatabase.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/cntsymbianengine.h
--- a/qtmobility/plugins/contacts/symbian/inc/cntsymbianengine.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/cntsymbianengine.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/cntsymbiantransformerror.h
--- a/qtmobility/plugins/contacts/symbian/inc/cntsymbiantransformerror.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/cntsymbiantransformerror.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntabstractcontactfilter.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntabstractcontactfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntabstractcontactfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntabstractcontactsorter.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntabstractcontactsorter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntabstractcontactsorter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntdbinfo.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntdbinfo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntdbinfo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntdisplaylabelsqlfilter.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntdisplaylabelsqlfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntdisplaylabelsqlfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterabstract.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterabstract.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterabstract.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterchangelog.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterchangelog.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterchangelog.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdefault.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdefault.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdefault.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdetail.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdetail.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdetail.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdetaildisplaylabel.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdetaildisplaylabel.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdetaildisplaylabel.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdetailrange.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdetailrange.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterdetailrange.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterintersection.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterintersection.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterintersection.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterinvalid.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterinvalid.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterinvalid.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterlocalid.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterlocalid.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterlocalid.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterrelationship.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterrelationship.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterrelationship.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterunion.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterunion.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntfilterunion.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntsqlsearch.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntsqlsearch.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntsqlsearch.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbianfilterdbms.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbianfilterdbms.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbianfilterdbms.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbianfiltersql.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbianfiltersql.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbianfiltersql.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbiansorterdbms.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbiansorterdbms.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbiansorterdbms.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbiansrvconnection.h
--- a/qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbiansrvconnection.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/filtering/cntsymbiansrvconnection.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cntthumbnailcreator.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cntthumbnailcreator.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cntthumbnailcreator.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformaddress.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformaddress.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformaddress.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformanniversary.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformanniversary.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformanniversary.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformanniversarysimple.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformanniversarysimple.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformanniversarysimple.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformavatar.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformavatar.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformavatar.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformbirthday.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformbirthday.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformbirthday.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformcontact.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformcontact.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformcontact.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformcontactdata.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformcontactdata.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformcontactdata.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformemail.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformemail.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformemail.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformempty.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformempty.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformempty.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformfamily.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformfamily.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformfamily.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformgender.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformgender.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformgender.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformgeolocation.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformgeolocation.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformgeolocation.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformname.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformname.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformname.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformnickname.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformnickname.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformnickname.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformnote.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformnote.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformnote.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformonlineaccount.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformonlineaccount.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformonlineaccount.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformorganisation.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformorganisation.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformorganisation.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformphonenumber.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformphonenumber.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformphonenumber.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformringtone.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformringtone.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformringtone.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformsynctarget.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformsynctarget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformsynctarget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformthumbnail.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformthumbnail.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformthumbnail.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/inc/transform/cnttransformurl.h
--- a/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformurl.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/inc/transform/cnttransformurl.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/rss/cntmodel.rss
--- a/qtmobility/plugins/contacts/symbian/rss/cntmodel.rss	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/rss/cntmodel.rss	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/rss/cntmodelextuids.h
--- a/qtmobility/plugins/contacts/symbian/rss/cntmodelextuids.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/rss/cntmodelextuids.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/rss/cntmodelextuids.hrh
--- a/qtmobility/plugins/contacts/symbian/rss/cntmodelextuids.hrh	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/rss/cntmodelextuids.hrh	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/rss/fieldnames.loc
--- a/qtmobility/plugins/contacts/symbian/rss/fieldnames.loc	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/rss/fieldnames.loc	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/cntabstractrelationship.cpp
--- a/qtmobility/plugins/contacts/symbian/src/cntabstractrelationship.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/cntabstractrelationship.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/cntdisplaylabel.cpp
--- a/qtmobility/plugins/contacts/symbian/src/cntdisplaylabel.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/cntdisplaylabel.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/cntrelationship.cpp
--- a/qtmobility/plugins/contacts/symbian/src/cntrelationship.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/cntrelationship.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/cntrelationshipgroup.cpp
--- a/qtmobility/plugins/contacts/symbian/src/cntrelationshipgroup.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/cntrelationshipgroup.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/cntsymbiandatabase.cpp
--- a/qtmobility/plugins/contacts/symbian/src/cntsymbiandatabase.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/cntsymbiandatabase.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/cntsymbianengine.cpp
--- a/qtmobility/plugins/contacts/symbian/src/cntsymbianengine.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/cntsymbianengine.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/cntsymbiantransformerror.cpp
--- a/qtmobility/plugins/contacts/symbian/src/cntsymbiantransformerror.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/cntsymbiantransformerror.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntdbinfo.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntdbinfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntdbinfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntdisplaylabelsqlfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterchangelog.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterchangelog.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterchangelog.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdefault.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdefault.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdefault.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdetail.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdetail.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdetail.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdetaildisplaylabel.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdetaildisplaylabel.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdetaildisplaylabel.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdetailrange.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdetailrange.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterdetailrange.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterintersection.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterintersection.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterintersection.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterinvalid.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterinvalid.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterinvalid.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterlocalid.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterlocalid.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterlocalid.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterrelationship.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterrelationship.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterrelationship.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntfilterunion.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterunion.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntfilterunion.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntsqlsearch.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntsqlsearch.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntsqlsearch.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntsymbianfilterdbms.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbianfilterdbms.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbianfilterdbms.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntsymbianfiltersql.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbianfiltersql.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbianfiltersql.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntsymbiansorterdbms.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbiansorterdbms.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbiansorterdbms.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/filtering/cntsymbiansrvconnection.cpp
--- a/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbiansrvconnection.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/filtering/cntsymbiansrvconnection.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cntthumbnailcreator.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cntthumbnailcreator.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cntthumbnailcreator.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformaddress.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformaddress.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformaddress.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformanniversary.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformanniversary.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformanniversary.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformanniversarysimple.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformanniversarysimple.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformanniversarysimple.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformavatar.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformavatar.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformavatar.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformbirthday.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformbirthday.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformbirthday.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformcontact.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformcontact.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformcontact.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformcontactdata.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformcontactdata.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformcontactdata.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformemail.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformemail.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformemail.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformempty.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformempty.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformempty.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformfamily.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformfamily.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformfamily.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformgender.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformgender.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformgender.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformgeolocation.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformgeolocation.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformgeolocation.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformname.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformname.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformname.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformnickname.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformnickname.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformnickname.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformnote.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformnote.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformnote.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformorganisation.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformorganisation.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformorganisation.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformphonenumber.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformphonenumber.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformphonenumber.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformringtone.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformringtone.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformringtone.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformsynctarget.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformsynctarget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformsynctarget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformthumbnail.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformthumbnail.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformthumbnail.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/src/transform/cnttransformurl.cpp
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformurl.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformurl.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/symbian.pro
--- a/qtmobility/plugins/contacts/symbian/symbian.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/symbian.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -152,7 +152,3 @@
     symbianplugin.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
     DEPLOYMENT += symbianplugin
 }
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/performance/performance.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/performance/performance.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/performance/performance.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/performance/performance.h
--- a/qtmobility/plugins/contacts/symbian/tsrc/performance/performance.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/performance/performance.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/tst_cntfilteringdbms/tst_cntfilteringdbms.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/tst_cntfilteringdbms/tst_cntfilteringdbms.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/tst_cntfilteringdbms/tst_cntfilteringdbms.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/tst_qcontactmanagersymbian/tst_qcontactmanagersymbian.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/tst_qcontactmanagersymbian/tst_qcontactmanagersymbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/tst_qcontactmanagersymbian/tst_qcontactmanagersymbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/main.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.h
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/mock_cntdb.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.h
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/testrunner.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.h
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntfiltering.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.h
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntrelationship.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.h
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsqlsearch.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.h
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbiandatabase.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.h
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_cntsymbianengine.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.cpp
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.h
--- a/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/tsrc/ut_symbian/ut_transformcontactdata.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbiansim/tsrc/tst_simcm/tst_simcm.cpp
--- a/qtmobility/plugins/contacts/symbiansim/tsrc/tst_simcm/tst_simcm.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbiansim/tsrc/tst_simcm/tst_simcm.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/symbiansim/tsrc/tst_simcmasync/tst_simcmasync.cpp
--- a/qtmobility/plugins/contacts/symbiansim/tsrc/tst_simcmasync/tst_simcmasync.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/symbiansim/tsrc/tst_simcmasync/tst_simcmasync.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/wince/contactconversions.cpp
--- a/qtmobility/plugins/contacts/wince/contactconversions.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/contactconversions.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/wince/qcontactrequestworker.cpp
--- a/qtmobility/plugins/contacts/wince/qcontactrequestworker.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/qcontactrequestworker.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/wince/qcontactrequestworker.h
--- a/qtmobility/plugins/contacts/wince/qcontactrequestworker.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/qcontactrequestworker.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/wince/qcontactrequestworker_p.h
--- a/qtmobility/plugins/contacts/wince/qcontactrequestworker_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/qcontactrequestworker_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/wince/qcontactwincebackend.cpp
--- a/qtmobility/plugins/contacts/wince/qcontactwincebackend.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/qcontactwincebackend.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/wince/qcontactwincebackend_p.h
--- a/qtmobility/plugins/contacts/wince/qcontactwincebackend_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/qcontactwincebackend_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/contacts/wince/wince.pro
--- a/qtmobility/plugins/contacts/wince/wince.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/contacts/wince/wince.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -15,10 +15,6 @@
         qcontactrequestworker.cpp
 
 INCLUDEPATH += $$SOURCE_DIR/src/contacts $$SOURCE_DIR/src/contacts/details $$SOURCE_DIR/src/contacts/filters $$SOURCE_DIR/src/contacts/requests
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
 LIBS += pimstore.lib -lole32
 CONFIG += mobility
 MOBILITY = contacts
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/declarative/declarative.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/declarative/declarative.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,5 @@
+include(../../staticconfig.pri)
+
+TEMPLATE = subdirs
+
+contains(mobility_modules,serviceframework): SUBDIRS += serviceframework
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/declarative/serviceframework/qdeclarativeservice.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/declarative/serviceframework/qdeclarativeservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qdeclarativeservice.h"
+
+QServiceWrapper::QServiceWrapper()
+: serviceInstance(0)
+{
+    serviceManager = new QServiceManager();
+}
+
+QServiceWrapper::~QServiceWrapper()
+{
+    delete serviceInstance;
+}
+
+bool QServiceWrapper::isValid() const
+{
+    return m_descriptor.isValid();
+}
+
+void QServiceWrapper::setInterfaceDesc(const QServiceInterfaceDescriptor &desc)
+{
+    if (desc == m_descriptor)
+        return;
+
+    m_descriptor = desc;
+
+    if (serviceInstance)
+        delete serviceInstance;
+
+    serviceInstance = 0;
+}
+
+QServiceInterfaceDescriptor QServiceWrapper::interfaceDesc() const
+{
+    return m_descriptor;
+}
+
+void QServiceWrapper::setInterfaceName(const QString &interface)
+{
+    m_descriptor = serviceManager->interfaceDefault(interface);
+
+    if (!isValid())
+        qWarning() << "WARNING: No default service found for interface name: " << interface;
+}
+
+QString QServiceWrapper::interfaceName() const
+{
+    if (isValid())
+        return m_descriptor.interfaceName();
+    else
+        return "No Interface";
+}
+
+QString QServiceWrapper::serviceName() const
+{
+    if (isValid())
+        return m_descriptor.serviceName();
+    else
+        return "No Service";
+}
+
+QString QServiceWrapper::versionNumber() const
+{
+    if (isValid())
+        return (QString::number(m_descriptor.majorVersion())+"."+QString::number(m_descriptor.minorVersion()));
+    else
+        return "0.0";
+}
+
+QObject* QServiceWrapper::serviceObject()
+{
+    if (serviceInstance) {
+        return serviceInstance;
+    }
+
+    if (isValid()) {
+        QServiceManager manager;
+        serviceInstance = manager.loadInterface(m_descriptor);
+       
+        return serviceInstance;
+    } else {
+        return 0;
+    }
+}
+
+QServiceListWrapper::QServiceListWrapper()
+{
+    serviceManager = new QServiceManager();
+}
+
+QServiceListWrapper::~QServiceListWrapper()
+{
+}
+
+void QServiceListWrapper::setInterfaceName(const QString &interface)
+{
+    m_interface = interface;
+
+    // ![0]
+    QServiceWrapper *service;
+    QServiceFilter filter(m_interface, m_version);
+    QList<QServiceInterfaceDescriptor> list = serviceManager->findInterfaces(filter);
+    for (int i = 0; i < list.size(); i++) {
+        service = new QServiceWrapper();
+        service->setInterfaceDesc(list.at(i));
+        m_services.append(service);
+    }
+    // ![0]
+}
+
+QString QServiceListWrapper::interfaceName() const
+{
+    return m_interface;
+}
+
+void QServiceListWrapper::setMinVersion(const QString &version)
+{
+    m_version = version;
+}
+
+QString QServiceListWrapper::minVersion() const
+{
+    return m_version;
+}
+
+QDeclarativeListProperty<QServiceWrapper> QServiceListWrapper::services()
+{
+    return QDeclarativeListProperty<QServiceWrapper>(this, m_services);
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/declarative/serviceframework/qdeclarativeservice.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/declarative/serviceframework/qdeclarativeservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** 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$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+***************************************************************************/
+
+#ifndef QDECLARATIVESERVICE_H
+#define QDECLARATIVESERVICE_H
+
+#include <QtCore>
+#include <qserviceinterfacedescriptor.h>
+#include <qservicemanager.h>
+#include <qdeclarative.h>
+#include <qdeclarativelist.h>
+
+QTM_USE_NAMESPACE
+
+Q_DECLARE_METATYPE(QServiceInterfaceDescriptor)
+
+class QServiceWrapper : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
+    Q_PROPERTY(QString serviceName READ serviceName);
+    Q_PROPERTY(QString versionNumber READ versionNumber);
+    Q_PROPERTY(bool valid READ isValid NOTIFY validChanged);
+    Q_PROPERTY(QObject* serviceObject READ serviceObject NOTIFY serviceObjectChanged);
+
+public:
+    QServiceWrapper();
+    ~QServiceWrapper();
+
+    void setInterfaceDesc(const QServiceInterfaceDescriptor& desc);
+    QServiceInterfaceDescriptor interfaceDesc() const;
+
+    void setInterfaceName(const QString& interface);
+    QString interfaceName() const;
+    QString serviceName() const;
+    QString versionNumber() const;
+
+    bool isValid() const;
+    QObject* serviceObject();
+
+Q_SIGNALS:
+    void validChanged();
+    void serviceObjectChanged();
+
+private:
+    QServiceManager* serviceManager;
+
+    QServiceInterfaceDescriptor m_descriptor;
+    QObject* serviceInstance;
+};
+
+QML_DECLARE_TYPE(QServiceWrapper)
+
+class QServiceListWrapper : public QObject {
+    Q_OBJECT
+    Q_PROPERTY(QString interfaceName READ interfaceName WRITE setInterfaceName);
+    Q_PROPERTY(QString minVersion READ minVersion WRITE setMinVersion);
+    Q_PROPERTY(QDeclarativeListProperty<QServiceWrapper> services READ services NOTIFY servicesChanged);
+
+public:
+    QServiceListWrapper();
+    ~QServiceListWrapper();
+
+    QDeclarativeListProperty<QServiceWrapper> services();
+    
+    void setInterfaceName(const QString& interface);
+    QString interfaceName() const;
+
+    void setMinVersion(const QString& interface);
+    QString minVersion() const;
+    
+private:
+    QServiceManager* serviceManager;
+    QList<QServiceWrapper *> m_services;
+    QString m_interface;
+    QString m_version;
+
+Q_SIGNALS:
+    void servicesChanged(const QDeclarativeListProperty<QServiceWrapper>&);
+};
+
+QML_DECLARE_TYPE(QServiceListWrapper)
+
+#endif
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/declarative/serviceframework/qmldir
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/declarative/serviceframework/qmldir	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,1 @@
+plugin declarative_serviceframework
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/declarative/serviceframework/serviceframework.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/declarative/serviceframework/serviceframework.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** 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 plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+
+#include "qdeclarativeservice.h"
+
+QT_BEGIN_NAMESPACE
+
+class QServiceDeclarativeModule : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    virtual void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtMobility.serviceframework"));
+
+        qmlRegisterType<QServiceWrapper>(uri, 1, 0, "Service");
+        qmlRegisterType<QServiceListWrapper>(uri, 1, 0, "ServiceList");
+    }
+};
+
+QT_END_NAMESPACE
+
+#include "serviceframework.moc"
+
+Q_EXPORT_PLUGIN2(qservicedeclarativemodule, QT_PREPEND_NAMESPACE(QServiceDeclarativeModule));
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/declarative/serviceframework/serviceframework.pro
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/declarative/serviceframework/serviceframework.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,26 @@
+INCLUDEPATH += ../../../src/serviceframework
+INCLUDEPATH += ../../../src/global
+
+TARGET  = declarative_serviceframework
+TARGETPATH = QtMobility/serviceframework
+include(../../qimportbase.pri)
+include(../../../common.pri)
+
+QT += declarative
+
+HEADERS += qdeclarativeservice.h
+
+SOURCES += qdeclarativeservice.cpp \
+           serviceframework.cpp \
+
+CONFIG += mobility
+MOBILITY += serviceframework
+
+DESTDIR = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH
+target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+qmldir.files += $$PWD/qmldir
+qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
+
+INSTALLS += target qmldir
+
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiocapture.pro
--- a/qtmobility/plugins/multimedia/audiocapture/audiocapture.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocapture.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -29,7 +29,3 @@
     audiocaptureservice.cpp \
     audiocaptureserviceplugin.cpp \
     audiocapturesession.cpp
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiocaptureservice.cpp
--- a/qtmobility/plugins/multimedia/audiocapture/audiocaptureservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocaptureservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiocaptureservice.h
--- a/qtmobility/plugins/multimedia/audiocapture/audiocaptureservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocaptureservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp
--- a/qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.h
--- a/qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocaptureserviceplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiocapturesession.cpp
--- a/qtmobility/plugins/multimedia/audiocapture/audiocapturesession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocapturesession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiocapturesession.h
--- a/qtmobility/plugins/multimedia/audiocapture/audiocapturesession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocapturesession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiocontainercontrol.cpp
--- a/qtmobility/plugins/multimedia/audiocapture/audiocontainercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocontainercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiocontainercontrol.h
--- a/qtmobility/plugins/multimedia/audiocapture/audiocontainercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiocontainercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.cpp
--- a/qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.h
--- a/qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audioencodercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audioendpointselector.cpp
--- a/qtmobility/plugins/multimedia/audiocapture/audioendpointselector.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audioendpointselector.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audioendpointselector.h
--- a/qtmobility/plugins/multimedia/audiocapture/audioendpointselector.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audioendpointselector.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiomediarecordercontrol.cpp
--- a/qtmobility/plugins/multimedia/audiocapture/audiomediarecordercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiomediarecordercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/audiocapture/audiomediarecordercontrol.h
--- a/qtmobility/plugins/multimedia/audiocapture/audiomediarecordercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/audiocapture/audiomediarecordercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/directshow.pro
--- a/qtmobility/plugins/multimedia/directshow/directshow.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/directshow.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -20,8 +20,3 @@
 !contains(TMP_REQUIRED_HEADERS, wmsdk.h): DEFINES += QT_NO_WMSDK
 
 include (player/player.pri)
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/dsserviceplugin.cpp
--- a/qtmobility/plugins/multimedia/directshow/dsserviceplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/dsserviceplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/dsserviceplugin.h
--- a/qtmobility/plugins/multimedia/directshow/dsserviceplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/dsserviceplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowaudioendpointcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshoweventloop.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshoweventloop.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshoweventloop.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshoweventloop.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshoweventloop.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshoweventloop.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowglobal.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowglobal.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowglobal.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowioreader.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowioreader.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowioreader.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowioreader.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowioreader.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowioreader.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowiosource.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowiosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowiosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowiosource.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowiosource.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowiosource.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowmediatype.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowmediatype.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowmediatype.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowmediatype.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowmediatype.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowmediatype.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowmediatypelist.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowmediatypelist.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowmediatypelist.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowmediatypelist.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowmediatypelist.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowmediatypelist.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowmetadatacontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowpinenum.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowpinenum.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowpinenum.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowpinenum.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowpinenum.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowpinenum.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowplayercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowplayerservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowsamplescheduler.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowsamplescheduler.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowsamplescheduler.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowsamplescheduler.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowsamplescheduler.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowsamplescheduler.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowvideooutputcontrol.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowvideooutputcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowvideooutputcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowvideooutputcontrol.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowvideooutputcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowvideooutputcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowvideorenderercontrol.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/directshowvideorenderercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowvideorenderercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/directshowvideorenderercontrol.h
--- a/qtmobility/plugins/multimedia/directshow/player/directshowvideorenderercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/directshowvideorenderercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/mediasamplevideobuffer.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/mediasamplevideobuffer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/mediasamplevideobuffer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/mediasamplevideobuffer.h
--- a/qtmobility/plugins/multimedia/directshow/player/mediasamplevideobuffer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/mediasamplevideobuffer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/videosurfacefilter.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/videosurfacefilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/videosurfacefilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/videosurfacefilter.h
--- a/qtmobility/plugins/multimedia/directshow/player/videosurfacefilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/videosurfacefilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/vmr9videowindowcontrol.cpp
--- a/qtmobility/plugins/multimedia/directshow/player/vmr9videowindowcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/vmr9videowindowcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/directshow/player/vmr9videowindowcontrol.h
--- a/qtmobility/plugins/multimedia/directshow/player/vmr9videowindowcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/directshow/player/vmr9videowindowcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/gstreamer.pro
--- a/qtmobility/plugins/multimedia/gstreamer/gstreamer.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/gstreamer.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -81,7 +81,3 @@
     include(mediacapture/maemo/mediacapture_maemo.pri)
     DEFINES += GST_USE_UNSTABLE_API #prevents warnings because of unstable photography API 
 }
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreameraudioencode_maemo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturemetadatacontrol_maemo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercaptureservice_maemo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamercapturesession_maemo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamermediacontainercontrol_maemo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamerrecordercontrol_maemo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/maemo/qgstreamervideoencode_maemo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreameraudioencode.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturemetadatacontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercaptureservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamercapturesession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamermediacontainercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerrecordercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamerv4l2input.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediacapture/qgstreamervideoencode.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamermetadataprovider.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayerservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h
--- a/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/mediaplayer/qgstreamerstreamscontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreameraudioinputendpointselector.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamerbushelper.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamerbushelper.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamerbushelper.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamerbushelper.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamerbushelper.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamerbushelper.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamermessage.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamermessage.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamermessage.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamermessage.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamermessage.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamermessage.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamerserviceplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideoinputdevicecontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooutputcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideooverlay.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideorenderer.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorenderer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorenderer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideorenderer.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorenderer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorenderer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideorendererinterface.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideowidget.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideowidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideowidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstreamervideowidget.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstreamervideowidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstreamervideowidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstvideobuffer.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstvideobuffer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstvideobuffer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstvideobuffer.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstvideobuffer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstvideobuffer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstxvimagebuffer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qgstxvimagebuffer.h
--- a/qtmobility/plugins/multimedia/gstreamer/qgstxvimagebuffer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qgstxvimagebuffer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qvideosurfacegstsink.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qvideosurfacegstsink.h
--- a/qtmobility/plugins/multimedia/gstreamer/qvideosurfacegstsink.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qvideosurfacegstsink.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qx11videosurface.cpp
--- a/qtmobility/plugins/multimedia/gstreamer/qx11videosurface.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qx11videosurface.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/gstreamer/qx11videosurface.h
--- a/qtmobility/plugins/multimedia/gstreamer/qx11videosurface.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/gstreamer/qx11videosurface.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/m3u/m3u.pro
--- a/qtmobility/plugins/multimedia/m3u/m3u.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/m3u/m3u.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -2,7 +2,7 @@
 CONFIG += plugin
 TARGET = $$qtLibraryTarget(qtmedia_m3u)
 
-PLUGIN_TYPE = playlistformats
+PLUGIN_TYPE=playlistformats
 
 include (../../../common.pri)
 
@@ -26,7 +26,3 @@
     pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
     DEPLOYMENT += pluginDep
 }
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/m3u/main.cpp
--- a/qtmobility/plugins/multimedia/m3u/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/m3u/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/m3u/qm3uhandler.cpp
--- a/qtmobility/plugins/multimedia/m3u/qm3uhandler.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/m3u/qm3uhandler.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/m3u/qm3uhandler.h
--- a/qtmobility/plugins/multimedia/m3u/qm3uhandler.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/m3u/qm3uhandler.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qcvdisplaylink.h
--- a/qtmobility/plugins/multimedia/qt7/qcvdisplaylink.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qcvdisplaylink.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qcvdisplaylink.mm
--- a/qtmobility/plugins/multimedia/qt7/qcvdisplaylink.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qcvdisplaylink.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7.pro
--- a/qtmobility/plugins/multimedia/qt7/qt7.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -55,8 +55,3 @@
     qt7videooutputcontrol.mm \
     qt7playerservice.mm \
     qcvdisplaylink.mm
-
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7backend.h
--- a/qtmobility/plugins/multimedia/qt7/qt7backend.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7backend.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7backend.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7backend.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7backend.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7movierenderer.h
--- a/qtmobility/plugins/multimedia/qt7/qt7movierenderer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movierenderer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7movierenderer.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7movierenderer.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movierenderer.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7movievideowidget.h
--- a/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7movievideowidget.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movievideowidget.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.h
--- a/qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movieviewoutput.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.h
--- a/qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7movieviewrenderer.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7playercontrol.h
--- a/qtmobility/plugins/multimedia/qt7/qt7playercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7playercontrol.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7playercontrol.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playercontrol.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7playermetadata.h
--- a/qtmobility/plugins/multimedia/qt7/qt7playermetadata.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playermetadata.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playermetadata.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7playerservice.h
--- a/qtmobility/plugins/multimedia/qt7/qt7playerservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playerservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7playerservice.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7playerservice.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playerservice.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7playersession.h
--- a/qtmobility/plugins/multimedia/qt7/qt7playersession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playersession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7playersession.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7playersession.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7playersession.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7serviceplugin.h
--- a/qtmobility/plugins/multimedia/qt7/qt7serviceplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7serviceplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7serviceplugin.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7serviceplugin.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7serviceplugin.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.h
--- a/qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.mm
--- a/qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/qt7/qt7videooutputcontrol.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/common/s60videooutputcontrol.cpp
--- a/qtmobility/plugins/multimedia/symbian/common/s60videooutputcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/common/s60videooutputcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/common/s60videooutputcontrol.h
--- a/qtmobility/plugins/multimedia/symbian/common/s60videooutputcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/common/s60videooutputcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocaptureservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocapturesession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiocontainercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioencodercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audioendpointselector.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/audiosource/s60audiomediarecordercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/ms60mediaplayerresolver.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/ms60mediaplayerresolver.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/ms60mediaplayerresolver.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60audioplayersession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediametadataprovider.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayeraudioendpointselector.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,7 +1,7 @@
 
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayerservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediaplayersession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60mediarecognizer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videooverlay.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videoplayersession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videorenderer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videosurface.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/mediaplayer/s60videowidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_31.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunercontrol_since32.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/radio/s60radiotunerservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp
--- a/qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h
--- a/qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/mmf/s60mediaserviceplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.cpp
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioencodercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.cpp
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxaaudioendpointselector.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxacommon.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxacommon.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxacommon.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediacontainercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.cpp
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxamediarecordercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordmediaserviceproviderplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/qxarecordsession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessioncommon.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessioncommon.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessioncommon.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.cpp
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.h
--- a/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/symbian/openmaxal/mediarecorder/xarecordsessionimpl.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.cpp
--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.h
--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp
--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h
--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradiocontrol_maemo5.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/v4l/radio/v4lradioservice.cpp
--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradioservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradioservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/v4l/radio/v4lradioservice.h
--- a/qtmobility/plugins/multimedia/v4l/radio/v4lradioservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/radio/v4lradioservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/v4l/v4l.pro
--- a/qtmobility/plugins/multimedia/v4l/v4l.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/v4l.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -17,7 +17,3 @@
 SOURCES += v4lserviceplugin.cpp
 
 include(radio/radio.pri)
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/v4l/v4lserviceplugin.cpp
--- a/qtmobility/plugins/multimedia/v4l/v4lserviceplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/v4lserviceplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/v4l/v4lserviceplugin.h
--- a/qtmobility/plugins/multimedia/v4l/v4lserviceplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/v4l/v4lserviceplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qevrvideooverlay.cpp
--- a/qtmobility/plugins/multimedia/wmp/qevrvideooverlay.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qevrvideooverlay.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qevrvideooverlay.h
--- a/qtmobility/plugins/multimedia/wmp/qevrvideooverlay.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qevrvideooverlay.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qmfactivate.cpp
--- a/qtmobility/plugins/multimedia/wmp/qmfactivate.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qmfactivate.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qmfactivate.h
--- a/qtmobility/plugins/multimedia/wmp/qmfactivate.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qmfactivate.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpevents.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpevents.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpevents.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpevents.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpevents.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpevents.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpglobal.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpglobal.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpglobal.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpglobal.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpglobal.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpglobal.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpmetadata.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpmetadata.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpmetadata.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpmetadata.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpmetadata.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpmetadata.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpplayercontrol.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpplayercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplayercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpplayercontrol.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpplayercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplayercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpplayerservice.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpplayerservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplayerservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpplayerservice.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpplayerservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplayerservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpplaylist.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpplaylist.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplaylist.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpplaylist.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpplaylist.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplaylist.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpplaylistcontrol.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpplaylistcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplaylistcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpplaylistcontrol.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpplaylistcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpplaylistcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpserviceprovider.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpvideooutputcontrol.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpvideooutputcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpvideooutputcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpvideooutputcontrol.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpvideooutputcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpvideooutputcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpvideooverlay.cpp
--- a/qtmobility/plugins/multimedia/wmp/qwmpvideooverlay.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpvideooverlay.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/qwmpvideooverlay.h
--- a/qtmobility/plugins/multimedia/wmp/qwmpvideooverlay.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/qwmpvideooverlay.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/multimedia/wmp/wmp.pro
--- a/qtmobility/plugins/multimedia/wmp/wmp.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/multimedia/wmp/wmp.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -42,7 +42,3 @@
     qwmpserviceprovider.cpp \
     qwmpvideooutputcontrol.cpp \
     qwmpvideooverlay.cpp
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS+=target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/plugins.pro
--- a/qtmobility/plugins/plugins.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/plugins.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -5,3 +5,5 @@
 contains(mobility_modules,contacts): SUBDIRS += contacts
 contains(mobility_modules,multimedia): SUBDIRS += multimedia
 contains(mobility_modules,sensors): SUBDIRS += sensors
+
+contains(QT_CONFIG,declarative): SUBDIRS += declarative
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/qimportbase.pri
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qtmobility/plugins/qimportbase.pri	Fri Jun 11 14:26:25 2010 +0300
@@ -0,0 +1,31 @@
+TEMPLATE = lib
+CONFIG += qt plugin
+
+win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release
+
+isEmpty(TARGETPATH) {
+    error("qimportbase.pri: You must provide a TARGETPATH!")
+}
+isEmpty(TARGET) {
+    error("qimportbase.pri: You must provide a TARGET!")
+}
+
+QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
+copy2build.input = QMLDIRFILE
+copy2build.output = $$[QT_INSTALL_PREFIX]/imports/$$TARGETPATH/qmldir
+!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
+copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+copy2build.name = COPY ${QMAKE_FILE_IN}
+copy2build.CONFIG += no_link
+QMAKE_EXTRA_COMPILERS += copy2build
+
+TARGET = $$qtLibraryTarget($$TARGET)
+contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
+
+wince*:LIBS += $$QMAKE_LIBS_GUI
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+    TARGET.CAPABILITY = All -Tcb
+    load(armcc_warnings)
+}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/dummy/dummy.pro
--- a/qtmobility/plugins/sensors/dummy/dummy.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/dummy.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,13 +1,14 @@
 INCLUDEPATH+=../../../src/sensors
 
+TEMPLATE = lib
+CONFIG += plugin
+PLUGIN_TYPE = sensors
+
 include(version.pri)
 include(dummy.pri)
 include(../../../common.pri)
 
-PLUGIN_TYPE = sensors
 
-TEMPLATE = lib
-CONFIG += plugin
 TARGET = $$qtLibraryTarget(qtsensors_dummy)
 symbian:TARGET.EPOCALLOWDLLDATA = 1
 
@@ -16,8 +17,3 @@
 MOBILITY+=sensors
 
 CONFIG+=strict_flags
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS += target
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/dummy/dummyaccelerometer.cpp
--- a/qtmobility/plugins/sensors/dummy/dummyaccelerometer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/dummyaccelerometer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/dummy/dummyaccelerometer.h
--- a/qtmobility/plugins/sensors/dummy/dummyaccelerometer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/dummyaccelerometer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/dummy/dummycommon.cpp
--- a/qtmobility/plugins/sensors/dummy/dummycommon.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/dummycommon.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/dummy/dummycommon.h
--- a/qtmobility/plugins/sensors/dummy/dummycommon.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/dummycommon.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/dummy/dummylightsensor.cpp
--- a/qtmobility/plugins/sensors/dummy/dummylightsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/dummylightsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -49,6 +49,8 @@
     : dummycommon(sensor)
 {
     setReading<QAmbientLightReading>(&m_reading);
+    addDataRate(100,100);
+    sensor->setDataRate(100);
 }
 
 void dummylightsensor::poll()
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/dummy/dummylightsensor.h
--- a/qtmobility/plugins/sensors/dummy/dummylightsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/dummylightsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/dummy/main.cpp
--- a/qtmobility/plugins/sensors/dummy/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/dummy/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/generic/generic.pro
--- a/qtmobility/plugins/sensors/generic/generic.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/generic/generic.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,15 +1,15 @@
 INCLUDEPATH+=../../../src/sensors
 
-include(version.pri)
-include(generic.pri)
-include(../../../common.pri)
-
 PLUGIN_TYPE = sensors
 
 TEMPLATE = lib
 CONFIG += plugin
 TARGET = $$qtLibraryTarget(qtsensors_generic)
 
+include(version.pri)
+include(generic.pri)
+include(../../../common.pri)
+
 symbian {
    TARGET.EPOCALLOWDLLDATA = 1
    TARGET.UID3 = 0x2002BFC3
@@ -25,8 +25,3 @@
 MOBILITY+=sensors
 
 CONFIG+=strict_flags
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS += target
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/generic/genericorientationsensor.cpp
--- a/qtmobility/plugins/sensors/generic/genericorientationsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/generic/genericorientationsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/generic/genericorientationsensor.h
--- a/qtmobility/plugins/sensors/generic/genericorientationsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/generic/genericorientationsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/generic/genericrotationsensor.cpp
--- a/qtmobility/plugins/sensors/generic/genericrotationsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/generic/genericrotationsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/generic/genericrotationsensor.h
--- a/qtmobility/plugins/sensors/generic/genericrotationsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/generic/genericrotationsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/generic/main.cpp
--- a/qtmobility/plugins/sensors/generic/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/generic/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6.pro
--- a/qtmobility/plugins/sensors/maemo6/maemo6.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -15,8 +15,3 @@
 MOBILITY += sensors
 CONFIG += link_pkgconfig
 PKGCONFIG += sensord
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS += target
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6accelerometer.cpp
--- a/qtmobility/plugins/sensors/maemo6/maemo6accelerometer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6accelerometer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -85,7 +85,6 @@
     m_reading.setX(ax);
     m_reading.setY(ay);
     m_reading.setZ(az);
-    //m_reading.setTimestamp(data.timestamp());
-    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    m_reading.setTimestamp(data.XYZData().timestamp_);
     newReadingAvailable();
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6accelerometer.h
--- a/qtmobility/plugins/sensors/maemo6/maemo6accelerometer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6accelerometer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,10 +44,9 @@
 
 #include "maemo6sensorbase.h"
 #include <qaccelerometer.h>
-#include <qsensorbackend.h>
 
-#include <sensord/accelerometersensor_i.h>
-#include <sensord/datatypes/xyz.h>
+#include <accelerometersensor_i.h>
+#include <datatypes/xyz.h>
 
 QTM_USE_NAMESPACE
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6als.cpp
--- a/qtmobility/plugins/sensors/maemo6/maemo6als.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6als.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -52,7 +52,7 @@
         initSensor<ALSSensorChannelInterface>("alssensor");
 
         if (m_sensorInterface)
-            QObject::connect(static_cast<const ALSSensorChannelInterface*>(m_sensorInterface), SIGNAL(ALSChanged(const int&)), this, SLOT(slotDataAvailable(const int&)));
+            QObject::connect(static_cast<const ALSSensorChannelInterface*>(m_sensorInterface), SIGNAL(ALSChanged(const Unsigned&)), this, SLOT(slotDataAvailable(const Unsigned&)));
         else
             qWarning() << "Unable to initialize ambient light sensor.";
 
@@ -60,35 +60,34 @@
         addDataRate(1, 1); // 1Hz
         sensor->setDataRate(1);
         addOutputRange(0, 5, 1);
-        setDescription(QLatin1String("Ambient light intensity given as 5 pre-defined levels"));
+        setDescription(QLatin1String("Measures ambient light intensity given as 5 pre-defined levels"));
 
         m_initDone = true;
     }
 }
 
-void maemo6als::slotDataAvailable(const int& data)
+void maemo6als::slotDataAvailable(const Unsigned& data)
 {
     // Convert from integer to fixed levels
     // TODO: verify levels
     QAmbientLightReading::LightLevel level;
-    if (data < 0) {
+    int x = data.x();
+    if (x < 0) {
         level = QAmbientLightReading::Undefined;
-    } else if (data < 10) {
+    } else if (x < 10) {
         level = QAmbientLightReading::Dark;
-    } else if (data < 50) {
+    } else if (x < 50) {
         level = QAmbientLightReading::Twilight;
-    } else if (data < 100) {
+    } else if (x < 100) {
         level = QAmbientLightReading::Light;
-    } else if (data < 150) {
+    } else if (x < 150) {
         level = QAmbientLightReading::Bright;
     } else {
         level = QAmbientLightReading::Sunny;
     }
-
     if (level != m_reading.lightLevel()) {
         m_reading.setLightLevel(level);
-        //m_reading.setTimestamp(data.timestamp());
-        m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+        m_reading.setTimestamp(data.UnsignedData().timestamp_);
         newReadingAvailable();
     }
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6als.h
--- a/qtmobility/plugins/sensors/maemo6/maemo6als.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6als.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -45,7 +45,8 @@
 #include "maemo6sensorbase.h"
 #include <qambientlightsensor.h>
 
-#include <sensord/alssensor_i.h>
+#include <alssensor_i.h>
+#include <unsigned.h>
 
 QTM_USE_NAMESPACE
 
@@ -63,7 +64,7 @@
     static bool m_initDone;
 
 private slots:
-    void slotDataAvailable(const int& data);
+    void slotDataAvailable(const Unsigned& data);
 };
 
 #endif
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6compass.cpp
--- a/qtmobility/plugins/sensors/maemo6/maemo6compass.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6compass.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -53,8 +53,7 @@
         initSensor<CompassSensorChannelInterface>("compasssensor");
 
         if (m_sensorInterface) {
-            QObject::connect(static_cast<CompassSensorChannelInterface*>(m_sensorInterface), SIGNAL(levelChanged(const int&)), this, SLOT(slotLevelChanged(const int&)));
-            QObject::connect(static_cast<CompassSensorChannelInterface*>(m_sensorInterface), SIGNAL(degreesChanged(const int&)), this, SLOT(slotDegreesChanged(const int&)));
+            QObject::connect(static_cast<CompassSensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const Compass&)), this, SLOT(dataAvailable(const Compass&)));
         } else {
             qWarning() << "Unable to initialize compass sensor.";            
         }
@@ -69,26 +68,16 @@
     }
 }
 
-void maemo6compass::slotLevelChanged(const int& level)
+void maemo6compass::dataAvailable(const Compass& data)
 {
     // The scale for level is [0,3], where 3 is the best
     // Qt: Measured as a value from 0 to 1 with higher values being better.
-    float l = ((float) level) / 3.0;
+    m_reading.setCalibrationLevel(((float) data.level()) / 3.0);
 
-    qreal calibrationLevel = l;
-    m_reading.setCalibrationLevel(calibrationLevel);
-    //m_reading.setTimestamp(level.timestamp());
-    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    // The scale for degrees from sensord is [0,359]
+    // Value can be directly used as azimuth
+    m_reading.setAzimuth(data.degrees());
+
+    m_reading.setTimestamp(data.data().timestamp_);
     newReadingAvailable();
 }
-
-void maemo6compass::slotDegreesChanged(const int& degrees)
-{
-    // The scale for degrees from sensord is [0,359]
-    // Value can be directly used as azimuth
-    qreal azimuth = degrees;
-    m_reading.setAzimuth(azimuth);
-    //m_reading.setTimestamp(degrees.timestamp());
-    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
-    newReadingAvailable();
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6compass.h
--- a/qtmobility/plugins/sensors/maemo6/maemo6compass.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6compass.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,9 +44,9 @@
 
 #include "maemo6sensorbase.h"
 #include <qcompass.h>
-#include <qsensorbackend.h>
 
-#include <sensord/compasssensor_i.h>
+#include <compasssensor_i.h>
+#include <compass.h>
 
 QTM_USE_NAMESPACE
 
@@ -63,8 +63,7 @@
     static bool m_initDone;
 
 private slots:
-    void slotLevelChanged(const int& level);
-    void slotDegreesChanged(const int& degrees);
+    void dataAvailable(const Compass& data);
 };
 
 #endif
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6magnetometer.cpp
--- a/qtmobility/plugins/sensors/maemo6/maemo6magnetometer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6magnetometer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -62,7 +62,7 @@
         addDataRate(43, 43); // 43Hz
         sensor->setDataRate(43);
         addOutputRange(-0.000614, 0.000614, 0.0000003); // -600 ... 600 mikroteslas, 0.3 uT resolution
-        setDescription(QLatin1String("Magnetic flux density measured in teslas"));
+        setDescription(QLatin1String("Measures magnetic flux density measured in teslas"));
 
         m_initDone = true;
     }
@@ -82,7 +82,6 @@
         m_reading.setZ( 0.0000003 * data.rz() );
         m_reading.setCalibrationLevel(1);
     }
-    //m_reading.setTimestamp(data.timestamp());
-    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    m_reading.setTimestamp(data.timestamp());
     newReadingAvailable();
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6magnetometer.h
--- a/qtmobility/plugins/sensors/maemo6/maemo6magnetometer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6magnetometer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -45,8 +45,8 @@
 #include "maemo6sensorbase.h"
 #include <qmagnetometer.h>
 
-#include <sensord/magnetometersensor_i.h>
-#include <sensord/datatypes/magneticfield.h>
+#include <magnetometersensor_i.h>
+#include <magneticfield.h>
 
 QTM_USE_NAMESPACE
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6orientationsensor.cpp
--- a/qtmobility/plugins/sensors/maemo6/maemo6orientationsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6orientationsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -41,7 +41,7 @@
 
 #include "maemo6orientationsensor.h"
 
-#include "sensord/filters/posedata.h"
+#include <posedata.h>
 
 const char *maemo6orientationsensor::id("maemo6.orientationsensor");
 bool maemo6orientationsensor::m_initDone = false;
@@ -55,7 +55,7 @@
         initSensor<OrientationSensorChannelInterface>("orientationsensor");
 
         if (m_sensorInterface)
-            QObject::connect(static_cast<OrientationSensorChannelInterface*>(m_sensorInterface), SIGNAL(orientationChanged(const int&)), this, SLOT(slotOrientationChanged(const int&)));
+            QObject::connect(static_cast<OrientationSensorChannelInterface*>(m_sensorInterface), SIGNAL(orientationChanged(const Unsigned&)), this, SLOT(slotOrientationChanged(const Unsigned&)));
         else
             qWarning() << "Unable to initialize orientation sensor.";
 
@@ -63,16 +63,16 @@
         addDataRate(142, 142); // 142Hz
         sensor->setDataRate(142);
         addOutputRange(0, 6, 1);
-        setDescription(QLatin1String("Orientation of the device screen"));
+        setDescription(QLatin1String("Measures orientation of the device screen as 6 pre-defined levels"));
 
         m_initDone = true;
     }
 }
 
-void maemo6orientationsensor::slotOrientationChanged(const int& data)
+void maemo6orientationsensor::slotOrientationChanged(const Unsigned& data)
 {
     QOrientationReading::Orientation o;
-    switch (data) {
+    switch (data.x()) {
         case PoseData::BottomDown: o = QOrientationReading::TopUp;     break;
         case PoseData::BottomUp:   o = QOrientationReading::TopDown;   break;
         case PoseData::LeftUp:     o = QOrientationReading::LeftUp;    break;
@@ -82,7 +82,6 @@
         default:                   o = QOrientationReading::Undefined;
     }
     m_reading.setOrientation(o);
-    //m_reading.setTimestamp(data.timestamp());
-    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    m_reading.setTimestamp(data.UnsignedData().timestamp_);
     newReadingAvailable();
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6orientationsensor.h
--- a/qtmobility/plugins/sensors/maemo6/maemo6orientationsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6orientationsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,9 +44,9 @@
 
 #include "maemo6sensorbase.h"
 #include <qorientationsensor.h>
-#include <qsensorbackend.h>
 
-#include <sensord/orientationsensor_i.h>
+#include <orientationsensor_i.h>
+#include <unsigned.h>
 
 QTM_USE_NAMESPACE
 
@@ -64,7 +64,7 @@
     static bool m_initDone;
 
 private slots:
-    void slotOrientationChanged(const int& orientation); 
+    void slotOrientationChanged(const Unsigned& orientation);
 };
 
 #endif
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.cpp
--- a/qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -53,7 +53,7 @@
         initSensor<ProximitySensorChannelInterface>("proximitysensor");
 
         if (m_sensorInterface)
-            QObject::connect(static_cast<ProximitySensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const int&)), this, SLOT(slotDataAvailable(const int&)));
+            QObject::connect(static_cast<ProximitySensorChannelInterface*>(m_sensorInterface), SIGNAL(dataAvailable(const Unsigned&)), this, SLOT(slotDataAvailable(const Unsigned&)));
         else
             qWarning() << "Unable to initialize proximity sensor.";
 
@@ -67,16 +67,14 @@
     }
 }
 
-void maemo6proximitysensor::slotDataAvailable(const int& data)
+void maemo6proximitysensor::slotDataAvailable(const Unsigned& data)
 {
     bool close;
-    if (data)
+    if (data.x())
         close = true;
     else
         close = false;
-
     m_reading.setClose(close);
-    //m_reading.setTimestamp(data.timestamp());
-    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    m_reading.setTimestamp(data.UnsignedData().timestamp_);
     newReadingAvailable();
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.h
--- a/qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6proximitysensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -45,7 +45,8 @@
 #include "maemo6sensorbase.h"
 #include <qproximitysensor.h>
 
-#include <sensord/proximitysensor_i.h>
+#include <proximitysensor_i.h>
+#include <unsigned.h>
 
 QTM_USE_NAMESPACE
 
@@ -63,7 +64,7 @@
     static bool m_initDone;
    
 private slots:
-    void slotDataAvailable(const int& data);
+    void slotDataAvailable(const Unsigned& data);
 };
 
 #endif
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6rotationsensor.cpp
--- a/qtmobility/plugins/sensors/maemo6/maemo6rotationsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6rotationsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -62,8 +62,8 @@
         // metadata
         addDataRate(23, 23); // 23Hz
         sensor->setDataRate(23);
-        addOutputRange(-180, 180, 1);
-        setDescription(QLatin1String("Measures x, y, and z axes rotation"));
+        addOutputRange(-179, 180, 1);
+        setDescription(QLatin1String("Measures x, y, and z axes rotation in degrees"));
 
         m_initDone = true;
     }
@@ -75,7 +75,6 @@
     m_reading.setX(data.x());
     m_reading.setY(data.y());
     m_reading.setZ(data.z());
-    //m_reading.setTimestamp(data.timestamp());
-    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    m_reading.setTimestamp(data.XYZData().timestamp_);
     newReadingAvailable();
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6rotationsensor.h
--- a/qtmobility/plugins/sensors/maemo6/maemo6rotationsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6rotationsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,10 +44,9 @@
 
 #include "maemo6sensorbase.h"
 #include <qrotationsensor.h>
-#include <qsensorbackend.h>
 
-#include <sensord/rotationsensor_i.h>
-#include <sensord/datatypes/xyz.h>
+#include <rotationsensor_i.h>
+#include <xyz.h>
 
 QTM_USE_NAMESPACE
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6sensorbase.cpp
--- a/qtmobility/plugins/sensors/maemo6/maemo6sensorbase.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6sensorbase.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include "maemo6sensorbase.h"
-#include <ctime>
 
 SensorManagerInterface* maemo6sensorbase::m_remoteSensorManager = 0;
 const float maemo6sensorbase::GRAVITY_EARTH = 9.80665;
@@ -91,13 +90,3 @@
         m_sensorInterface->stop();
     m_sensorRunning = false;
 }
-
-qtimestamp maemo6sensorbase::createTimestamp()
-{
-    timespec stamp;
-    clock_gettime(CLOCK_MONOTONIC, &stamp);
-    qtimestamp data = stamp.tv_sec;
-    data = data * 1000000;
-    data = stamp.tv_nsec / 1000 + data;
-    return data;
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6sensorbase.h
--- a/qtmobility/plugins/sensors/maemo6/maemo6sensorbase.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6sensorbase.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -43,8 +43,8 @@
 #define MAEMO6SENSORBASE_H
 
 #include <qsensorbackend.h>
-#include "sensord/sensormanagerinterface.h"
-#include "sensord/abstractsensor_i.h"
+#include <sensormanagerinterface.h>
+#include <abstractsensor_i.h>
 
 QTM_USE_NAMESPACE
 
@@ -75,8 +75,6 @@
             m_sensorInterface = const_cast<T*>(T::listenInterface(sensorName));
         }
     }
-
-    qtimestamp createTimestamp();
 };
 
 #endif
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6tapsensor.cpp
--- a/qtmobility/plugins/sensors/maemo6/maemo6tapsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6tapsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -41,7 +41,7 @@
 
 #include "maemo6tapsensor.h"
 
-#include "sensord/filters/tapdata.h"
+#include <tapdata.h>
 
 const char *maemo6tapsensor::id("maemo6.tapsensor");
 bool maemo6tapsensor::m_initDone = false;
@@ -101,7 +101,6 @@
     }
     m_reading.setTapDirection(o);
 
-    //m_reading.setTimestamp(data.timestamp());
-    m_reading.setTimestamp(createTimestamp()); //TODO: use correct timestamp
+    m_reading.setTimestamp(data.tapData().timestamp_);
     newReadingAvailable();
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/maemo6tapsensor.h
--- a/qtmobility/plugins/sensors/maemo6/maemo6tapsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/maemo6tapsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,10 +44,9 @@
 
 #include "maemo6sensorbase.h"
 #include <qtapsensor.h>
-#include <qsensorbackend.h>
 
-#include <sensord/tapsensor_i.h>
-#include <sensord/datatypes/tap.h>
+#include <tapsensor_i.h>
+#include <tap.h>
 
 QTM_USE_NAMESPACE
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/maemo6/main.cpp
--- a/qtmobility/plugins/sensors/maemo6/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/maemo6/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/main.cpp
--- a/qtmobility/plugins/sensors/n900/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/n900.pro
--- a/qtmobility/plugins/sensors/n900/n900.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,25 +1,21 @@
 INCLUDEPATH+=../../../src/sensors
 
-include(version.pri)
-include(n900.pri)
-include(../../../common.pri)
-
 PLUGIN_TYPE = sensors
 
 TEMPLATE = lib
 CONFIG += plugin
 TARGET = $$qtLibraryTarget(qtsensors_n900)
 
+include(version.pri)
+include(n900.pri)
+include(../../../common.pri)
+
 QT=core
 CONFIG+=mobility
 MOBILITY+=sensors
 
 CONFIG+=strict_flags
 
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS += target
-
 BUILD_ALL_PLUGINS=$$(BUILD_ALL_PLUGINS)
 equals(BUILD_ALL_PLUGINS,1) {
     DEFINES+=BUILD_ALL_PLUGINS
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/n900accelerometer.cpp
--- a/qtmobility/plugins/sensors/n900/n900accelerometer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900accelerometer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/n900accelerometer.h
--- a/qtmobility/plugins/sensors/n900/n900accelerometer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900accelerometer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/n900filebasedsensor.cpp
--- a/qtmobility/plugins/sensors/n900/n900filebasedsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900filebasedsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/n900filebasedsensor.h
--- a/qtmobility/plugins/sensors/n900/n900filebasedsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900filebasedsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/n900lightsensor.cpp
--- a/qtmobility/plugins/sensors/n900/n900lightsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900lightsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/n900lightsensor.h
--- a/qtmobility/plugins/sensors/n900/n900lightsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900lightsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/n900proximitysensor.cpp
--- a/qtmobility/plugins/sensors/n900/n900proximitysensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900proximitysensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/n900/n900proximitysensor.h
--- a/qtmobility/plugins/sensors/n900/n900proximitysensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/n900/n900proximitysensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/s60_sensor_api/main.cpp
--- a/qtmobility/plugins/sensors/s60_sensor_api/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/s60_sensor_api/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp
--- a/qtmobility/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h
--- a/qtmobility/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/s60_sensor_api/qs60sensorapiaccelerometer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/s60_sensor_api/s60_sensor_api.pro
--- a/qtmobility/plugins/sensors/s60_sensor_api/s60_sensor_api.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/s60_sensor_api/s60_sensor_api.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,14 +1,14 @@
 INCLUDEPATH+=../../../src/sensors
 
-include(../../../common.pri)
-include(s60_sensor_api.pri)
-include(version.pri)
-
 PLUGIN_TYPE = sensors
 
 TEMPLATE = lib
 CONFIG += plugin
 
+include(../../../common.pri)
+include(s60_sensor_api.pri)
+include(version.pri)
+
 TARGET = $$qtLibraryTarget(qtsensors_s60sensorapi)
 TARGET.EPOCALLOWDLLDATA = 1
 TARGET.UID3 = 0x2002BFC1
@@ -22,7 +22,3 @@
 s60sensorapi.sources = $${TARGET}.dll
 s60sensorapi.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
 DEPLOYMENT += s60sensorapi
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS += target
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/accelerometersym.cpp
--- a/qtmobility/plugins/sensors/symbian/accelerometersym.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/accelerometersym.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
  **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  ** All rights reserved.
  ** Contact: Nokia Corporation (qt-info@nokia.com)
  **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/accelerometersym.h
--- a/qtmobility/plugins/sensors/symbian/accelerometersym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/accelerometersym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/ambientlightsensorsym.cpp
--- a/qtmobility/plugins/sensors/symbian/ambientlightsensorsym.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/ambientlightsensorsym.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/ambientlightsensorsym.h
--- a/qtmobility/plugins/sensors/symbian/ambientlightsensorsym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/ambientlightsensorsym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/compasssym.cpp
--- a/qtmobility/plugins/sensors/symbian/compasssym.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/compasssym.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/compasssym.h
--- a/qtmobility/plugins/sensors/symbian/compasssym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/compasssym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/magnetometersensorsym.cpp
--- a/qtmobility/plugins/sensors/symbian/magnetometersensorsym.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/magnetometersensorsym.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/magnetometersensorsym.h
--- a/qtmobility/plugins/sensors/symbian/magnetometersensorsym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/magnetometersensorsym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/main.cpp
--- a/qtmobility/plugins/sensors/symbian/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/orientationsym.cpp
--- a/qtmobility/plugins/sensors/symbian/orientationsym.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/orientationsym.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
  **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  ** All rights reserved.
  ** Contact: Nokia Corporation (qt-info@nokia.com)
  **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/orientationsym.h
--- a/qtmobility/plugins/sensors/symbian/orientationsym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/orientationsym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/proximitysensorsym.cpp
--- a/qtmobility/plugins/sensors/symbian/proximitysensorsym.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/proximitysensorsym.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
  **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  ** All rights reserved.
  ** Contact: Nokia Corporation (qt-info@nokia.com)
  **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/proximitysensorsym.h
--- a/qtmobility/plugins/sensors/symbian/proximitysensorsym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/proximitysensorsym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/rotationsensorsym.cpp
--- a/qtmobility/plugins/sensors/symbian/rotationsensorsym.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/rotationsensorsym.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
  **
- ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+ ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  ** All rights reserved.
  ** Contact: Nokia Corporation (qt-info@nokia.com)
  **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/rotationsensorsym.h
--- a/qtmobility/plugins/sensors/symbian/rotationsensorsym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/rotationsensorsym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/sensorbackenddatasym.h
--- a/qtmobility/plugins/sensors/symbian/sensorbackenddatasym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/sensorbackenddatasym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/sensorbackendsym.cpp
--- a/qtmobility/plugins/sensors/symbian/sensorbackendsym.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/sensorbackendsym.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/sensorbackendsym.h
--- a/qtmobility/plugins/sensors/symbian/sensorbackendsym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/sensorbackendsym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/symbian.pro
--- a/qtmobility/plugins/sensors/symbian/symbian.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/symbian.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,16 +1,16 @@
 INCLUDEPATH+=../../../src/sensors
 INCLUDEPATH+=../../sensors \epoc32\include\osextensions
 
-include(version.pri)
-#include(symbian.pri)
-include(../../../common.pri)
-
 PLUGIN_TYPE = sensors
 
 TEMPLATE = lib
 CONFIG += plugin
 TARGET = $$qtLibraryTarget(qtsensors_sym)
 
+include(version.pri)
+#include(symbian.pri)
+include(../../../common.pri)
+
 SOURCES +=  \			
 			sensorbackendsym.cpp \
 			proximitysensorsym.cpp \
@@ -52,16 +52,11 @@
     LIBS += -lsensrvutil   
 }
 symbian: {
-# Load predefined include paths (e.g. QT_PLUGINS_BASE_DIR) to be used in the pro-files
-load(data_caging_paths)
+    # Load predefined include paths (e.g. QT_PLUGINS_BASE_DIR) to be used in the pro-files
+    load(data_caging_paths)
  
-# Defines plugin files into Symbian .pkg package
-pluginDep.sources = qtsensors_sym.dll
-pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
-DEPLOYMENT += pluginDep
+    # Defines plugin files into Symbian .pkg package
+    pluginDep.sources = qtsensors_sym.dll
+    pluginDep.path = $${QT_PLUGINS_BASE_DIR}/$${PLUGIN_TYPE}
+    DEPLOYMENT += pluginDep
 }
-
-target.path=$${QT_MOBILITY_PREFIX}/plugins/$${PLUGIN_TYPE}
-maemo6:target.path=$$[QT_INSTALL_PLUGINS]/$${PLUGIN_TYPE}
-INSTALLS += target
-
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/tapsensorsym.cpp
--- a/qtmobility/plugins/sensors/symbian/tapsensorsym.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/tapsensorsym.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/plugins/sensors/symbian/tapsensorsym.h
--- a/qtmobility/plugins/sensors/symbian/tapsensorsym.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/plugins/sensors/symbian/tapsensorsym.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/qtmobility.pro
--- a/qtmobility/qtmobility.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/qtmobility.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -1,17 +1,4 @@
-
-#This is a temporary workaround for internal Symbian builds
-#QT_MAJOR_VERSION et al are not set
-symbian {
-    isEmpty(QT_MAJOR_VERSION)  {
-         exists($${EPOCROOT}epoc32/data/z/system/install/Series60v5.2.sis) {
-           QT_MAJOR_VERSION=4;
-           QT_MINOR_VERSION=6;
-           QT_PATCH_VERSION=0;
-        }
-    }
-}
-
-# config.pri specifies the configure options
+# config.pri specifies the configure options and is pulled in via staticconfig.pri
 include(staticconfig.pri)
 !include($$QT_MOBILITY_BUILD_TREE/config.pri) {
     error("Please run configure script");
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qcorewlanengine_mac.mm
--- a/qtmobility/src/bearer/qcorewlanengine_mac.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qcorewlanengine_mac.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -43,6 +43,7 @@
 #include "qnetworkconfiguration_p.h"
 
 #include <QtCore/qthread.h>
+#include <QThread>
 #include <QtCore/qmutex.h>
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qstringlist.h>
@@ -105,6 +106,8 @@
     QTM_NAMESPACE::QCoreWlanEngine::instance()->requestUpdate();
 }
 @end
+
+QNSListener *listener = 0;
 #endif
 
 QTM_BEGIN_NAMESPACE
@@ -143,11 +146,6 @@
     return result;
 }
 
-static QString qGetInterfaceType(const QString &interfaceString)
-{
-    return networkInterfaces.value(interfaceString, QLatin1String("Unknown"));
-}
-
 void networkChangeCallback(SCDynamicStoreRef/* store*/, CFArrayRef changedKeys, void *info)
 {
     for ( long i = 0; i < CFArrayGetCount(changedKeys); i++) {
@@ -161,23 +159,314 @@
     return;
 }
 
+QScanThread::QScanThread(QObject *parent)
+    :QThread(parent), interfaceName(nil)
+{
+}
+
+QScanThread::~QScanThread()
+{
+}
+
+void QScanThread::quit()
+{
+    wait();
+}
+
+void QScanThread::run()
+{
+#if defined(MAC_SDK_10_6)
+    getUserProfiles();
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    QStringList found;
+    mutex.lock();
+    CWInterface *currentInterface;
+    if(interfaceName.isEmpty()) {
+        currentInterface = [CWInterface interfaceWithName:nil];
+        interfaceName = nsstringToQString([currentInterface name]);
+    } else {
+        currentInterface = [CWInterface interfaceWithName:qstringToNSString(interfaceName)];
+    }
+    mutex.unlock();
+
+    if([currentInterface power]) {
+        NSError *err = nil;
+        NSDictionary *parametersDict =  [NSDictionary dictionaryWithObjectsAndKeys:
+                                         [NSNumber numberWithBool:YES], kCWScanKeyMerge,
+                                         [NSNumber numberWithInteger:100], kCWScanKeyRestTime, nil];
+
+        NSArray* apArray = [currentInterface scanForNetworksWithParameters:parametersDict error:&err];
+        CWNetwork *apNetwork;
+
+        if (!err) {
+            for(uint row=0; row < [apArray count]; row++ ) {
+                apNetwork = [apArray objectAtIndex:row];
+
+                const QString networkSsid = nsstringToQString([apNetwork ssid]);
+                found.append(networkSsid);
+
+                QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Undefined;
+
+                bool known = isKnownSsid(networkSsid);
+                if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) {
+                    if( networkSsid == nsstringToQString( [currentInterface ssid])) {
+                        state = QNetworkConfiguration::Active;
+                    }
+                }
+                if(state == QNetworkConfiguration::Undefined) {
+                    if(known) {
+                        state = QNetworkConfiguration::Discovered;
+                    } else {
+                        state = QNetworkConfiguration::Undefined;
+                    }
+                }
+
+                QNetworkConfiguration::Purpose purpose = QNetworkConfiguration::UnknownPurpose;
+                if([[apNetwork securityMode] intValue] == kCWSecurityModeOpen) {
+                    purpose = QNetworkConfiguration::PublicPurpose;
+                } else {
+                    purpose = QNetworkConfiguration::PrivatePurpose;
+                }
+
+                found.append(foundNetwork(networkSsid, networkSsid, state, interfaceName, purpose));
+
+            } //end row
+        }//end error
+    }// endwifi power
+
+// add known configurations that are not around.
+    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
+    while (i.hasNext()) {
+        i.next();
+
+        QString networkName = i.key();
+        const QString id = networkName;
+
+        if(!found.contains(id)) {
+            QString networkSsid = getSsidFromNetworkName(networkName);
+            const QString ssidId = QString::number(qHash(QLatin1String("corewlan:") + networkSsid));
+            QNetworkConfiguration::StateFlags state = QNetworkConfiguration::Undefined;
+            QString interfaceName;
+            QMapIterator<QString, QString> ij(i.value());
+            while (ij.hasNext()) {
+                ij.next();
+                interfaceName = ij.value();
+            }
+
+            if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) {
+                if( networkSsid == nsstringToQString([currentInterface ssid])) {
+                    state = QNetworkConfiguration::Active;
+                }
+            }
+            if(state == QNetworkConfiguration::Undefined) {
+                if( userProfiles.contains(networkName)
+                    && found.contains(ssidId)) {
+                    state = QNetworkConfiguration::Discovered;
+                }
+            }
+
+            if(state == QNetworkConfiguration::Undefined) {
+                state = QNetworkConfiguration::Defined;
+            }
+
+            found.append(foundNetwork(id, networkName, state, interfaceName, QNetworkConfiguration::UnknownPurpose));
+        }
+    }
+    emit networksChanged();
+    [pool release];
+#endif
+}
+
+QStringList QScanThread::foundNetwork(const QString &id, const QString &name, const QNetworkConfiguration::StateFlags state, const QString &interfaceName, const QNetworkConfiguration::Purpose purpose)
+{
+    QStringList found;
+    QMutexLocker locker(&mutex);
+    QNetworkConfigurationPrivate *ptr = new QNetworkConfigurationPrivate;
+
+    ptr->name = name;
+    ptr->isValid = true;
+    ptr->id = id;
+    ptr->state = state;
+    ptr->type = QNetworkConfiguration::InternetAccessPoint;
+    ptr->bearer = QLatin1String("WLAN");
+    ptr->purpose = purpose;
+    ptr->internet = true;
+    ptr->serviceInterface = QNetworkInterface::interfaceFromName(interfaceName);
+
+    fetchedConfigurations.append( ptr);
+    configurationInterface[name] =  interfaceName;
+
+    locker.unlock();
+    locker.relock();
+    found.append(id);
+    return found;
+}
+
+QList<QNetworkConfigurationPrivate *> QScanThread::getConfigurations()
+{
+    QMutexLocker locker(&mutex);
+
+    QList<QNetworkConfigurationPrivate *> foundConfigurations;
+
+    for (int i = 0; i < fetchedConfigurations.count(); ++i) {
+        QNetworkConfigurationPrivate *config = new QNetworkConfigurationPrivate;
+        config->name = fetchedConfigurations.at(i)->name;
+        config->isValid = fetchedConfigurations.at(i)->isValid;
+        config->id = fetchedConfigurations.at(i)->id;
+        config->state = fetchedConfigurations.at(i)->state;
+
+        config->type = fetchedConfigurations.at(i)->type;
+        config->roamingSupported = fetchedConfigurations.at(i)->roamingSupported;
+        config->purpose = fetchedConfigurations.at(i)->purpose;
+        config->internet = fetchedConfigurations.at(i)->internet;
+        foundConfigurations.append(config);
+    }
+
+    return foundConfigurations;
+}
+
+void QScanThread::getUserProfiles()
+{
+#if defined(MAC_SDK_10_6)
+    QMutexLocker locker(&mutex);
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    userProfiles.clear();
+
+    NSArray *wifiInterfaces = [CWInterface supportedInterfaces];
+    for(uint row=0; row < [wifiInterfaces count]; row++ ) {
+
+        CWInterface *wifiInterface = [CWInterface interfaceWithName: [wifiInterfaces objectAtIndex:row]];
+        NSString *nsInterfaceName = [wifiInterface name];
+// add user configured system networks
+        SCDynamicStoreRef dynRef = SCDynamicStoreCreate(kCFAllocatorSystemDefault, (CFStringRef)@"Qt corewlan", nil, nil);
+        NSDictionary * airportPlist = (NSDictionary *)SCDynamicStoreCopyValue(dynRef, (CFStringRef)[NSString stringWithFormat:@"Setup:/Network/Interface/%@/AirPort", nsInterfaceName]);
+        CFRelease(dynRef);
+
+        NSDictionary *prefNetDict = [airportPlist objectForKey:@"PreferredNetworks"];
+
+        NSArray *thisSsidarray = [prefNetDict valueForKey:@"SSID_STR"];
+        NSEnumerator *ssidEnumerator = [thisSsidarray objectEnumerator];
+        NSString *ssidkey;
+        while ((ssidkey = [ssidEnumerator nextObject])) {
+            QString thisSsid = nsstringToQString(ssidkey);
+            if(!userProfiles.contains(thisSsid)) {
+                QMap <QString,QString> map;
+                map.insert(thisSsid, nsstringToQString(nsInterfaceName));
+                userProfiles.insert(thisSsid, map);
+            }
+        }
+        CFRelease(airportPlist);
+
+        // 802.1X user profiles
+        QString userProfilePath = QDir::homePath() + "/Library/Preferences/com.apple.eap.profiles.plist";
+        NSDictionary* eapDict = [[[NSDictionary alloc] initWithContentsOfFile:qstringToNSString(userProfilePath)] autorelease];
+        NSString *profileStr= @"Profiles";
+        NSString *nameStr = @"UserDefinedName";
+        NSString *networkSsidStr = @"Wireless Network";
+
+        id profileKey;
+        NSEnumerator *dictEnumerator = [eapDict objectEnumerator];
+        while ((profileKey = [dictEnumerator nextObject])) {
+
+            if ([profileStr isEqualToString:profileKey]) {
+                NSDictionary *itemDict = [eapDict objectForKey:profileKey];
+                id itemKey;
+                NSEnumerator *dictEnumerator = [thisSsidarray objectEnumerator];
+                while ((itemKey = [dictEnumerator nextObject])) {
+
+                    NSInteger dictSize = [itemKey count];
+                    id objects[dictSize];
+                    id keys[dictSize];
+
+                    [itemKey getObjects:objects andKeys:keys];
+                    QString networkName;
+                    QString ssid;
+                    for(int i = 0; i < dictSize; i++) {
+                        if([nameStr isEqualToString:keys[i]]) {
+                            networkName = nsstringToQString(objects[i]);
+                        }
+                        if([networkSsidStr isEqualToString:keys[i]]) {
+                            ssid = nsstringToQString(objects[i]);
+                        }
+                        if(!userProfiles.contains(networkName)
+                            && !ssid.isEmpty()) {
+                            QMap<QString,QString> map;
+                            map.insert(ssid, nsstringToQString(nsInterfaceName));
+                            userProfiles.insert(networkName, map);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    [pool release];
+#endif    
+}
+
+QString QScanThread::getSsidFromNetworkName(const QString &name)
+{
+    QMutexLocker locker(&mutex);
+    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
+    while (i.hasNext()) {
+        i.next();
+        QMap<QString,QString> map = i.value();
+        QMapIterator<QString, QString> ij(i.value());
+         while (ij.hasNext()) {
+             ij.next();
+             const QString networkNameHash = QString::number(qHash(QLatin1String("corewlan:") +i.key()));
+             if(name == i.key() || name == networkNameHash) {
+                 return ij.key();
+             }
+        }
+    }
+    return QString();
+}
+
+QString QScanThread::getNetworkNameFromSsid(const QString &ssid)
+{
+    QMutexLocker locker(&mutex);
+    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
+    while (i.hasNext()) {
+        i.next();
+        QMap<QString,QString> map = i.value();
+        QMapIterator<QString, QString> ij(i.value());
+         while (ij.hasNext()) {
+             ij.next();
+             if(ij.key() == ssid) {
+                 return i.key();
+             }
+         }
+    }
+    return QString();
+}
+
+bool QScanThread::isKnownSsid(const QString &ssid)
+{
+    QMutexLocker locker(&mutex);
+
+    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
+    while (i.hasNext()) {
+        i.next();
+        QMap<QString,QString> map = i.value();
+        if(map.keys().contains(ssid)) {
+            return true;
+        }
+    }
+    return false;
+}
+
+
 QCoreWlanEngine::QCoreWlanEngine(QObject *parent)
 :   QNetworkSessionEngine(parent)
 {
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
     getAllScInterfaces();
-    startNetworkChangeLoop();
-#ifdef MAC_SDK_10_6
-    if([[CWInterface supportedInterfaces] count] > 0 ) {
-        QNSListener *listener;
-        listener = [[QNSListener alloc] init];
-        hasWifi = true;
-    } else {
-        hasWifi = false;
-    }
-#endif
-    getUserConfigurations();
-    requestUpdate();
+    scanThread = new QScanThread(this);
+    connect(scanThread, SIGNAL(networksChanged()),
+            this, SIGNAL(configurationsChanged()));
+
+    QTimer::singleShot(0,this,SLOT(init()));
     [pool release];
 }
 
@@ -191,82 +480,65 @@
     }
 }
 
+void QCoreWlanEngine::init()
+{
+#ifdef MAC_SDK_10_6
+    if([[CWInterface supportedInterfaces] count] > 0 && !listener) {
+        listener = [[QNSListener alloc] init];
+        hasWifi = true;
+    } else {
+        hasWifi = false;
+    }
+#endif
+    storeSession = NULL;
+    scanThread->start();
+
+    startNetworkChangeLoop();
+}
+
+
 QList<QNetworkConfigurationPrivate *> QCoreWlanEngine::getConfigurations(bool *ok)
 {
     if (ok)
         *ok = true;
     foundConfigurations.clear();
 
-    uint identifier;
-    QMapIterator<QString, QString> i(networkInterfaces);
     QNetworkConfigurationPrivate* cpPriv = 0;
-    while (i.hasNext()) {
-        i.next();
-        if (i.value() == "WLAN") {
-            QList<QNetworkConfigurationPrivate *> fetchedConfigurations = scanForSsids(i.key());
-            for (int i = 0; i < fetchedConfigurations.count(); ++i) {
-
-                QNetworkConfigurationPrivate *config = new QNetworkConfigurationPrivate();
-                cpPriv = fetchedConfigurations.at(i);
-                config->name = cpPriv->name;
-                config->isValid = cpPriv->isValid;
-                config->id = cpPriv->id;
+    QMutexLocker locker(&mutex);
+     QList<QNetworkConfigurationPrivate *> fetchedConfigurations = scanThread->getConfigurations();
+locker.unlock();
 
-                config->state = cpPriv->state;
-                config->type = cpPriv->type;
-                config->roamingSupported = cpPriv->roamingSupported;
-                config->purpose = cpPriv->purpose;
-                config->internet = cpPriv->internet;
-                config->serviceInterface = cpPriv->serviceInterface;
-                config->bearer = cpPriv->bearer;
-
-                identifier = config->name.toUInt();
-                configurationInterface[identifier] =  config->serviceInterface.name();
-                foundConfigurations.append(config);
-                delete cpPriv;
-            }
-        }
+     for (int i = 0; i < fetchedConfigurations.count(); ++i) {
 
-        QNetworkInterface interface = QNetworkInterface::interfaceFromName(i.key());
-        QNetworkConfigurationPrivate *cpPriv = new QNetworkConfigurationPrivate();
-        const QString humanReadableName = interface.humanReadableName();
-        cpPriv->name = humanReadableName.isEmpty() ? interface.name() : humanReadableName;
-        cpPriv->isValid = true;
-
-        if (interface.index())
-            identifier = interface.index();
-        else
-            identifier = qHash(interface.hardwareAddress());
-
-        cpPriv->id = QString::number(identifier);
-        cpPriv->type = QNetworkConfiguration::InternetAccessPoint;
-        cpPriv->state = QNetworkConfiguration::Undefined;
+         QNetworkConfigurationPrivate *config = new QNetworkConfigurationPrivate();
+         cpPriv = fetchedConfigurations.at(i);
+         config->name = cpPriv->name;
+         config->isValid = cpPriv->isValid;
+         config->id = cpPriv->id;
+         config->state = cpPriv->state;
+         config->type = cpPriv->type;
+         config->roamingSupported = cpPriv->roamingSupported;
+         config->purpose = cpPriv->purpose;
+         config->internet = cpPriv->internet;
+         config->serviceInterface = cpPriv->serviceInterface;
+         config->bearer = cpPriv->bearer;
 
-        if (interface.flags() & QNetworkInterface::IsRunning) {
-            cpPriv->state = QNetworkConfiguration::Defined;
-            cpPriv->internet = true;
-        }
-        if ( !interface.addressEntries().isEmpty())  {
-            cpPriv->state |= QNetworkConfiguration::Active;
-            cpPriv->internet = true;
-        }
-        configurationInterface[identifier] = interface.name();
-        cpPriv->bearer = interface.name().isEmpty()? QLatin1String("Unknown") : qGetInterfaceType(interface.name());
-        foundConfigurations.append(cpPriv);
-    }
+         foundConfigurations.append(config);
+         delete cpPriv;
+     }
 
-    pollTimer.start();
-    return foundConfigurations;
+
+     return foundConfigurations;
 }
 
 QString QCoreWlanEngine::getInterfaceFromId(const QString &id)
 {
-    return configurationInterface.value(id.toUInt());
+    return scanThread->configurationInterface.value(id);
 }
 
 bool QCoreWlanEngine::hasIdentifier(const QString &id)
 {
-    return configurationInterface.contains(id.toUInt());
+    return scanThread->configurationInterface.contains(id);
 }
 
 void QCoreWlanEngine::connectToId(const QString &id)
@@ -285,13 +557,13 @@
             QString wantedSsid = 0;
             bool using8021X = false;
 
-            if(getNetworkNameFromSsid(id) != id) {
+            if(scanThread->getNetworkNameFromSsid(id) != id) {
                 NSArray *array = [CW8021XProfile allUser8021XProfiles];
                 for (NSUInteger i=0; i<[array count]; ++i) {
 
                     if(id == nsstringToQString([[array objectAtIndex:i] userDefinedName])
                         || id == nsstringToQString([[array objectAtIndex:i] ssid]) ) {
-                        QString thisName = getSsidFromNetworkName(id);
+                        QString thisName = scanThread->getSsidFromNetworkName(id);
                         if(thisName.isEmpty()) {
                             wantedSsid = id;
                         } else {
@@ -306,12 +578,12 @@
 
             if(!using8021X) {
                 QString wantedNetwork;
-                QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
+                QMapIterator<QString, QMap<QString,QString> > i(scanThread->userProfiles);
                 while (i.hasNext()) {
                     i.next();
                     wantedNetwork = i.key();
                     if(id == wantedNetwork) {
-                        wantedSsid = getSsidFromNetworkName(wantedNetwork);
+                        wantedSsid = scanThread->getSsidFromNetworkName(wantedNetwork);
                         break;
                     }
                 }
@@ -319,12 +591,12 @@
 
             NSDictionary *parametersDict = [NSDictionary dictionaryWithObjectsAndKeys:
                                        [NSNumber numberWithBool:YES], kCWScanKeyMerge,
+                                       [NSNumber numberWithInt:kCWScanTypeFast], kCWScanKeyScanType,
                                        [NSNumber numberWithInteger:100], kCWScanKeyRestTime,
                                        qstringToNSString(wantedSsid), kCWScanKeySSID,
                                        nil];
 
-
-            NSArray *scanArray = [NSMutableArray arrayWithArray:[wifiInterface scanForNetworksWithParameters:parametersDict error:&err]];
+            NSArray *scanArray = [wifiInterface scanForNetworksWithParameters:parametersDict error:&err];
             if(!err) {
                 for(uint row=0; row < [scanArray count]; row++ ) {
                     CWNetwork *apNetwork = [scanArray objectAtIndex:row];
@@ -353,11 +625,13 @@
 
                             SecKeychainSearchRef searchRef;
                             OSErr result = SecKeychainSearchCreateFromAttributes(NULL, kSecGenericPasswordItemClass, &attributeList, &searchRef);
-
+Q_UNUSED(result);
                             NSString *password = @"";
                             SecKeychainItemRef searchItem;
+                            OSStatus resultStatus;
+                            resultStatus = SecKeychainSearchCopyNext(searchRef, &searchItem);
 
-                            if (SecKeychainSearchCopyNext(searchRef, &searchItem) == noErr) {
+                            if (resultStatus == errSecSuccess) {
                                 UInt32 realPasswordLength;
                                 SecKeychainAttribute attributesW[8];
                                 attributesW[0].tag = kSecAccountItemAttr;
@@ -380,7 +654,7 @@
                                 CFRelease(searchItem);
                                 SecKeychainItemFreeContent(&listW, realPassword);
                             } else {
-                                qDebug() << "SecKeychainSearchCopyNext error";
+                                qDebug() << "SecKeychainSearchCopyNext error" << cfstringRefToQstring(SecCopyErrorMessageString(resultStatus, NULL));
                             }
                             [params setValue: password forKey: kCWAssocKeyPassphrase];
                         } // end using8021X
@@ -403,6 +677,7 @@
             [autoreleasepool release];
 
         } else {
+            qDebug() << "wifi power off";
             // not wifi
         }
 #endif
@@ -433,8 +708,8 @@
 void QCoreWlanEngine::requestUpdate()
 {
     getAllScInterfaces();
-    getUserConfigurations();
-    emit configurationsChanged();
+    scanThread->getUserProfiles();
+    scanThread->start();
 }
 
 QCoreWlanEngine *QCoreWlanEngine::instance()
@@ -442,148 +717,6 @@
     return coreWlanEngine();
 }
 
-QString QCoreWlanEngine::getSsidFromNetworkName(const QString &name)
-{
-    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
-    while (i.hasNext()) {
-        i.next();
-        QMap<QString,QString> map = i.value();
-        QMapIterator<QString, QString> ij(i.value());
-         while (ij.hasNext()) {
-             ij.next();
-             if(name == i.key()) {
-                 return ij.key();
-             }
-        }
-    }
-    return QString();
-}
-
-QString QCoreWlanEngine::getNetworkNameFromSsid(const QString &ssid)
-{
-    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
-    while (i.hasNext()) {
-        i.next();
-        QMap<QString,QString> map = i.value();
-        QMapIterator<QString, QString> ij(i.value());
-         while (ij.hasNext()) {
-             ij.next();
-             if(ij.key() == ssid) {
-                 return i.key();
-             }
-         }
-    }
-    return QString();
-}
-
-QList<QNetworkConfigurationPrivate *> QCoreWlanEngine::scanForSsids(const QString &interfaceName)
-{
-    QList<QNetworkConfigurationPrivate *> foundConfigs;
-    if(!hasWifi) {
-        return foundConfigs;
-    }
-#if defined(MAC_SDK_10_6)
-    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
-    CWInterface *currentInterface = [CWInterface interfaceWithName:qstringToNSString(interfaceName)];
-    QStringList addedConfigs;
-
-    if([currentInterface power]) {
-        NSError *err = nil;
-        NSDictionary *parametersDict =  [NSDictionary dictionaryWithObjectsAndKeys:
-                                   [NSNumber numberWithBool:YES], kCWScanKeyMerge,
-                                   [NSNumber numberWithInt:kCWScanTypeFast], kCWScanKeyScanType, // get the networks in the scan cache
-                                   [NSNumber numberWithInteger:100], kCWScanKeyRestTime, nil];
-        NSArray* apArray = [currentInterface scanForNetworksWithParameters:parametersDict error:&err];
-        CWNetwork *apNetwork;
-        if(!err) {
-            for(uint row=0; row < [apArray count]; row++ ) {
-                apNetwork = [apArray objectAtIndex:row];
-
-                QString networkSsid = nsstringToQString([apNetwork ssid]);
-
-                QNetworkConfigurationPrivate* cpPriv = new QNetworkConfigurationPrivate();
-                cpPriv->name = networkSsid;
-                cpPriv->isValid = true;
-                cpPriv->id = networkSsid;
-                cpPriv->internet = true;
-                cpPriv->bearer = QLatin1String("WLAN");
-                cpPriv->type = QNetworkConfiguration::InternetAccessPoint;
-                cpPriv->serviceInterface = QNetworkInterface::interfaceFromName(interfaceName);
-                bool known = isKnownSsid(networkSsid);
-                if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) {
-                    if( cpPriv->name == nsstringToQString( [currentInterface ssid])) {
-                        cpPriv->state |=  QNetworkConfiguration::Active;
-                    }
-                }
-
-                if(!cpPriv->state) {
-                    if(known) {
-                        cpPriv->state =  QNetworkConfiguration::Discovered;
-                    } else {
-                        cpPriv->state = QNetworkConfiguration::Undefined;
-                    }
-                }
-                if([[apNetwork securityMode ] intValue]== kCWSecurityModeOpen)
-                    cpPriv->purpose = QNetworkConfiguration::PublicPurpose;
-                else
-                    cpPriv->purpose = QNetworkConfiguration::PrivatePurpose;
-
-                foundConfigs.append(cpPriv);
-                addedConfigs << networkSsid;
-
-            } //end scanned row
-        }
-    } //end power
-
-
-    // add known configurations that are not around.
-    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
-    while (i.hasNext()) {
-        i.next();
-        QString networkName = i.key();
-
-        if(!addedConfigs.contains(networkName)) {
-            QString interfaceName;
-            QMapIterator<QString, QString> ij(i.value());
-             while (ij.hasNext()) {
-                 ij.next();
-                 interfaceName = ij.value();
-             }
-
-            QNetworkConfigurationPrivate* cpPriv = new QNetworkConfigurationPrivate();
-            cpPriv->name = networkName;
-            cpPriv->isValid = true;
-            cpPriv->id = networkName;
-            cpPriv->internet = true;
-            cpPriv->bearer = QLatin1String("WLAN");
-            cpPriv->type = QNetworkConfiguration::InternetAccessPoint;
-            cpPriv->serviceInterface = QNetworkInterface::interfaceFromName(interfaceName);
-            QString ssid = getSsidFromNetworkName(networkName);
-            if( [currentInterface.interfaceState intValue] == kCWInterfaceStateRunning) {
-                if( ssid == nsstringToQString( [currentInterface ssid])) {
-                    cpPriv->state |=  QNetworkConfiguration::Active;
-                }
-            }
-
-            if( addedConfigs.contains(ssid)) {
-                cpPriv->state |=  QNetworkConfiguration::Discovered;
-            }
-
-            if(!cpPriv->state) {
-                cpPriv->state =  QNetworkConfiguration::Defined;
-            }
-
-            foundConfigs.append(cpPriv);
-        }
-    }
-
-    [autoreleasepool drain];
-#else
-    Q_UNUSED(interfaceName);
-#endif
-    return foundConfigs;
-}
-
 bool QCoreWlanEngine::isWifiReady(const QString &wifiDeviceName)
 {
 #if defined(MAC_SDK_10_6)
@@ -598,23 +731,6 @@
     return false;
 }
 
-bool QCoreWlanEngine::isKnownSsid( const QString &ssid)
-{
-#if defined(MAC_SDK_10_6)
-    QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
-    while (i.hasNext()) {
-        i.next();
-        QMap<QString,QString> map = i.value();
-        if(map.keys().contains(ssid)) {
-            return true;
-        }
-    }
-#else
-    Q_UNUSED(ssid);
-#endif
-    return false;
-}
-
 bool QCoreWlanEngine::getAllScInterfaces()
 {
     networkInterfaces.clear();
@@ -665,7 +781,7 @@
                                  networkChangeCallback,
                                  &dynStoreContext);
     if (!storeSession ) {
-        qWarning() << "could not open dynamic store: error:" << SCErrorString(SCError());
+        qDebug() << "could not open dynamic store: error:" << SCErrorString(SCError());
         return;
     }
 
@@ -689,7 +805,7 @@
     CFRelease(storeKey);
 
     if (!SCDynamicStoreSetNotificationKeys(storeSession , notificationKeys, patternsArray)) {
-        qWarning() << "register notification error:"<< SCErrorString(SCError());
+        qDebug() << "register notification error:"<< SCErrorString(SCError());
         CFRelease(storeSession );
         CFRelease(notificationKeys);
         CFRelease(patternsArray);
@@ -700,7 +816,7 @@
 
     runloopSource = SCDynamicStoreCreateRunLoopSource(NULL, storeSession , 0);
     if (!runloopSource) {
-        qWarning() << "runloop source error:"<< SCErrorString(SCError());
+        qDebug() << "runloop source error:"<< SCErrorString(SCError());
         CFRelease(storeSession );
         return;
     }
@@ -708,79 +824,6 @@
     CFRunLoopAddSource(CFRunLoopGetCurrent(), runloopSource, kCFRunLoopDefaultMode);
     return;
 }
-
-void QCoreWlanEngine::getUserConfigurations()
-{
-#ifdef MAC_SDK_10_6
-    NSAutoreleasePool *autoreleasepool = [[NSAutoreleasePool alloc] init];
-    userProfiles.clear();
-
-    NSArray *wifiInterfaces = [CWInterface supportedInterfaces];
-    for(uint row=0; row < [wifiInterfaces count]; row++ ) {
-
-        CWInterface *wifiInterface = [CWInterface interfaceWithName: [wifiInterfaces objectAtIndex:row]];
-        NSString *nsInterfaceName = [wifiInterface name];
-// add user configured system networks
-        SCDynamicStoreRef dynRef = SCDynamicStoreCreate(kCFAllocatorSystemDefault, (CFStringRef)@"Qt corewlan", nil, nil);
-        NSDictionary *airportPlist = (NSDictionary *)SCDynamicStoreCopyValue(dynRef, (CFStringRef)[[NSString stringWithFormat:@"Setup:/Network/Interface/%@/AirPort", nsInterfaceName] autorelease]);
-        CFRelease(dynRef);
-
-        NSDictionary *prefNetDict = [airportPlist objectForKey:@"PreferredNetworks"];
-
-        NSArray *thisSsidarray = [prefNetDict valueForKey:@"SSID_STR"];
-        for(NSString *ssidkey in thisSsidarray) {
-            QString thisSsid = nsstringToQString(ssidkey);
-            if(!userProfiles.contains(thisSsid)) {
-                QMap <QString,QString> map;
-                map.insert(thisSsid, nsstringToQString(nsInterfaceName));
-                userProfiles.insert(thisSsid, map);
-            }
-        }
-        CFRelease(airportPlist);
-
-        // 802.1X user profiles
-        QString userProfilePath = QDir::homePath() + "/Library/Preferences/com.apple.eap.profiles.plist";
-        NSDictionary* eapDict = [[NSDictionary alloc] initWithContentsOfFile:qstringToNSString(userProfilePath)];
-        NSString *profileStr= @"Profiles";
-        NSString *nameStr = @"UserDefinedName";
-        NSString *networkSsidStr = @"Wireless Network";
-        for (id profileKey in eapDict) {
-            if ([profileStr isEqualToString:profileKey]) {
-                NSDictionary *itemDict = [eapDict objectForKey:profileKey];
-                for (id itemKey in itemDict) {
-
-                    NSInteger dictSize = [itemKey count];
-                    id objects[dictSize];
-                    id keys[dictSize];
-
-                    [itemKey getObjects:objects andKeys:keys];
-                    QString networkName;
-                    QString ssid;
-                    for(int i = 0; i < dictSize; i++) {
-                        if([nameStr isEqualToString:keys[i]]) {
-                            networkName = nsstringToQString(objects[i]);
-                        }
-                        if([networkSsidStr isEqualToString:keys[i]]) {
-                            ssid = nsstringToQString(objects[i]);
-                        }
-                        if(!userProfiles.contains(networkName)
-                            && !ssid.isEmpty()) {
-                            QMap<QString,QString> map;
-                            map.insert(ssid, nsstringToQString(nsInterfaceName));
-                            userProfiles.insert(networkName, map);
-                        }
-                    }
-                }
-                [itemDict release];
-            }
-        }
-        [eapDict release];
-    }
-    [autoreleasepool release];
-#endif
-
-}
-
 #include "moc_qcorewlanengine_mac_p.cpp"
 
 QTM_END_NAMESPACE
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qcorewlanengine_mac_p.h
--- a/qtmobility/src/bearer/qcorewlanengine_mac_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qcorewlanengine_mac_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -54,17 +54,23 @@
 //
 
 #include "qnetworksessionengine_p.h"
+#include "qnetworkconfiguration.h"
+
 #include <QMap>
 #include <QTimer>
 #include <SystemConfiguration/SystemConfiguration.h>
+#include <QThread>
+#include <QMutex>
 
 QTM_BEGIN_NAMESPACE
 
 class QNetworkConfigurationPrivate;
+class QScanThread;
 
 class QCoreWlanEngine : public QNetworkSessionEngine
 {
     Q_OBJECT
+    friend class QScanThread;
 
 public:
     QCoreWlanEngine(QObject *parent = 0);
@@ -82,30 +88,62 @@
     void requestUpdate();
 
     static QCoreWlanEngine *instance();
-    static bool getAllScInterfaces();
+    QString interfaceName;
 
 private:
     bool isWifiReady(const QString &dev);
-    QMap<uint, QString> configurationInterface;
     QTimer pollTimer;
-    QList<QNetworkConfigurationPrivate *> scanForSsids(const QString &interfaceName);
-
-    bool isKnownSsid(const QString &ssid);
     QList<QNetworkConfigurationPrivate *> foundConfigurations;
 
     SCDynamicStoreRef storeSession;
     CFRunLoopSourceRef runloopSource;
     bool hasWifi;
+    QScanThread *scanThread;
+    QMutex mutex;
+    static bool getAllScInterfaces();
+
+private Q_SLOTS:
+    void init();
 
 protected:
-   QMap<QString, QMap<QString,QString> > userProfiles;
+    void startNetworkChangeLoop();
+};
+
+class QScanThread : public QThread
+{
+    Q_OBJECT
 
-    void startNetworkChangeLoop();
-    void getUserConfigurations();
+public:
+    QScanThread(QObject *parent = 0);
+    ~QScanThread();
+
+    void quit();
+    QList<QNetworkConfigurationPrivate *> getConfigurations();
+    QString interfaceName;
+    QMap<QString, QString> configurationInterface;
+    void getUserProfiles();
     QString getNetworkNameFromSsid(const QString &ssid);
     QString getSsidFromNetworkName(const QString &name);
+    bool isKnownSsid(const QString &ssid);
+    QMap<QString, QMap<QString,QString> > userProfiles;
+
+signals:
+    void networksChanged();
+
+protected:
+    void run();
+
+private:
+    QList<QNetworkConfigurationPrivate *> fetchedConfigurations;
+    QMutex mutex;
+    QStringList foundNetwork(const QString &id, const QString &ssid,
+                             const QNetworkConfiguration::StateFlags state,
+                             const QString &interfaceName,
+                             const QNetworkConfiguration::Purpose purpose);
+
 };
 
+
 QTM_END_NAMESPACE
 
 #endif
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qgenericengine.cpp
--- a/qtmobility/src/bearer/qgenericengine.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qgenericengine.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qgenericengine_p.h
--- a/qtmobility/src/bearer/qgenericengine_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qgenericengine_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnativewifiengine_win.cpp
--- a/qtmobility/src/bearer/qnativewifiengine_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnativewifiengine_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnativewifiengine_win_p.h
--- a/qtmobility/src/bearer/qnativewifiengine_win_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnativewifiengine_win_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfigmanager_p.cpp
--- a/qtmobility/src/bearer/qnetworkconfigmanager_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfigmanager_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfigmanager_p.h
--- a/qtmobility/src/bearer/qnetworkconfigmanager_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfigmanager_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfigmanager_s60_p.cpp
--- a/qtmobility/src/bearer/qnetworkconfigmanager_s60_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfigmanager_s60_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -44,14 +44,14 @@
 #include <commdb.h>
 #include <cdbcols.h>
 #include <d32dbms.h>
+#include <nifvar.h>
 #include <QEventLoop>
 #include <QTimer>
 #include <QTime>  // For randgen seeding
 #include <QtCore> // For randgen seeding
 
-// #define QT_BEARERMGMT_CONFIGMGR_DEBUG
 
-#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
 #include <QDebug>
 #endif
 
@@ -70,7 +70,9 @@
 
 QTM_BEGIN_NAMESPACE
 
-static const int KValueThatWillBeAddedToSNAPId = 1000;
+#ifdef SNAP_FUNCTIONALITY_AVAILABLE
+    static const int KValueThatWillBeAddedToSNAPId = 1000;
+#endif
 static const int KUserChoiceIAPId = 0;
 
 QNetworkConfigurationManagerPrivate::QNetworkConfigurationManagerPrivate()
@@ -607,10 +609,14 @@
     iConnectionMonitor.GetConnectionCount(connectionCount, status);
     User::WaitForRequest(status);
     
-    // Go through all connections and set state of related IAPs to Active
+    // Go through all connections and set state of related IAPs to Active.
+    // Status needs to be checked carefully, because ConnMon lists also e.g.
+    // WLAN connections that are being currently tried --> we don't want to
+    // state these as active.
     TUint connectionId;
     TUint subConnectionCount;
     TUint apId;
+    TInt connectionStatus;
     if (status.Int() == KErrNone) {
         for (TUint i = 1; i <= connectionCount; i++) {
             iConnectionMonitor.GetConnectionInfo(i, connectionId, subConnectionCount);
@@ -619,11 +625,15 @@
             QString ident = QString::number(qHash(apId));
             QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident);
             if (priv.data()) {
-                online = true;
-                inactiveConfigs.removeOne(ident);
-                priv.data()->connectionId = connectionId;
-                // Configuration is Active
-                changeConfigurationStateTo(priv, QNetworkConfiguration::Active);
+                iConnectionMonitor.GetIntAttribute(connectionId, subConnectionCount, KConnectionStatus, connectionStatus, status);
+                User::WaitForRequest(status);          
+                if (connectionStatus == KLinkLayerOpen) {
+                    online = true;
+                    inactiveConfigs.removeOne(ident);
+                    priv.data()->connectionId = connectionId;
+                    // Configuration is Active
+                    changeConfigurationStateTo(priv, QNetworkConfiguration::Active);
+                }
             }
         }
     }
@@ -674,12 +684,12 @@
             }
         }
         
-        // Make sure that state of rest of the IAPs won't be Discovered or Active
+        // Make sure that state of rest of the IAPs won't be Active
         foreach (const QString &iface, unavailableConfigs) {
             QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(iface);
             if (priv.data()) {
                 // Configuration is Defined
-                changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Defined);
+                changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Discovered);
             }
         }
     }
@@ -808,20 +818,21 @@
 void QNetworkConfigurationManagerPrivate::RunL()
 {
     if (iIgnoringUpdates) {
-#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG
-        qDebug("CommsDB event handling postponed (postpone-timer running because IAPs/SNAPs were updated very recently).");
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug("QNCM CommsDB event handling postponed (postpone-timer running because IAPs/SNAPs were updated very recently).");
 #endif
         return;
     }
     if (iStatus != KErrCancel) {
         RDbNotifier::TEvent event = STATIC_CAST(RDbNotifier::TEvent, iStatus.Int());
+
         switch (event) {
         case RDbNotifier::EUnlock:   /** All read locks have been removed.  */
         case RDbNotifier::ECommit:   /** A transaction has been committed.  */ 
         case RDbNotifier::ERollback: /** A transaction has been rolled back */
         case RDbNotifier::ERecover:  /** The database has been recovered    */
-#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG
-            qDebug("CommsDB event (of type RDbNotifier::TEvent) received: %d", iStatus.Int());
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+            qDebug("QNCM CommsDB event (of type RDbNotifier::TEvent) received: %d", iStatus.Int());
 #endif
             iIgnoringUpdates = true;
             // Other events than ECommit get lower priority. In practice with those events,
@@ -867,64 +878,87 @@
     ipCommsDB->CancelRequestNotification();
 }
 
-
 void QNetworkConfigurationManagerPrivate::EventL(const CConnMonEventBase& aEvent)
 {
     switch (aEvent.EventType()) {
-    case EConnMonCreateConnection:
+    case EConnMonConnectionStatusChange:
         {
-        CConnMonCreateConnection* realEvent;
-        realEvent = (CConnMonCreateConnection*) &aEvent;
-        TUint subConnectionCount = 0;
-        TUint apId;            
-        TUint connectionId = realEvent->ConnectionId();
-        TRequestStatus status;
-        iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
-        User::WaitForRequest(status);
-        QString ident = QString::number(qHash(apId));
-        QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident);
-        if (priv.data()) {
-            priv.data()->connectionId = connectionId;
-            // Configuration is Active
-            if (changeConfigurationStateTo(priv, QNetworkConfiguration::Active)) {
-                updateStatesToSnaps();
+        CConnMonConnectionStatusChange* realEvent;
+        realEvent = (CConnMonConnectionStatusChange*) &aEvent;
+        TInt connectionStatus = realEvent->ConnectionStatus();
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNCM Connection status : " << QString::number(connectionStatus) << " , connection monitor Id : " << realEvent->ConnectionId();
+#endif
+        if (connectionStatus == KConfigDaemonStartingRegistration) {
+            TUint connectionId = realEvent->ConnectionId();
+            TUint subConnectionCount = 0;
+            TUint apId;            
+            TRequestStatus status;
+            iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
+            User::WaitForRequest(status);
+            QString ident = QString::number(qHash(apId));
+            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident);
+            if (priv.data()) {
+                priv.data()->connectionId = connectionId;
+                emit this->configurationStateChanged(priv.data()->numericId, connectionId, QNetworkSession::Connecting);
             }
-            if (!iOnline) {
-                iOnline = true;
+        } else if (connectionStatus == KLinkLayerOpen) {
+            // Connection has been successfully opened
+            TUint connectionId = realEvent->ConnectionId();
+            TUint subConnectionCount = 0;
+            TUint apId;            
+            TRequestStatus status;
+            iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
+            User::WaitForRequest(status);
+            QString ident = QString::number(qHash(apId));
+            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident);
+            if (priv.data()) {
+                priv.data()->connectionId = connectionId;
+                // Configuration is Active
+                if (changeConfigurationStateTo(priv, QNetworkConfiguration::Active)) {
+                    updateStatesToSnaps();
+                }
+                emit this->configurationStateChanged(priv.data()->numericId, connectionId, QNetworkSession::Connected);
+                if (!iOnline) {
+                    iOnline = true;
+                    emit this->onlineStateChanged(iOnline);
+                }
+            }
+        } else if (connectionStatus == KConfigDaemonStartingDeregistration) {
+            TUint connectionId = realEvent->ConnectionId();
+            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = dataByConnectionId(connectionId);
+            if (priv.data()) {
+                emit this->configurationStateChanged(priv.data()->numericId, connectionId, QNetworkSession::Closing);
+            }
+        } else if (connectionStatus == KLinkLayerClosed ||
+                   connectionStatus == KConnectionClosed) {
+            // Connection has been closed. Which of the above events is reported, depends on the Symbian
+            // platform.
+            TUint connectionId = realEvent->ConnectionId();
+            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = dataByConnectionId(connectionId);
+            if (priv.data()) {
+                // Configuration is either Defined or Discovered
+                if (changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Discovered)) {
+                    updateStatesToSnaps();
+                }
+                emit this->configurationStateChanged(priv.data()->numericId, connectionId, QNetworkSession::Disconnected);
+            }
+            
+            bool online = false;
+            foreach (const QString &iface, accessPointConfigurations.keys()) {
+                QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(iface);
+                if (priv.data()->state == QNetworkConfiguration::Active) {
+                    online = true;
+                    break;
+                }
+            }
+            if (iOnline != online) {
+                iOnline = online;
                 emit this->onlineStateChanged(iOnline);
             }
         }
         }
-        break;
-
-    case EConnMonDeleteConnection:
-        {
-        CConnMonDeleteConnection* realEvent;
-        realEvent = (CConnMonDeleteConnection*) &aEvent;
-        TUint connectionId = realEvent->ConnectionId();
-        QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = dataByConnectionId(connectionId);
-        if (priv.data()) {
-            priv.data()->connectionId = 0;
-            // Configuration is either Defined or Discovered
-            if (changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Discovered)) {
-                updateStatesToSnaps();
-            }
-        }
-        
-        bool online = false;
-        foreach (const QString &iface, accessPointConfigurations.keys()) {
-            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(iface);
-            if (priv.data()->state == QNetworkConfiguration::Active) {
-                online = true;
-                break;
-            }
-        }
-        if (iOnline != online) {
-            iOnline = online;
-            emit this->onlineStateChanged(iOnline);
-        }
-        }
-        break;
+        break;    
 
     case EConnMonIapAvailabilityChange:
         {
@@ -951,21 +985,74 @@
         }
         break;
 
+    case EConnMonCreateConnection:
+        {
+        // This event is caught to keep connection monitor IDs up-to-date.
+        CConnMonCreateConnection* realEvent;
+        realEvent = (CConnMonCreateConnection*) &aEvent;
+        TUint subConnectionCount = 0;
+        TUint apId;
+        TUint connectionId = realEvent->ConnectionId();
+        TRequestStatus status;
+        iConnectionMonitor.GetUintAttribute(connectionId, subConnectionCount, KIAPId, apId, status);
+        User::WaitForRequest(status);
+        QString ident = QString::number(qHash(apId));
+        QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident);
+        if (priv.data()) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+            qDebug() << "QNCM updating connection monitor ID : from, to, whose: " << priv.data()->connectionId << connectionId << priv->name;
+#endif
+            priv.data()->connectionId = connectionId;
+        }
+        }
+        break;
     default:
         // For unrecognized events
         break;
     }
 }
 
-// Waits for 1..4 seconds.
+// Sessions may use this function to report configuration state changes,
+// because on some Symbian platforms (especially Symbian^3) all state changes are not
+// reported by the RConnectionMonitor, in particular in relation to stop() call,
+// whereas they _are_ reported on RConnection progress notifier used by sessions --> centralize
+// this data here so that other sessions may benefit from it too (not all sessions necessarily have
+// RConnection progress notifiers available but they relay on having e.g. disconnected information from
+// manager). Currently only 'Disconnected' state is of interest because it has proven to be troublesome.
+void QNetworkConfigurationManagerPrivate::configurationStateChangeReport(TUint32 accessPointId, QNetworkSession::State newState)
+{
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNCM A session reported state change for IAP ID: " << accessPointId << " whose new state is: " << newState;
+#endif
+    switch (newState) {
+    case QNetworkSession::Disconnected:
+        {
+            QString ident = QString::number(qHash(accessPointId));
+            QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> priv = accessPointConfigurations.value(ident);
+            if (priv.data()) {
+                // Configuration is either Defined or Discovered
+                if (changeConfigurationStateAtMaxTo(priv, QNetworkConfiguration::Discovered)) {
+                    updateStatesToSnaps();
+                }
+                emit this->configurationStateChanged(
+                        priv.data()->numericId, priv.data()->connectionId, QNetworkSession::Disconnected);
+            }
+        }
+        break;
+    default:
+        break;
+    }
+}
+
+// Waits for 2..6 seconds.
 void QNetworkConfigurationManagerPrivate::waitRandomTime()
 {
-    iTimeToWait = (qAbs(qrand()) % 5) * 1000;
-    if (iTimeToWait < 1000) {
-        iTimeToWait = 1000;
+    iTimeToWait = (qAbs(qrand()) % 7) * 1000;
+    if (iTimeToWait < 2000) {
+        iTimeToWait = 2000;
     }
-#ifdef QT_BEARERMGMT_CONFIGMGR_DEBUG
-    qDebug("QNetworkConfigurationManager waiting random time: %d ms", iTimeToWait);
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug("QNCM waiting random time: %d ms", iTimeToWait);
 #endif
     QTimer::singleShot(iTimeToWait, iIgnoreEventLoop, SLOT(quit()));
     iIgnoreEventLoop->exec();
@@ -974,7 +1061,6 @@
 QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> QNetworkConfigurationManagerPrivate::dataByConnectionId(TUint aConnectionId)
 {
     QNetworkConfiguration item;
-    
     QHash<QString, QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> >::const_iterator i =
             accessPointConfigurations.constBegin();
     while (i != accessPointConfigurations.constEnd()) {
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfigmanager_s60_p.h
--- a/qtmobility/src/bearer/qnetworkconfigmanager_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfigmanager_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -55,6 +55,7 @@
 
 #include <qnetworkconfigmanager.h>
 #include <qnetworkconfiguration_s60_p.h>
+#include <qnetworksession.h>
 
 #include <QHash>
 #include <rconnmon.h>
@@ -62,6 +63,9 @@
     #include <cmmanager.h>
 #endif
 
+// Uncomment and compile QtBearer to gain detailed state tracing
+// #define QT_BEARERMGMT_SYMBIAN_DEBUG
+
 class CCommsDatabase;
 class QEventLoop;
 
@@ -92,6 +96,9 @@
     void configurationChanged(const QNetworkConfiguration& config);
     void onlineStateChanged(bool isOnline);
     
+    void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId,
+                                   QNetworkSession::State newState);
+    
 public Q_SLOTS:
     void updateConfigurations();
 
@@ -126,12 +133,17 @@
     void startMonitoringIAPData(TUint32 aIapId);
     QExplicitlySharedDataPointer<QNetworkConfigurationPrivate> dataByConnectionId(TUint aConnectionId);
 
-protected: // From CActive
+protected:
+    // From CActive
     void RunL();
     void DoCancel();
     
-private: // MConnectionMonitorObserver
+private:
+    // MConnectionMonitorObserver
     void EventL(const CConnMonEventBase& aEvent);
+    // For QNetworkSessionPrivate to indicate about state changes
+    void configurationStateChangeReport(TUint32 accessPointId,
+                                   QNetworkSession::State newState);
 
 public: // Data
     //this table contains an up to date list of all configs at any time.
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfiguration.cpp
--- a/qtmobility/src/bearer/qnetworkconfiguration.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfiguration.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfiguration.h
--- a/qtmobility/src/bearer/qnetworkconfiguration.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfiguration.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfiguration_maemo_p.h
--- a/qtmobility/src/bearer/qnetworkconfiguration_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfiguration_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfiguration_p.h
--- a/qtmobility/src/bearer/qnetworkconfiguration_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfiguration_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfiguration_s60_p.cpp
--- a/qtmobility/src/bearer/qnetworkconfiguration_s60_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfiguration_s60_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkconfiguration_s60_p.h
--- a/qtmobility/src/bearer/qnetworkconfiguration_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkconfiguration_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -88,7 +88,18 @@
 
     QNetworkConfigurationPrivate::Bearer bearer;
     QString bearerName() const;
+    // So called IAP id from the platform. Remains constant as long as the
+    // platform is aware of the configuration ie. it is stored in the databases
+    // --> does not depend on whether connections are currently open or not.
+    // In practice is the same for the lifetime of the QNetworkConfiguration.
     TUint32 numericId;
+    // So called connection id, or connection monitor ID. A dynamic ID assigned
+    // by RConnectionMonitor whenever a new connection is opened. ConnectionID and
+    // numericId/IAP id have 1-to-1 mapping during the lifetime of the connection at
+    // connection monitor. Notably however it changes whenever a new connection to
+    // a given IAP is created. In a sense it is constant during the time the
+    // configuration remains between states Discovered..Active..Discovered, do not
+    // however relay on this.
     TUint connectionId;
     
     TAny* manager;
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkmanagerservice_p.cpp
--- a/qtmobility/src/bearer/qnetworkmanagerservice_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkmanagerservice_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworkmanagerservice_p.h
--- a/qtmobility/src/bearer/qnetworkmanagerservice_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworkmanagerservice_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksession.cpp
--- a/qtmobility/src/bearer/qnetworksession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksession.h
--- a/qtmobility/src/bearer/qnetworksession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksession_maemo.cpp
--- a/qtmobility/src/bearer/qnetworksession_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksession_maemo_p.h
--- a/qtmobility/src/bearer/qnetworksession_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksession_p.cpp
--- a/qtmobility/src/bearer/qnetworksession_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksession_p.h
--- a/qtmobility/src/bearer/qnetworksession_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksession_s60_p.cpp
--- a/qtmobility/src/bearer/qnetworksession_s60_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession_s60_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -52,15 +52,17 @@
 QTM_BEGIN_NAMESPACE
 
 QNetworkSessionPrivate::QNetworkSessionPrivate()
-    : CActive(CActive::EPriorityStandard), state(QNetworkSession::Invalid),
-      isOpen(false), ipConnectionNotifier(0), iError(QNetworkSession::UnknownSessionError),
-      iALREnabled(0), iConnectInBackground(false)
+    : CActive(CActive::EPriorityUserInput), state(QNetworkSession::Invalid),
+      isOpen(false), ipConnectionNotifier(0), iHandleStateNotificationsFromManager(false),
+      iFirstSync(true), iStoppedByUser(false), iClosedByUser(false), iDeprecatedConnectionId(0),
+      iError(QNetworkSession::UnknownSessionError), iALREnabled(0), iConnectInBackground(false)
 {
     CActiveScheduler::Add(this);
 
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
     iMobility = NULL;
 #endif
+
     TRAP_IGNORE(iConnectionMonitor.ConnectL());
 }
 
@@ -89,9 +91,43 @@
     
     // Close global 'Open C' RConnection
     setdefaultif(0);
+    
+    iConnectionMonitor.Close();
+}
 
-    iConnectionMonitor.CancelNotifications();
-    iConnectionMonitor.Close();
+void QNetworkSessionPrivate::configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState)
+{
+    if (iHandleStateNotificationsFromManager) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+                << "configurationStateChanged from manager for IAP : " << QString::number(accessPointId)
+                << "configurationStateChanged connMon ID : " << QString::number(connMonId)
+                << " : to a state: " << newState
+                << " whereas my current state is: " << state;
+#endif
+        if (connMonId == iDeprecatedConnectionId) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+            qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+                    << "however status update from manager ignored because it related to already closed connection.";
+#endif
+            return;
+        }
+        this->newState(newState, accessPointId);
+    }
+}
+
+void QNetworkSessionPrivate::configurationRemoved(const QNetworkConfiguration& config)
+{
+    if (!publicConfig.d.data()) {
+        return;
+    }
+    if (config.d.data()->numericId == publicConfig.d.data()->numericId) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+                 << "configurationRemoved IAP: " << QString::number(publicConfig.d.data()->numericId) << " : going to State: Invalid";
+#endif
+        this->newState(QNetworkSession::Invalid, publicConfig.d.data()->numericId);
+    }
 }
 
 void QNetworkSessionPrivate::syncStateWithInterface()
@@ -100,8 +136,17 @@
         return;
     }
 
-    // Start monitoring changes in IAP states
-    TRAP_IGNORE(iConnectionMonitor.NotifyEventL(*this));
+    if (iFirstSync && publicConfig.d.data()) {
+        QObject::connect(((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager), SIGNAL(configurationStateChanged(TUint32, TUint32, QNetworkSession::State)),
+                         this, SLOT(configurationStateChanged(TUint32, TUint32, QNetworkSession::State)));
+        // Listen to configuration removals, so that in case the configuration
+        // this session is based on is removed, session knows to enter Invalid -state.
+        QObject::connect(((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager),
+                         SIGNAL(configurationRemoved(QNetworkConfiguration)),
+                         this, SLOT(configurationRemoved(QNetworkConfiguration)));
+    }
+    // Start listening IAP state changes from QNetworkConfigurationManagerPrivate
+    iHandleStateNotificationsFromManager = true;    
 
     // Check open connections to see if there is already
     // an open connection to selected IAP or SNAP
@@ -137,11 +182,7 @@
     }
 
     if (state != QNetworkSession::Connected) {
-        // There were no open connections to used IAP or SNAP
-        if (iError == QNetworkSession::InvalidConfigurationError) {
-            newState(QNetworkSession::Invalid);
-        }
-        else if ((publicConfig.d.data()->state & QNetworkConfiguration::Discovered) ==
+        if ((publicConfig.d.data()->state & QNetworkConfiguration::Discovered) ==
             QNetworkConfiguration::Discovered) {
             newState(QNetworkSession::Disconnected);
         } else {
@@ -242,13 +283,18 @@
 
 void QNetworkSessionPrivate::open()
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+                << "open() called, session state is: " << state << " and isOpen is: "
+                << isOpen;
+#endif
     if (isOpen || (state == QNetworkSession::Connecting)) {
         return;
     }
-
-    // Cancel notifications from RConnectionMonitor
+    
+    // Stop handling IAP state change signals from QNetworkConfigurationManagerPrivate
     // => RConnection::ProgressNotification will be used for IAP/SNAP monitoring
-    iConnectionMonitor.CancelNotifications();
+    iHandleStateNotificationsFromManager = false;
 
     // Configuration may have been invalidated after session creation by platform
     // (e.g. configuration has been deleted).
@@ -256,19 +302,25 @@
         newState(QNetworkSession::Invalid);
         iError = QNetworkSession::InvalidConfigurationError;
         emit q->error(iError);
-        syncStateWithInterface();
         return;
     }
-    // If opening a (un)defined configuration, session emits error and enters
-    // NotAvailable -state.
-    if (publicConfig.state() == QNetworkConfiguration::Undefined ||
-        publicConfig.state() == QNetworkConfiguration::Defined) {
+    // If opening a undefined configuration, session emits error and enters
+    // NotAvailable -state. Note that we will try ones in 'defined' state to avoid excessive
+    // need for WLAN scans (via updateConfigurations()), because user may have walked
+    // into a WLAN range, but periodic background scan has not occurred yet -->
+    // we don't want to force application to make frequent updateConfigurations() calls
+    // to be able to try if e.g. home WLAN is available.
+    if (publicConfig.state() == QNetworkConfiguration::Undefined) {
         newState(QNetworkSession::NotAvailable);
         iError = QNetworkSession::InvalidConfigurationError;
         emit q->error(iError);
         return;
     }
-    
+    // Clear possible previous states
+    iStoppedByUser = false;
+    iClosedByUser = false;
+    iDeprecatedConnectionId = 0;
+
     TInt error = iSocketServ.Connect();
     if (error != KErrNone) {
         // Could not open RSocketServ
@@ -420,9 +472,18 @@
 
 void QNetworkSessionPrivate::close(bool allowSignals)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "close() called, session state is: " << state << " and isOpen is : "
+            << isOpen;
+#endif
     if (!isOpen) {
         return;
     }
+    // Mark this session as closed-by-user so that we are able to report
+    // distinguish between stop() and close() state transitions
+    // when reporting.
+    iClosedByUser = true;
 
     TUint activeIap = activeConfig.d.data()->numericId;
     isOpen = false;
@@ -437,8 +498,10 @@
     }
 #endif
 
-    if (ipConnectionNotifier) {
+    if (ipConnectionNotifier && !iHandleStateNotificationsFromManager) {
         ipConnectionNotifier->StopNotifications();
+        // Start handling IAP state change signals from QNetworkConfigurationManagerPrivate
+        iHandleStateNotificationsFromManager = true;
     }
     
     iConnection.Close();
@@ -456,7 +519,6 @@
         newState(QNetworkSession::Closing);
     }
     
-    syncStateWithInterface();
     if (allowSignals) {
         if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
             newState(QNetworkSession::Disconnected);
@@ -467,9 +529,19 @@
 
 void QNetworkSessionPrivate::stop()
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "stop() called, session state is: " << state << " and isOpen is : "
+            << isOpen;
+#endif
     if (!isOpen &&
         publicConfig.isValid() &&
         publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "since session is not open, using RConnectionMonitor to stop() the interface";
+#endif
+        iStoppedByUser = true;
         // If the publicConfig is type of IAP, enumerate through connections at
         // connection monitor. If publicConfig is active in that list, stop it.
         // Otherwise there is nothing to stop. Note: because this QNetworkSession is not open,
@@ -495,11 +567,25 @@
                                                               ETrue);
                 }
             }
+            // Enter disconnected state right away since the session is not even open.
+            // Symbian^3 connection monitor does not emit KLinkLayerClosed when
+            // connection is stopped via connection monitor.
+            newState(QNetworkSession::Disconnected);
         }
     } else if (isOpen) {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "since session is open, using RConnection to stop() the interface";
+#endif
         // Since we are open, use RConnection to stop the interface
         isOpen = false;
+        iStoppedByUser = true;
         newState(QNetworkSession::Closing);
+        if (ipConnectionNotifier) {
+            ipConnectionNotifier->StopNotifications();
+            // Start handling IAP state change signals from QNetworkConfigurationManagerPrivate
+            iHandleStateNotificationsFromManager = true;
+        }
         iConnection.Stop(RConnection::EStopAuthoritative);
         isOpen = true;
         close(false);
@@ -611,6 +697,10 @@
 
 void QNetworkSessionPrivate::Error(TInt /*aError*/)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+            << "roaming Error() occured";
+#endif
     if (isOpen) {
         isOpen = false;
         activeConfig = QNetworkConfiguration();
@@ -628,6 +718,11 @@
         //    changes immediately to Disconnected.
         newState(QNetworkSession::Disconnected);
         emit q->closed();
+    } else if (iStoppedByUser) {
+        // If the user of this session has called the stop() and
+        // configuration is based on internet SNAP, this needs to be
+        // done here because platform might roam.
+        newState(QNetworkSession::Disconnected);
     }
 }
 #endif
@@ -902,7 +997,12 @@
             isOpen = false;
             activeConfig = QNetworkConfiguration();
             serviceConfig = QNetworkConfiguration();
-            iError = QNetworkSession::UnknownSessionError;
+            if (publicConfig.state() == QNetworkConfiguration::Undefined ||
+                publicConfig.state() == QNetworkConfiguration::Defined) {
+                iError = QNetworkSession::InvalidConfigurationError;
+            } else {
+                iError = QNetworkSession::UnknownSessionError;
+            }
             emit q->error(iError);
             Cancel();
             if (ipConnectionNotifier) {
@@ -918,8 +1018,16 @@
     iConnection.Close();
 }
 
+// Enters newState if feasible according to current state.
+// AccessPointId may be given as parameter. If it is zero, state-change is assumed to
+// concern this session's configuration. If non-zero, the configuration is looked up
+// and checked if it matches the configuration this session is based on.
 bool QNetworkSessionPrivate::newState(QNetworkSession::State newState, TUint accessPointId)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - "
+             << "NEW STATE, IAP ID : " << QString::number(accessPointId) << " , newState : " << QString::number(newState);
+#endif
     // Make sure that activeConfig is always updated when SNAP is signaled to be
     // connected.
     if (isOpen && publicConfig.type() == QNetworkConfiguration::ServiceNetwork &&
@@ -937,9 +1045,29 @@
     if (state == QNetworkSession::Roaming && newState == QNetworkSession::Connecting) {
         return false;
     }
+    
+    // Make sure that Connected state is not reported when Connection is
+    // already Closing.
+    // Note: Stopping connection results sometimes KLinkLayerOpen
+    //       to be reported first (just before KLinkLayerClosed).
+    if (state == QNetworkSession::Closing && newState == QNetworkSession::Connected) {
+        return false;
+    }
+
+    // Make sure that some lagging 'closing' state-changes do not overwrite
+    // if we are already disconnected or closed.
+    if (state == QNetworkSession::Disconnected && newState == QNetworkSession::Closing) {
+        return false;
+    }
 
     bool emitSessionClosed = false;
-    if (isOpen && state == QNetworkSession::Connected && newState == QNetworkSession::Disconnected) {
+
+    // If we abruptly go down and user hasn't closed the session, we've been aborted.
+    // Note that session may be in 'closing' state and not in 'connected' state, because
+    // depending on platform the platform may report KConfigDaemonStartingDeregistration
+    // event before KLinkLayerClosed
+    if ((isOpen && state == QNetworkSession::Connected && newState == QNetworkSession::Disconnected) ||
+        (isOpen && !iClosedByUser && newState == QNetworkSession::Disconnected)) {
         // Active & Connected state should change directly to Disconnected state
         // only when something forces connection to close (eg. when another
         // application or session stops connection or when network drops
@@ -953,26 +1081,35 @@
         if (ipConnectionNotifier) {
             ipConnectionNotifier->StopNotifications();
         }
-        // Start monitoring changes in IAP states
-        TRAP_IGNORE(iConnectionMonitor.NotifyEventL(*this));
+        // Start handling IAP state change signals from QNetworkConfigurationManagerPrivate
+        iHandleStateNotificationsFromManager = true;
         emitSessionClosed = true; // Emit SessionClosed after state change has been reported
     }
 
     bool retVal = false;
     if (accessPointId == 0) {
         state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+        qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed A to: " << state;
+#endif
         emit q->stateChanged(state);
         retVal = true;
     } else {
         if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
             if (publicConfig.d.data()->numericId == accessPointId) {
                 state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+                qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed B to: " << state;
+#endif
                 emit q->stateChanged(state);
                 retVal = true;
             }
         } else if (publicConfig.type() == QNetworkConfiguration::UserChoice && isOpen) {
             if (activeConfig.d.data()->numericId == accessPointId) {
                 state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+                qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed C to: " << state;
+#endif
                 emit q->stateChanged(state);
                 retVal = true;
             }
@@ -981,23 +1118,20 @@
             for (int i = 0; i < subConfigurations.count(); i++) {
                 if (subConfigurations[i].d.data()->numericId == accessPointId) {
                     if (newState == QNetworkSession::Connected) {
-                        // Make sure that when AccessPoint is reported to be Connected
-                        // also state of the related configuration changes to Active.
-                        subConfigurations[i].d.data()->state = QNetworkConfiguration::Active;
-    
                         state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+                        qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed D  to: " << state;
+#endif
                         emit q->stateChanged(state);
                         retVal = true;
                     } else {
-                        if (newState == QNetworkSession::Disconnected) {
-                            // Make sure that when AccessPoint is reported to be disconnected
-                            // also state of the related configuration changes from Active to Defined.
-                            subConfigurations[i].d.data()->state = QNetworkConfiguration::Defined;
-                        }
                         QNetworkConfiguration config = bestConfigFromSNAP(publicConfig);
                         if ((config.state() == QNetworkConfiguration::Defined) ||
                             (config.state() == QNetworkConfiguration::Discovered)) {
                             state = newState;
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+                            qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "===> EMIT State changed E  to: " << state;
+#endif
                             emit q->stateChanged(state);
                             retVal = true;
                         }
@@ -1010,6 +1144,13 @@
     if (emitSessionClosed) {
         emit q->closed();
     }
+    if (state == QNetworkSession::Disconnected) {
+        // The connection has gone down, and processing of status updates must be
+        // stopped. Depending on platform, there may come 'connecting/connected' states
+        // considerably later (almost a second). Connection id is an increasing
+        // number, so this does not affect next _real_ 'conneting/connected' states.
+        iDeprecatedConnectionId = publicConfig.d.data()->connectionId;
+    }
 
     return retVal;
 }
@@ -1018,6 +1159,9 @@
                                                                  TInt aError,
                                                                  TUint accessPointId)
 {
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+    qDebug() << "QNS this : " << QString::number((uint)this) << " - " << QString::number(accessPointId) << " , status : " << QString::number(aConnectionStatus);
+#endif
     switch (aConnectionStatus)
         {
         // Connection unitialised
@@ -1056,6 +1200,7 @@
         case KCsdGotLoginInfo:
             break;
 
+        case KConfigDaemonStartingRegistration:
         // Creating connection (e.g. GPRS activation)
         case KCsdStartingConnect:
         case KCsdFinishedConnect:
@@ -1082,6 +1227,7 @@
         case KDataTransferTemporarilyBlocked:
             break;
 
+        case KConfigDaemonStartingDeregistration:
         // Hangup or GRPS deactivation
         case KConnectionStartingClose:
             newState(QNetworkSession::Closing,accessPointId);
@@ -1089,110 +1235,27 @@
 
         // Connection closed
         case KConnectionClosed:
-            break;
-
         case KLinkLayerClosed:
             newState(QNetworkSession::Disconnected,accessPointId);
+            // Report manager about this to make sure this event
+            // is received by all interseted parties (mediated by
+            // manager because it does always receive all events from
+            // connection monitor).
+#ifdef QT_BEARERMGMT_SYMBIAN_DEBUG
+            qDebug() << "QNS this : " << QString::number((uint)this) << " - " << "reporting disconnection to manager.";
+#endif
+            if (publicConfig.d.data()) {
+                ((QNetworkConfigurationManagerPrivate*)publicConfig.d.data()->manager)->configurationStateChangeReport(publicConfig.d.data()->numericId, QNetworkSession::Disconnected);
+            }
             break;
-
         // Unhandled state
         default:
             break;
         }
 }
 
-void QNetworkSessionPrivate::EventL(const CConnMonEventBase& aEvent)
-{
-    switch (aEvent.EventType())
-    {
-        case EConnMonConnectionStatusChange:
-            {
-            CConnMonConnectionStatusChange* realEvent;
-            realEvent = (CConnMonConnectionStatusChange*) &aEvent;
-
-            TUint connectionId = realEvent->ConnectionId();
-            TInt connectionStatus = realEvent->ConnectionStatus();
-
-            // Try to Find IAP Id using connection Id
-            TUint apId = 0;
-            if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-                QList<QNetworkConfiguration> subConfigurations = publicConfig.children();
-                for (int i = 0; i < subConfigurations.count(); i++ ) {
-                    if (subConfigurations[i].d.data()->connectionId == connectionId) {
-                        apId = subConfigurations[i].d.data()->numericId;
-                        break;
-                    }
-                }
-            } else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-                if (publicConfig.d.data()->connectionId == connectionId) {
-                    apId = publicConfig.d.data()->numericId;
-                }
-            }
-
-            if (apId > 0) {
-                handleSymbianConnectionStatusChange(connectionStatus, KErrNone, apId);
-            }
-            }
-            break;
-
-        case EConnMonCreateConnection:
-            {
-            CConnMonCreateConnection* realEvent;
-            realEvent = (CConnMonCreateConnection*) &aEvent;
-            TUint apId;
-            TUint connectionId = realEvent->ConnectionId();
-            TRequestStatus status;
-            iConnectionMonitor.GetUintAttribute(connectionId, 0, KIAPId, apId, status);
-            User::WaitForRequest(status);
-            if (status.Int() == KErrNone) {
-                // Store connection id to related AccessPoint Configuration
-                if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-                    QList<QNetworkConfiguration> subConfigurations = publicConfig.children();
-                    for (int i = 0; i < subConfigurations.count(); i++ ) {
-                        if (subConfigurations[i].d.data()->numericId == apId) {
-                            subConfigurations[i].d.data()->connectionId = connectionId;
-                            break;
-                        }
-                    }
-                } else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-                    if (publicConfig.d.data()->numericId == apId) {
-                        publicConfig.d.data()->connectionId = connectionId;
-                    }
-                }
-            }
-            }
-            break;
-
-        case EConnMonDeleteConnection:
-            {
-            CConnMonDeleteConnection* realEvent;
-            realEvent = (CConnMonDeleteConnection*) &aEvent;
-            TUint connectionId = realEvent->ConnectionId();
-            // Remove connection id from related AccessPoint Configuration
-            if (publicConfig.type() == QNetworkConfiguration::ServiceNetwork) {
-                QList<QNetworkConfiguration> subConfigurations = publicConfig.children();
-                for (int i = 0; i < subConfigurations.count(); i++ ) {
-                    if (subConfigurations[i].d.data()->connectionId == connectionId) {
-                        subConfigurations[i].d.data()->connectionId = 0;
-                        break;
-                    }
-                }
-            } else if (publicConfig.type() == QNetworkConfiguration::InternetAccessPoint) {
-                if (publicConfig.d.data()->connectionId == connectionId) {
-                    publicConfig.d.data()->connectionId = 0;
-                }
-            }
-            }
-            break;
-
-        default:
-            // For unrecognized events
-            break;
-    }
-}
-
 ConnectionProgressNotifier::ConnectionProgressNotifier(QNetworkSessionPrivate& owner, RConnection& connection)
-    : CActive(CActive::EPriorityStandard), iOwner(owner), iConnection(connection)
+    : CActive(CActive::EPriorityUserInput), iOwner(owner), iConnection(connection)
 {
     CActiveScheduler::Add(this);
 }
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksession_s60_p.h
--- a/qtmobility/src/bearer/qnetworksession_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksession_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -72,11 +72,10 @@
 
 class ConnectionProgressNotifier;
 
-class QNetworkSessionPrivate : public QObject, public CActive,
+class QNetworkSessionPrivate : public QObject, public CActive
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
-                               public MMobilityProtocolResp,
+                               , public MMobilityProtocolResp
 #endif
-                               public MConnectionMonitorObserver
 {
     Q_OBJECT
 public:
@@ -129,8 +128,9 @@
     void RunL();
     void DoCancel();
     
-private: // MConnectionMonitorObserver
-    void EventL(const CConnMonEventBase& aEvent);
+private Q_SLOTS:
+    void configurationStateChanged(TUint32 accessPointId, TUint32 connMonId, QNetworkSession::State newState);
+    void configurationRemoved(const QNetworkConfiguration& config);
     
 private:
     TUint iapClientCount(TUint aIAPId) const;
@@ -166,6 +166,13 @@
     mutable RConnection iConnection;
     mutable RConnectionMonitor iConnectionMonitor;
     ConnectionProgressNotifier* ipConnectionNotifier;
+    
+    bool iHandleStateNotificationsFromManager;
+    bool iFirstSync;
+    bool iStoppedByUser;
+    bool iClosedByUser;
+    TUint32 iDeprecatedConnectionId;
+    
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE    
     CActiveCommsMobilityApiExt* iMobility;
 #endif    
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksessionengine.cpp
--- a/qtmobility/src/bearer/qnetworksessionengine.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksessionengine.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksessionengine_p.h
--- a/qtmobility/src/bearer/qnetworksessionengine_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksessionengine_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnetworksessionengine_win_p.h
--- a/qtmobility/src/bearer/qnetworksessionengine_win_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnetworksessionengine_win_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnlaengine_win.cpp
--- a/qtmobility/src/bearer/qnlaengine_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnlaengine_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnlaengine_win_p.h
--- a/qtmobility/src/bearer/qnlaengine_win_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnlaengine_win_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnmdbushelper.cpp
--- a/qtmobility/src/bearer/qnmdbushelper.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnmdbushelper.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnmdbushelper_p.h
--- a/qtmobility/src/bearer/qnmdbushelper_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnmdbushelper_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnmwifiengine_unix.cpp
--- a/qtmobility/src/bearer/qnmwifiengine_unix.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnmwifiengine_unix.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/bearer/qnmwifiengine_unix_p.h
--- a/qtmobility/src/bearer/qnmwifiengine_unix_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/bearer/qnmwifiengine_unix_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactaddress.h
--- a/qtmobility/src/contacts/details/qcontactaddress.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactaddress.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactanniversary.h
--- a/qtmobility/src/contacts/details/qcontactanniversary.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactanniversary.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactavatar.h
--- a/qtmobility/src/contacts/details/qcontactavatar.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactavatar.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactbirthday.h
--- a/qtmobility/src/contacts/details/qcontactbirthday.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactbirthday.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactdetails.cpp
--- a/qtmobility/src/contacts/details/qcontactdetails.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactdetails.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactdetails.h
--- a/qtmobility/src/contacts/details/qcontactdetails.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactdetails.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactdisplaylabel.h
--- a/qtmobility/src/contacts/details/qcontactdisplaylabel.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactdisplaylabel.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactemailaddress.h
--- a/qtmobility/src/contacts/details/qcontactemailaddress.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactemailaddress.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactfamily.h
--- a/qtmobility/src/contacts/details/qcontactfamily.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactfamily.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactgender.h
--- a/qtmobility/src/contacts/details/qcontactgender.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactgender.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactgeolocation.h
--- a/qtmobility/src/contacts/details/qcontactgeolocation.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactgeolocation.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactglobalpresence.h
--- a/qtmobility/src/contacts/details/qcontactglobalpresence.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactglobalpresence.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactguid.h
--- a/qtmobility/src/contacts/details/qcontactguid.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactguid.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactname.h
--- a/qtmobility/src/contacts/details/qcontactname.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactname.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactnickname.h
--- a/qtmobility/src/contacts/details/qcontactnickname.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactnickname.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactnote.h
--- a/qtmobility/src/contacts/details/qcontactnote.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactnote.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactonlineaccount.h
--- a/qtmobility/src/contacts/details/qcontactonlineaccount.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactonlineaccount.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactorganization.h
--- a/qtmobility/src/contacts/details/qcontactorganization.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactorganization.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactphonenumber.h
--- a/qtmobility/src/contacts/details/qcontactphonenumber.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactphonenumber.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactpresence.h
--- a/qtmobility/src/contacts/details/qcontactpresence.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactpresence.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactringtone.h
--- a/qtmobility/src/contacts/details/qcontactringtone.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactringtone.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactsynctarget.h
--- a/qtmobility/src/contacts/details/qcontactsynctarget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactsynctarget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontactthumbnail.h
--- a/qtmobility/src/contacts/details/qcontactthumbnail.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontactthumbnail.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontacttimestamp.h
--- a/qtmobility/src/contacts/details/qcontacttimestamp.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontacttimestamp.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontacttype.h
--- a/qtmobility/src/contacts/details/qcontacttype.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontacttype.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/details/qcontacturl.h
--- a/qtmobility/src/contacts/details/qcontacturl.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/details/qcontacturl.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/engines/qcontactinvalidbackend.cpp
--- a/qtmobility/src/contacts/engines/qcontactinvalidbackend.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/engines/qcontactinvalidbackend.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/engines/qcontactinvalidbackend_p.h
--- a/qtmobility/src/contacts/engines/qcontactinvalidbackend_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/engines/qcontactinvalidbackend_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/engines/qcontactmemorybackend.cpp
--- a/qtmobility/src/contacts/engines/qcontactmemorybackend.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/engines/qcontactmemorybackend.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/engines/qcontactmemorybackend_p.h
--- a/qtmobility/src/contacts/engines/qcontactmemorybackend_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/engines/qcontactmemorybackend_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactchangelogfilter.cpp
--- a/qtmobility/src/contacts/filters/qcontactchangelogfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactchangelogfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactchangelogfilter.h
--- a/qtmobility/src/contacts/filters/qcontactchangelogfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactchangelogfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactchangelogfilter_p.h
--- a/qtmobility/src/contacts/filters/qcontactchangelogfilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactchangelogfilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactdetailfilter.cpp
--- a/qtmobility/src/contacts/filters/qcontactdetailfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactdetailfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactdetailfilter.h
--- a/qtmobility/src/contacts/filters/qcontactdetailfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactdetailfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactdetailfilter_p.h
--- a/qtmobility/src/contacts/filters/qcontactdetailfilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactdetailfilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactdetailrangefilter.cpp
--- a/qtmobility/src/contacts/filters/qcontactdetailrangefilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactdetailrangefilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactdetailrangefilter.h
--- a/qtmobility/src/contacts/filters/qcontactdetailrangefilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactdetailrangefilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactdetailrangefilter_p.h
--- a/qtmobility/src/contacts/filters/qcontactdetailrangefilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactdetailrangefilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactfilters.h
--- a/qtmobility/src/contacts/filters/qcontactfilters.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactfilters.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactintersectionfilter.cpp
--- a/qtmobility/src/contacts/filters/qcontactintersectionfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactintersectionfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactintersectionfilter.h
--- a/qtmobility/src/contacts/filters/qcontactintersectionfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactintersectionfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactintersectionfilter_p.h
--- a/qtmobility/src/contacts/filters/qcontactintersectionfilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactintersectionfilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactinvalidfilter.cpp
--- a/qtmobility/src/contacts/filters/qcontactinvalidfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactinvalidfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactinvalidfilter.h
--- a/qtmobility/src/contacts/filters/qcontactinvalidfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactinvalidfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactlocalidfilter.cpp
--- a/qtmobility/src/contacts/filters/qcontactlocalidfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactlocalidfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactlocalidfilter.h
--- a/qtmobility/src/contacts/filters/qcontactlocalidfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactlocalidfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactlocalidfilter_p.h
--- a/qtmobility/src/contacts/filters/qcontactlocalidfilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactlocalidfilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactrelationshipfilter.cpp
--- a/qtmobility/src/contacts/filters/qcontactrelationshipfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactrelationshipfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactrelationshipfilter.h
--- a/qtmobility/src/contacts/filters/qcontactrelationshipfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactrelationshipfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactrelationshipfilter_p.h
--- a/qtmobility/src/contacts/filters/qcontactrelationshipfilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactrelationshipfilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactunionfilter.cpp
--- a/qtmobility/src/contacts/filters/qcontactunionfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactunionfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactunionfilter.h
--- a/qtmobility/src/contacts/filters/qcontactunionfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactunionfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/filters/qcontactunionfilter_p.h
--- a/qtmobility/src/contacts/filters/qcontactunionfilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/filters/qcontactunionfilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontact.cpp
--- a/qtmobility/src/contacts/qcontact.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontact.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontact.h
--- a/qtmobility/src/contacts/qcontact.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontact.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontact_p.h
--- a/qtmobility/src/contacts/qcontact_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontact_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactabstractrequest.cpp
--- a/qtmobility/src/contacts/qcontactabstractrequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactabstractrequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactabstractrequest.h
--- a/qtmobility/src/contacts/qcontactabstractrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactabstractrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactabstractrequest_p.h
--- a/qtmobility/src/contacts/qcontactabstractrequest_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactabstractrequest_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactchangeset.cpp
--- a/qtmobility/src/contacts/qcontactchangeset.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactchangeset.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactchangeset.h
--- a/qtmobility/src/contacts/qcontactchangeset.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactchangeset.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactchangeset_p.h
--- a/qtmobility/src/contacts/qcontactchangeset_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactchangeset_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactdetail.cpp
--- a/qtmobility/src/contacts/qcontactdetail.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetail.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactdetail.h
--- a/qtmobility/src/contacts/qcontactdetail.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetail.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactdetail_p.h
--- a/qtmobility/src/contacts/qcontactdetail_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetail_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactdetaildefinition.cpp
--- a/qtmobility/src/contacts/qcontactdetaildefinition.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetaildefinition.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactdetaildefinition.h
--- a/qtmobility/src/contacts/qcontactdetaildefinition.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetaildefinition.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactdetaildefinition_p.h
--- a/qtmobility/src/contacts/qcontactdetaildefinition_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetaildefinition_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactdetailfielddefinition.cpp
--- a/qtmobility/src/contacts/qcontactdetailfielddefinition.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetailfielddefinition.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactdetailfielddefinition.h
--- a/qtmobility/src/contacts/qcontactdetailfielddefinition.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetailfielddefinition.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactdetailfielddefinition_p.h
--- a/qtmobility/src/contacts/qcontactdetailfielddefinition_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactdetailfielddefinition_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactfetchhint.cpp
--- a/qtmobility/src/contacts/qcontactfetchhint.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactfetchhint.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactfetchhint.h
--- a/qtmobility/src/contacts/qcontactfetchhint.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactfetchhint.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactfetchhint_p.h
--- a/qtmobility/src/contacts/qcontactfetchhint_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactfetchhint_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactfilter.cpp
--- a/qtmobility/src/contacts/qcontactfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactfilter.h
--- a/qtmobility/src/contacts/qcontactfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactfilter_p.h
--- a/qtmobility/src/contacts/qcontactfilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactfilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactid.cpp
--- a/qtmobility/src/contacts/qcontactid.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactid.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactid.h
--- a/qtmobility/src/contacts/qcontactid.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactid.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactid_p.h
--- a/qtmobility/src/contacts/qcontactid_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactid_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactmanager.cpp
--- a/qtmobility/src/contacts/qcontactmanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactmanager.h
--- a/qtmobility/src/contacts/qcontactmanager.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactmanager_p.cpp
--- a/qtmobility/src/contacts/qcontactmanager_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactmanager_p.h
--- a/qtmobility/src/contacts/qcontactmanager_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanager_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactmanagerengine.cpp
--- a/qtmobility/src/contacts/qcontactmanagerengine.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanagerengine.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactmanagerengine.h
--- a/qtmobility/src/contacts/qcontactmanagerengine.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanagerengine.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactmanagerenginefactory.cpp
--- a/qtmobility/src/contacts/qcontactmanagerenginefactory.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanagerenginefactory.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactmanagerenginefactory.h
--- a/qtmobility/src/contacts/qcontactmanagerenginefactory.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactmanagerenginefactory.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactrelationship.cpp
--- a/qtmobility/src/contacts/qcontactrelationship.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactrelationship.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactrelationship.h
--- a/qtmobility/src/contacts/qcontactrelationship.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactrelationship.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactrelationship_p.h
--- a/qtmobility/src/contacts/qcontactrelationship_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactrelationship_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactsortorder.cpp
--- a/qtmobility/src/contacts/qcontactsortorder.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactsortorder.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactsortorder.h
--- a/qtmobility/src/contacts/qcontactsortorder.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactsortorder.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qcontactsortorder_p.h
--- a/qtmobility/src/contacts/qcontactsortorder_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qcontactsortorder_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qtcontacts.h
--- a/qtmobility/src/contacts/qtcontacts.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qtcontacts.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/qtcontactsglobal.h
--- a/qtmobility/src/contacts/qtcontactsglobal.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/qtcontactsglobal.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h
--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionfetchrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.h
--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionremoverequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.h
--- a/qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactdetaildefinitionsaverequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactfetchrequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactfetchrequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactfetchrequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactfetchrequest.h
--- a/qtmobility/src/contacts/requests/qcontactfetchrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactfetchrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.h
--- a/qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactlocalidfetchrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.h
--- a/qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipfetchrequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.h
--- a/qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipremoverequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.h
--- a/qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrelationshipsaverequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactremoverequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactremoverequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactremoverequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactremoverequest.h
--- a/qtmobility/src/contacts/requests/qcontactremoverequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactremoverequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactrequests.h
--- a/qtmobility/src/contacts/requests/qcontactrequests.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrequests.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactrequests_p.h
--- a/qtmobility/src/contacts/requests/qcontactrequests_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactrequests_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactsaverequest.cpp
--- a/qtmobility/src/contacts/requests/qcontactsaverequest.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactsaverequest.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/contacts/requests/qcontactsaverequest.h
--- a/qtmobility/src/contacts/requests/qcontactsaverequest.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/contacts/requests/qcontactsaverequest.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/global/qmobilityglobal.h
--- a/qtmobility/src/global/qmobilityglobal.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/global/qmobilityglobal.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/global/qmobilitypluginsearch.h
--- a/qtmobility/src/global/qmobilitypluginsearch.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/global/qmobilitypluginsearch.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/dbuscomm_maemo.cpp
--- a/qtmobility/src/location/dbuscomm_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/dbuscomm_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/dbuscomm_maemo_p.h
--- a/qtmobility/src/location/dbuscomm_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/dbuscomm_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/dbusserver_maemo.cpp
--- a/qtmobility/src/location/dbusserver_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/dbusserver_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/dbusserver_maemo_p.h
--- a/qtmobility/src/location/dbusserver_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/dbusserver_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/liblocationwrapper.cpp
--- a/qtmobility/src/location/liblocationwrapper.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/liblocationwrapper.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/liblocationwrapper_p.h
--- a/qtmobility/src/location/liblocationwrapper_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/liblocationwrapper_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/location.pro
--- a/qtmobility/src/location/location.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/location.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -107,9 +107,9 @@
     TARGET.CAPABILITY = ALL -TCB
     TARGET.UID3 = 0x2002AC83
 
-#    INCLUDEPATH += $${EPOCROOT}epoc32\include\osextensions \
-#                   $${EPOCROOT}epoc32\include\LBTHeaders \
-#                   $${EPOCROOT}epoc32\include\platform
+    INCLUDEPATH += $${EPOCROOT}epoc32\include\osextensions \
+                   $${EPOCROOT}epoc32\include\LBTHeaders \
+                   $${EPOCROOT}epoc32\include\platform
     LIBS += -llbs
     contains(lbt_enabled, yes) {
         LIBS += -llbt
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/notificationcallback_s60_p.h
--- a/qtmobility/src/location/notificationcallback_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/notificationcallback_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/notificationmonitorcallback_s60_p.h
--- a/qtmobility/src/location/notificationmonitorcallback_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/notificationmonitorcallback_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/notificationsatellitecallback_s60_p.h
--- a/qtmobility/src/location/notificationsatellitecallback_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/notificationsatellitecallback_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeoareamonitor.cpp
--- a/qtmobility/src/location/qgeoareamonitor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeoareamonitor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeoareamonitor.h
--- a/qtmobility/src/location/qgeoareamonitor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeoareamonitor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeoareamonitor_maemo.cpp
--- a/qtmobility/src/location/qgeoareamonitor_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeoareamonitor_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeoareamonitor_maemo_p.h
--- a/qtmobility/src/location/qgeoareamonitor_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeoareamonitor_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeoareamonitor_s60.cpp
--- a/qtmobility/src/location/qgeoareamonitor_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeoareamonitor_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeoareamonitor_s60_p.h
--- a/qtmobility/src/location/qgeoareamonitor_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeoareamonitor_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeocoordinate.cpp
--- a/qtmobility/src/location/qgeocoordinate.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeocoordinate.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeocoordinate.h
--- a/qtmobility/src/location/qgeocoordinate.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeocoordinate.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeoinfothread_wince.cpp
--- a/qtmobility/src/location/qgeoinfothread_wince.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeoinfothread_wince.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeoinfothread_wince_p.h
--- a/qtmobility/src/location/qgeoinfothread_wince_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeoinfothread_wince_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfo.cpp
--- a/qtmobility/src/location/qgeopositioninfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfo.h
--- a/qtmobility/src/location/qgeopositioninfo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource.cpp
--- a/qtmobility/src/location/qgeopositioninfosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource.h
--- a/qtmobility/src/location/qgeopositioninfosource.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource_maemo.cpp
--- a/qtmobility/src/location/qgeopositioninfosource_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource_maemo5.cpp
--- a/qtmobility/src/location/qgeopositioninfosource_maemo5.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_maemo5.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource_maemo5_p.h
--- a/qtmobility/src/location/qgeopositioninfosource_maemo5_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_maemo5_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource_maemo_p.h
--- a/qtmobility/src/location/qgeopositioninfosource_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource_s60.cpp
--- a/qtmobility/src/location/qgeopositioninfosource_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource_s60_p.h
--- a/qtmobility/src/location/qgeopositioninfosource_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource_wince.cpp
--- a/qtmobility/src/location/qgeopositioninfosource_wince.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_wince.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeopositioninfosource_wince_p.h
--- a/qtmobility/src/location/qgeopositioninfosource_wince_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeopositioninfosource_wince_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfo.cpp
--- a/qtmobility/src/location/qgeosatelliteinfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfo.h
--- a/qtmobility/src/location/qgeosatelliteinfo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource.cpp
--- a/qtmobility/src/location/qgeosatelliteinfosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource.h
--- a/qtmobility/src/location/qgeosatelliteinfosource.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource_maemo.cpp
--- a/qtmobility/src/location/qgeosatelliteinfosource_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource_maemo5.cpp
--- a/qtmobility/src/location/qgeosatelliteinfosource_maemo5.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource_maemo5.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource_maemo5_p.h
--- a/qtmobility/src/location/qgeosatelliteinfosource_maemo5_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource_maemo5_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource_maemo_p.h
--- a/qtmobility/src/location/qgeosatelliteinfosource_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource_s60.cpp
--- a/qtmobility/src/location/qgeosatelliteinfosource_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource_s60_p.h
--- a/qtmobility/src/location/qgeosatelliteinfosource_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource_wince.cpp
--- a/qtmobility/src/location/qgeosatelliteinfosource_wince.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource_wince.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qgeosatelliteinfosource_wince_p.h
--- a/qtmobility/src/location/qgeosatelliteinfosource_wince_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qgeosatelliteinfosource_wince_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qlocationutils.cpp
--- a/qtmobility/src/location/qlocationutils.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qlocationutils.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qlocationutils_p.h
--- a/qtmobility/src/location/qlocationutils_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qlocationutils_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendao_s60.cpp
--- a/qtmobility/src/location/qmlbackendao_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendao_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendao_s60_p.h
--- a/qtmobility/src/location/qmlbackendao_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendao_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendmonitorao_s60.cpp
--- a/qtmobility/src/location/qmlbackendmonitorao_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendmonitorao_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendmonitorao_s60_p.h
--- a/qtmobility/src/location/qmlbackendmonitorao_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendmonitorao_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp
--- a/qtmobility/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendmonitorcreatetriggerao_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h
--- a/qtmobility/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendmonitorcreatetriggerao_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendmonitorinfo_s60.cpp
--- a/qtmobility/src/location/qmlbackendmonitorinfo_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendmonitorinfo_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendmonitorinfo_s60_p.h
--- a/qtmobility/src/location/qmlbackendmonitorinfo_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendmonitorinfo_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendtriggerchangeao_s60.cpp
--- a/qtmobility/src/location/qmlbackendtriggerchangeao_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendtriggerchangeao_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qmlbackendtriggerchangeao_s60_p.h
--- a/qtmobility/src/location/qmlbackendtriggerchangeao_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qmlbackendtriggerchangeao_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qnmeapositioninfosource.cpp
--- a/qtmobility/src/location/qnmeapositioninfosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qnmeapositioninfosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qnmeapositioninfosource.h
--- a/qtmobility/src/location/qnmeapositioninfosource.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qnmeapositioninfosource.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/location/qnmeapositioninfosource_p.h
--- a/qtmobility/src/location/qnmeapositioninfosource_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/location/qnmeapositioninfosource_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/addresshelper.cpp
--- a/qtmobility/src/messaging/addresshelper.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/addresshelper.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/addresshelper_p.h
--- a/qtmobility/src/messaging/addresshelper_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/addresshelper_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/eventloggerengine_maemo.cpp
--- a/qtmobility/src/messaging/eventloggerengine_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/eventloggerengine_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/eventloggerengine_maemo_p.h
--- a/qtmobility/src/messaging/eventloggerengine_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/eventloggerengine_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/maemohelpers.cpp
--- a/qtmobility/src/messaging/maemohelpers.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/maemohelpers.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/maemohelpers_p.h
--- a/qtmobility/src/messaging/maemohelpers_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/maemohelpers_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/messagingutil.cpp
--- a/qtmobility/src/messaging/messagingutil.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/messagingutil.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/messagingutil_p.h
--- a/qtmobility/src/messaging/messagingutil_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/messagingutil_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/modestengine_maemo.cpp
--- a/qtmobility/src/messaging/modestengine_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/modestengine_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/modestengine_maemo_p.h
--- a/qtmobility/src/messaging/modestengine_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/modestengine_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessage.cpp
--- a/qtmobility/src/messaging/qmessage.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessage.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessage.h
--- a/qtmobility/src/messaging/qmessage.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessage.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessage_maemo.cpp
--- a/qtmobility/src/messaging/qmessage_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessage_p.h
--- a/qtmobility/src/messaging/qmessage_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessage_qmf.cpp
--- a/qtmobility/src/messaging/qmessage_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessage_stub.cpp
--- a/qtmobility/src/messaging/qmessage_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessage_symbian.cpp
--- a/qtmobility/src/messaging/qmessage_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessage_symbian_p.h
--- a/qtmobility/src/messaging/qmessage_symbian_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_symbian_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessage_win.cpp
--- a/qtmobility/src/messaging/qmessage_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessage_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccount.cpp
--- a/qtmobility/src/messaging/qmessageaccount.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccount.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccount.h
--- a/qtmobility/src/messaging/qmessageaccount.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccount.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccount_maemo.cpp
--- a/qtmobility/src/messaging/qmessageaccount_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccount_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccount_p.h
--- a/qtmobility/src/messaging/qmessageaccount_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccount_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccount_qmf.cpp
--- a/qtmobility/src/messaging/qmessageaccount_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccount_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccount_stub.cpp
--- a/qtmobility/src/messaging/qmessageaccount_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccount_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccount_symbian.cpp
--- a/qtmobility/src/messaging/qmessageaccount_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccount_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccount_win.cpp
--- a/qtmobility/src/messaging/qmessageaccount_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccount_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountfilter.cpp
--- a/qtmobility/src/messaging/qmessageaccountfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountfilter.h
--- a/qtmobility/src/messaging/qmessageaccountfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountfilter_maemo.cpp
--- a/qtmobility/src/messaging/qmessageaccountfilter_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountfilter_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountfilter_p.h
--- a/qtmobility/src/messaging/qmessageaccountfilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountfilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountfilter_qmf.cpp
--- a/qtmobility/src/messaging/qmessageaccountfilter_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountfilter_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountfilter_stub.cpp
--- a/qtmobility/src/messaging/qmessageaccountfilter_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountfilter_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountfilter_symbian.cpp
--- a/qtmobility/src/messaging/qmessageaccountfilter_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountfilter_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountfilter_win.cpp
--- a/qtmobility/src/messaging/qmessageaccountfilter_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountfilter_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountid.cpp
--- a/qtmobility/src/messaging/qmessageaccountid.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountid.h
--- a/qtmobility/src/messaging/qmessageaccountid.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountid_maemo.cpp
--- a/qtmobility/src/messaging/qmessageaccountid_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountid_p.h
--- a/qtmobility/src/messaging/qmessageaccountid_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountid_qmf.cpp
--- a/qtmobility/src/messaging/qmessageaccountid_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountid_stub.cpp
--- a/qtmobility/src/messaging/qmessageaccountid_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountid_symbian.cpp
--- a/qtmobility/src/messaging/qmessageaccountid_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountid_win.cpp
--- a/qtmobility/src/messaging/qmessageaccountid_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountid_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountsortorder.cpp
--- a/qtmobility/src/messaging/qmessageaccountsortorder.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountsortorder.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountsortorder.h
--- a/qtmobility/src/messaging/qmessageaccountsortorder.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountsortorder.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountsortorder_maemo.cpp
--- a/qtmobility/src/messaging/qmessageaccountsortorder_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountsortorder_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountsortorder_p.h
--- a/qtmobility/src/messaging/qmessageaccountsortorder_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountsortorder_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountsortorder_qmf.cpp
--- a/qtmobility/src/messaging/qmessageaccountsortorder_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountsortorder_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountsortorder_stub.cpp
--- a/qtmobility/src/messaging/qmessageaccountsortorder_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountsortorder_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountsortorder_symbian.cpp
--- a/qtmobility/src/messaging/qmessageaccountsortorder_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountsortorder_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaccountsortorder_win.cpp
--- a/qtmobility/src/messaging/qmessageaccountsortorder_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaccountsortorder_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaddress.cpp
--- a/qtmobility/src/messaging/qmessageaddress.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaddress.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaddress.h
--- a/qtmobility/src/messaging/qmessageaddress.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaddress.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageaddress_p.h
--- a/qtmobility/src/messaging/qmessageaddress_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageaddress_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer.h
--- a/qtmobility/src/messaging/qmessagecontentcontainer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer_maemo.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainer_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer_maemo_p.h
--- a/qtmobility/src/messaging/qmessagecontentcontainer_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer_p.h
--- a/qtmobility/src/messaging/qmessagecontentcontainer_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer_qmf.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainer_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer_stub.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainer_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer_symbian.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainer_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer_symbian_p.h
--- a/qtmobility/src/messaging/qmessagecontentcontainer_symbian_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_symbian_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainer_win.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainer_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainer_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainerid.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainerid.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainerid.h
--- a/qtmobility/src/messaging/qmessagecontentcontainerid.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainerid_maemo.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainerid_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainerid_p.h
--- a/qtmobility/src/messaging/qmessagecontentcontainerid_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainerid_qmf.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainerid_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainerid_stub.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainerid_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainerid_symbian.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainerid_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagecontentcontainerid_win.cpp
--- a/qtmobility/src/messaging/qmessagecontentcontainerid_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagecontentcontainerid_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagedatacomparator.cpp
--- a/qtmobility/src/messaging/qmessagedatacomparator.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagedatacomparator.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagedatacomparator.h
--- a/qtmobility/src/messaging/qmessagedatacomparator.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagedatacomparator.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefilter.cpp
--- a/qtmobility/src/messaging/qmessagefilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefilter.h
--- a/qtmobility/src/messaging/qmessagefilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefilter_maemo.cpp
--- a/qtmobility/src/messaging/qmessagefilter_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefilter_p.h
--- a/qtmobility/src/messaging/qmessagefilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefilter_qmf.cpp
--- a/qtmobility/src/messaging/qmessagefilter_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefilter_stub.cpp
--- a/qtmobility/src/messaging/qmessagefilter_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefilter_symbian.cpp
--- a/qtmobility/src/messaging/qmessagefilter_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefilter_win.cpp
--- a/qtmobility/src/messaging/qmessagefilter_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefilter_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolder.cpp
--- a/qtmobility/src/messaging/qmessagefolder.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolder.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolder.h
--- a/qtmobility/src/messaging/qmessagefolder.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolder.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolder_maemo.cpp
--- a/qtmobility/src/messaging/qmessagefolder_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolder_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolder_p.h
--- a/qtmobility/src/messaging/qmessagefolder_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolder_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolder_qmf.cpp
--- a/qtmobility/src/messaging/qmessagefolder_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolder_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolder_stub.cpp
--- a/qtmobility/src/messaging/qmessagefolder_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolder_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolder_symbian.cpp
--- a/qtmobility/src/messaging/qmessagefolder_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolder_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolder_win.cpp
--- a/qtmobility/src/messaging/qmessagefolder_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolder_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderfilter.cpp
--- a/qtmobility/src/messaging/qmessagefolderfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderfilter.h
--- a/qtmobility/src/messaging/qmessagefolderfilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderfilter_maemo.cpp
--- a/qtmobility/src/messaging/qmessagefolderfilter_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderfilter_p.h
--- a/qtmobility/src/messaging/qmessagefolderfilter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderfilter_qmf.cpp
--- a/qtmobility/src/messaging/qmessagefolderfilter_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderfilter_stub.cpp
--- a/qtmobility/src/messaging/qmessagefolderfilter_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderfilter_symbian.cpp
--- a/qtmobility/src/messaging/qmessagefolderfilter_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderfilter_win.cpp
--- a/qtmobility/src/messaging/qmessagefolderfilter_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderfilter_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderid.cpp
--- a/qtmobility/src/messaging/qmessagefolderid.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderid.h
--- a/qtmobility/src/messaging/qmessagefolderid.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderid_maemo.cpp
--- a/qtmobility/src/messaging/qmessagefolderid_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderid_p.h
--- a/qtmobility/src/messaging/qmessagefolderid_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderid_qmf.cpp
--- a/qtmobility/src/messaging/qmessagefolderid_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderid_stub.cpp
--- a/qtmobility/src/messaging/qmessagefolderid_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderid_symbian.cpp
--- a/qtmobility/src/messaging/qmessagefolderid_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefolderid_win.cpp
--- a/qtmobility/src/messaging/qmessagefolderid_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefolderid_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefoldersortorder.cpp
--- a/qtmobility/src/messaging/qmessagefoldersortorder.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefoldersortorder.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefoldersortorder.h
--- a/qtmobility/src/messaging/qmessagefoldersortorder.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefoldersortorder.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefoldersortorder_maemo.cpp
--- a/qtmobility/src/messaging/qmessagefoldersortorder_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefoldersortorder_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefoldersortorder_p.h
--- a/qtmobility/src/messaging/qmessagefoldersortorder_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefoldersortorder_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefoldersortorder_qmf.cpp
--- a/qtmobility/src/messaging/qmessagefoldersortorder_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefoldersortorder_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefoldersortorder_stub.cpp
--- a/qtmobility/src/messaging/qmessagefoldersortorder_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefoldersortorder_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefoldersortorder_symbian.cpp
--- a/qtmobility/src/messaging/qmessagefoldersortorder_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefoldersortorder_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagefoldersortorder_win.cpp
--- a/qtmobility/src/messaging/qmessagefoldersortorder_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagefoldersortorder_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageglobal.h
--- a/qtmobility/src/messaging/qmessageglobal.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageglobal.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageid.cpp
--- a/qtmobility/src/messaging/qmessageid.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageid.h
--- a/qtmobility/src/messaging/qmessageid.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageid_maemo.cpp
--- a/qtmobility/src/messaging/qmessageid_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageid_p.h
--- a/qtmobility/src/messaging/qmessageid_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageid_qmf.cpp
--- a/qtmobility/src/messaging/qmessageid_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageid_stub.cpp
--- a/qtmobility/src/messaging/qmessageid_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageid_symbian.cpp
--- a/qtmobility/src/messaging/qmessageid_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageid_win.cpp
--- a/qtmobility/src/messaging/qmessageid_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageid_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagemanager.cpp
--- a/qtmobility/src/messaging/qmessagemanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagemanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagemanager.h
--- a/qtmobility/src/messaging/qmessagemanager.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagemanager.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageservice.cpp
--- a/qtmobility/src/messaging/qmessageservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageservice.h
--- a/qtmobility/src/messaging/qmessageservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageservice_maemo.cpp
--- a/qtmobility/src/messaging/qmessageservice_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageservice_maemo_p.h
--- a/qtmobility/src/messaging/qmessageservice_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageservice_qmf.cpp
--- a/qtmobility/src/messaging/qmessageservice_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageservice_stub.cpp
--- a/qtmobility/src/messaging/qmessageservice_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageservice_symbian.cpp
--- a/qtmobility/src/messaging/qmessageservice_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageservice_symbian_p.h
--- a/qtmobility/src/messaging/qmessageservice_symbian_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_symbian_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessageservice_win.cpp
--- a/qtmobility/src/messaging/qmessageservice_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessageservice_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagesortorder.cpp
--- a/qtmobility/src/messaging/qmessagesortorder.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagesortorder.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagesortorder.h
--- a/qtmobility/src/messaging/qmessagesortorder.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagesortorder.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagesortorder_maemo.cpp
--- a/qtmobility/src/messaging/qmessagesortorder_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagesortorder_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagesortorder_p.h
--- a/qtmobility/src/messaging/qmessagesortorder_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagesortorder_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagesortorder_qmf.cpp
--- a/qtmobility/src/messaging/qmessagesortorder_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagesortorder_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagesortorder_stub.cpp
--- a/qtmobility/src/messaging/qmessagesortorder_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagesortorder_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagesortorder_symbian.cpp
--- a/qtmobility/src/messaging/qmessagesortorder_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagesortorder_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagesortorder_win.cpp
--- a/qtmobility/src/messaging/qmessagesortorder_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagesortorder_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore.cpp
--- a/qtmobility/src/messaging/qmessagestore.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore.h
--- a/qtmobility/src/messaging/qmessagestore.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore_maemo.cpp
--- a/qtmobility/src/messaging/qmessagestore_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore_p.h
--- a/qtmobility/src/messaging/qmessagestore_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore_qmf.cpp
--- a/qtmobility/src/messaging/qmessagestore_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore_qmf_p.h
--- a/qtmobility/src/messaging/qmessagestore_qmf_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore_qmf_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore_stub.cpp
--- a/qtmobility/src/messaging/qmessagestore_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore_symbian.cpp
--- a/qtmobility/src/messaging/qmessagestore_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore_symbian_p.h
--- a/qtmobility/src/messaging/qmessagestore_symbian_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore_symbian_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmessagestore_win.cpp
--- a/qtmobility/src/messaging/qmessagestore_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmessagestore_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmfhelpers.cpp
--- a/qtmobility/src/messaging/qmfhelpers.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmfhelpers.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmfhelpers_p.h
--- a/qtmobility/src/messaging/qmfhelpers_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmfhelpers_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmtmengine_symbian.cpp
--- a/qtmobility/src/messaging/qmtmengine_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmtmengine_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qmtmengine_symbian_p.h
--- a/qtmobility/src/messaging/qmtmengine_symbian_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qmtmengine_symbian_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/qtmessaging.h
--- a/qtmobility/src/messaging/qtmessaging.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/qtmessaging.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/telepathyengine_maemo.cpp
--- a/qtmobility/src/messaging/telepathyengine_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/telepathyengine_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/telepathyengine_maemo_p.h
--- a/qtmobility/src/messaging/telepathyengine_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/telepathyengine_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/longstring.cpp
--- a/qtmobility/src/messaging/win32wce/longstring.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/longstring.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/longstring_p.h
--- a/qtmobility/src/messaging/win32wce/longstring_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/longstring_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailaddress.cpp
--- a/qtmobility/src/messaging/win32wce/qmailaddress.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailaddress.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailaddress.h
--- a/qtmobility/src/messaging/win32wce/qmailaddress.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailaddress.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailcodec.cpp
--- a/qtmobility/src/messaging/win32wce/qmailcodec.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailcodec.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailcodec.h
--- a/qtmobility/src/messaging/win32wce/qmailcodec.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailcodec.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailfolderfwd.h
--- a/qtmobility/src/messaging/win32wce/qmailfolderfwd.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailfolderfwd.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailglobal.h
--- a/qtmobility/src/messaging/win32wce/qmailglobal.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailglobal.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailid.cpp
--- a/qtmobility/src/messaging/win32wce/qmailid.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailid.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailid.h
--- a/qtmobility/src/messaging/win32wce/qmailid.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailid.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailinstantiations.cpp
--- a/qtmobility/src/messaging/win32wce/qmailinstantiations.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailinstantiations.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailipc.h
--- a/qtmobility/src/messaging/win32wce/qmailipc.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailipc.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmaillog.cpp
--- a/qtmobility/src/messaging/win32wce/qmaillog.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmaillog.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmaillog.h
--- a/qtmobility/src/messaging/win32wce/qmaillog.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmaillog.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailmessage.cpp
--- a/qtmobility/src/messaging/win32wce/qmailmessage.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailmessage.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailmessage.h
--- a/qtmobility/src/messaging/win32wce/qmailmessage.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailmessage.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailmessage_p.h
--- a/qtmobility/src/messaging/win32wce/qmailmessage_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailmessage_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailmessagefwd.cpp
--- a/qtmobility/src/messaging/win32wce/qmailmessagefwd.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailmessagefwd.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailmessagefwd.h
--- a/qtmobility/src/messaging/win32wce/qmailmessagefwd.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailmessagefwd.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailnamespace.cpp
--- a/qtmobility/src/messaging/win32wce/qmailnamespace.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailnamespace.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailnamespace.h
--- a/qtmobility/src/messaging/win32wce/qmailnamespace.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailnamespace.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailtimestamp.cpp
--- a/qtmobility/src/messaging/win32wce/qmailtimestamp.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailtimestamp.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qmailtimestamp.h
--- a/qtmobility/src/messaging/win32wce/qmailtimestamp.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qmailtimestamp.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qprivateimplementation.cpp
--- a/qtmobility/src/messaging/win32wce/qprivateimplementation.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qprivateimplementation.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qprivateimplementation.h
--- a/qtmobility/src/messaging/win32wce/qprivateimplementation.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qprivateimplementation.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/win32wce/qprivateimplementationdef.h
--- a/qtmobility/src/messaging/win32wce/qprivateimplementationdef.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/win32wce/qprivateimplementationdef.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/winhelpers.cpp
--- a/qtmobility/src/messaging/winhelpers.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/winhelpers.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/messaging/winhelpers_p.h
--- a/qtmobility/src/messaging/winhelpers_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/messaging/winhelpers_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qaudiocapturesource.cpp
--- a/qtmobility/src/multimedia/qaudiocapturesource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qaudiocapturesource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qaudiocapturesource.h
--- a/qtmobility/src/multimedia/qaudiocapturesource.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qaudiocapturesource.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qaudioencodercontrol.cpp
--- a/qtmobility/src/multimedia/qaudioencodercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qaudioencodercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qaudioencodercontrol.h
--- a/qtmobility/src/multimedia/qaudioencodercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qaudioencodercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qaudioendpointselector.cpp
--- a/qtmobility/src/multimedia/qaudioendpointselector.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qaudioendpointselector.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qaudioendpointselector.h
--- a/qtmobility/src/multimedia/qaudioendpointselector.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qaudioendpointselector.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qgraphicsvideoitem.cpp
--- a/qtmobility/src/multimedia/qgraphicsvideoitem.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qgraphicsvideoitem.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qgraphicsvideoitem.h
--- a/qtmobility/src/multimedia/qgraphicsvideoitem.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qgraphicsvideoitem.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qgraphicsvideoitem_maemo5.cpp
--- a/qtmobility/src/multimedia/qgraphicsvideoitem_maemo5.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qgraphicsvideoitem_maemo5.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qimageencodercontrol.cpp
--- a/qtmobility/src/multimedia/qimageencodercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qimageencodercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qimageencodercontrol.h
--- a/qtmobility/src/multimedia/qimageencodercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qimageencodercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qlocalmediaplaylistprovider.cpp
--- a/qtmobility/src/multimedia/qlocalmediaplaylistprovider.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qlocalmediaplaylistprovider.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qlocalmediaplaylistprovider.h
--- a/qtmobility/src/multimedia/qlocalmediaplaylistprovider.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qlocalmediaplaylistprovider.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediacontainercontrol.cpp
--- a/qtmobility/src/multimedia/qmediacontainercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontainercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediacontainercontrol.h
--- a/qtmobility/src/multimedia/qmediacontainercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontainercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediacontent.cpp
--- a/qtmobility/src/multimedia/qmediacontent.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontent.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediacontent.h
--- a/qtmobility/src/multimedia/qmediacontent.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontent.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediacontrol.cpp
--- a/qtmobility/src/multimedia/qmediacontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediacontrol.h
--- a/qtmobility/src/multimedia/qmediacontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediacontrol_p.h
--- a/qtmobility/src/multimedia/qmediacontrol_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediacontrol_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaencodersettings.cpp
--- a/qtmobility/src/multimedia/qmediaencodersettings.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaencodersettings.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaencodersettings.h
--- a/qtmobility/src/multimedia/qmediaencodersettings.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaencodersettings.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaimageviewer.cpp
--- a/qtmobility/src/multimedia/qmediaimageviewer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaimageviewer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaimageviewer.h
--- a/qtmobility/src/multimedia/qmediaimageviewer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaimageviewer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaimageviewerservice.cpp
--- a/qtmobility/src/multimedia/qmediaimageviewerservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaimageviewerservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaimageviewerservice_p.h
--- a/qtmobility/src/multimedia/qmediaimageviewerservice_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaimageviewerservice_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaobject.cpp
--- a/qtmobility/src/multimedia/qmediaobject.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaobject.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaobject.h
--- a/qtmobility/src/multimedia/qmediaobject.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaobject.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaobject_p.h
--- a/qtmobility/src/multimedia/qmediaobject_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaobject_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplayer.cpp
--- a/qtmobility/src/multimedia/qmediaplayer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplayer.h
--- a/qtmobility/src/multimedia/qmediaplayer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplayercontrol.cpp
--- a/qtmobility/src/multimedia/qmediaplayercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplayercontrol.h
--- a/qtmobility/src/multimedia/qmediaplayercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplayercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylist.cpp
--- a/qtmobility/src/multimedia/qmediaplaylist.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylist.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylist.h
--- a/qtmobility/src/multimedia/qmediaplaylist.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylist.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylist_p.h
--- a/qtmobility/src/multimedia/qmediaplaylist_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylist_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylistcontrol.cpp
--- a/qtmobility/src/multimedia/qmediaplaylistcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylistcontrol.h
--- a/qtmobility/src/multimedia/qmediaplaylistcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylistioplugin.cpp
--- a/qtmobility/src/multimedia/qmediaplaylistioplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistioplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylistioplugin.h
--- a/qtmobility/src/multimedia/qmediaplaylistioplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistioplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylistnavigator.cpp
--- a/qtmobility/src/multimedia/qmediaplaylistnavigator.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistnavigator.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylistnavigator.h
--- a/qtmobility/src/multimedia/qmediaplaylistnavigator.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistnavigator.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylistprovider.cpp
--- a/qtmobility/src/multimedia/qmediaplaylistprovider.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistprovider.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylistprovider.h
--- a/qtmobility/src/multimedia/qmediaplaylistprovider.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistprovider.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaplaylistprovider_p.h
--- a/qtmobility/src/multimedia/qmediaplaylistprovider_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaplaylistprovider_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediapluginloader.cpp
--- a/qtmobility/src/multimedia/qmediapluginloader.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediapluginloader.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediapluginloader_p.h
--- a/qtmobility/src/multimedia/qmediapluginloader_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediapluginloader_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediarecorder.cpp
--- a/qtmobility/src/multimedia/qmediarecorder.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediarecorder.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediarecorder.h
--- a/qtmobility/src/multimedia/qmediarecorder.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediarecorder.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediarecordercontrol.cpp
--- a/qtmobility/src/multimedia/qmediarecordercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediarecordercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediarecordercontrol.h
--- a/qtmobility/src/multimedia/qmediarecordercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediarecordercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaresource.cpp
--- a/qtmobility/src/multimedia/qmediaresource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaresource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaresource.h
--- a/qtmobility/src/multimedia/qmediaresource.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaresource.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaservice.cpp
--- a/qtmobility/src/multimedia/qmediaservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaservice.h
--- a/qtmobility/src/multimedia/qmediaservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaservice_p.h
--- a/qtmobility/src/multimedia/qmediaservice_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaservice_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaserviceprovider.cpp
--- a/qtmobility/src/multimedia/qmediaserviceprovider.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaserviceprovider.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaserviceprovider.h
--- a/qtmobility/src/multimedia/qmediaserviceprovider.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaserviceprovider.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediaserviceproviderplugin.h
--- a/qtmobility/src/multimedia/qmediaserviceproviderplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediaserviceproviderplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediastreamscontrol.cpp
--- a/qtmobility/src/multimedia/qmediastreamscontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediastreamscontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediastreamscontrol.h
--- a/qtmobility/src/multimedia/qmediastreamscontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediastreamscontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediatimerange.cpp
--- a/qtmobility/src/multimedia/qmediatimerange.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediatimerange.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmediatimerange.h
--- a/qtmobility/src/multimedia/qmediatimerange.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmediatimerange.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmetadatacontrol.cpp
--- a/qtmobility/src/multimedia/qmetadatacontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmetadatacontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qmetadatacontrol.h
--- a/qtmobility/src/multimedia/qmetadatacontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qmetadatacontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qpaintervideosurface.cpp
--- a/qtmobility/src/multimedia/qpaintervideosurface.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qpaintervideosurface.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qpaintervideosurface_p.h
--- a/qtmobility/src/multimedia/qpaintervideosurface_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qpaintervideosurface_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qradiotuner.cpp
--- a/qtmobility/src/multimedia/qradiotuner.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qradiotuner.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qradiotuner.h
--- a/qtmobility/src/multimedia/qradiotuner.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qradiotuner.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qradiotunercontrol.cpp
--- a/qtmobility/src/multimedia/qradiotunercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qradiotunercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qradiotunercontrol.h
--- a/qtmobility/src/multimedia/qradiotunercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qradiotunercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qsoundeffect_p.h
--- a/qtmobility/src/multimedia/qsoundeffect_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qsoundeffect_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qtmedianamespace.h
--- a/qtmobility/src/multimedia/qtmedianamespace.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qtmedianamespace.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qtmedianamespace.qdoc
--- a/qtmobility/src/multimedia/qtmedianamespace.qdoc	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qtmedianamespace.qdoc	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideodevicecontrol.cpp
--- a/qtmobility/src/multimedia/qvideodevicecontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideodevicecontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideodevicecontrol.h
--- a/qtmobility/src/multimedia/qvideodevicecontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideodevicecontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideoencodercontrol.cpp
--- a/qtmobility/src/multimedia/qvideoencodercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideoencodercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideoencodercontrol.h
--- a/qtmobility/src/multimedia/qvideoencodercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideoencodercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideooutputcontrol.cpp
--- a/qtmobility/src/multimedia/qvideooutputcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideooutputcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideooutputcontrol.h
--- a/qtmobility/src/multimedia/qvideooutputcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideooutputcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideorenderercontrol.cpp
--- a/qtmobility/src/multimedia/qvideorenderercontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideorenderercontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideorenderercontrol.h
--- a/qtmobility/src/multimedia/qvideorenderercontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideorenderercontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideowidget.cpp
--- a/qtmobility/src/multimedia/qvideowidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideowidget.h
--- a/qtmobility/src/multimedia/qvideowidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideowidget_p.h
--- a/qtmobility/src/multimedia/qvideowidget_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidget_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideowidgetcontrol.cpp
--- a/qtmobility/src/multimedia/qvideowidgetcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidgetcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideowidgetcontrol.h
--- a/qtmobility/src/multimedia/qvideowidgetcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowidgetcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideowindowcontrol.cpp
--- a/qtmobility/src/multimedia/qvideowindowcontrol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowindowcontrol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qvideowindowcontrol.h
--- a/qtmobility/src/multimedia/qvideowindowcontrol.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qvideowindowcontrol.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qxvideosurface_maemo5.cpp
--- a/qtmobility/src/multimedia/qxvideosurface_maemo5.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qxvideosurface_maemo5.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/multimedia/qxvideosurface_maemo5_p.h
--- a/qtmobility/src/multimedia/qxvideosurface_maemo5_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/multimedia/qxvideosurface_maemo5_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/contextkitlayer.cpp
--- a/qtmobility/src/publishsubscribe/contextkitlayer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/contextkitlayer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/gconfitem.cpp
--- a/qtmobility/src/publishsubscribe/gconfitem.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/gconfitem.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/gconfitem_p.h
--- a/qtmobility/src/publishsubscribe/gconfitem_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/gconfitem_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/gconflayer_linux.cpp
--- a/qtmobility/src/publishsubscribe/gconflayer_linux.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/gconflayer_linux.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/gconflayer_linux_p.h
--- a/qtmobility/src/publishsubscribe/gconflayer_linux_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/gconflayer_linux_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/pathmapper_proxy_symbian.cpp
--- a/qtmobility/src/publishsubscribe/pathmapper_proxy_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/pathmapper_proxy_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/pathmapper_proxy_symbian_p.h
--- a/qtmobility/src/publishsubscribe/pathmapper_proxy_symbian_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/pathmapper_proxy_symbian_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/clientservercommon.h
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/clientservercommon.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/clientservercommon.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian.cpp
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian_p.h
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pathmapper_symbian_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.cpp
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.h
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pan
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pan	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperserver.pan	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperservermain.cpp
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperservermain.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmapperservermain.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.h
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/pspathmappersession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/qcrmlparser.cpp
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/qcrmlparser.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/qcrmlparser.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/psmapperserver_symbian/qcrmlparser_p.h
--- a/qtmobility/src/publishsubscribe/psmapperserver_symbian/qcrmlparser_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/psmapperserver_symbian/qcrmlparser_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qmallocpool.cpp
--- a/qtmobility/src/publishsubscribe/qmallocpool.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qmallocpool.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qmallocpool_p.h
--- a/qtmobility/src/publishsubscribe/qmallocpool_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qmallocpool_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qpacketprotocol.cpp
--- a/qtmobility/src/publishsubscribe/qpacketprotocol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qpacketprotocol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qpacketprotocol_p.h
--- a/qtmobility/src/publishsubscribe/qpacketprotocol_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qpacketprotocol_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qsystemreadwritelock_p.h
--- a/qtmobility/src/publishsubscribe/qsystemreadwritelock_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qsystemreadwritelock_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qsystemreadwritelock_unix.cpp
--- a/qtmobility/src/publishsubscribe/qsystemreadwritelock_unix.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qsystemreadwritelock_unix.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qsystemreadwritelock_win.cpp
--- a/qtmobility/src/publishsubscribe/qsystemreadwritelock_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qsystemreadwritelock_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qvaluespace.cpp
--- a/qtmobility/src/publishsubscribe/qvaluespace.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qvaluespace.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qvaluespace.h
--- a/qtmobility/src/publishsubscribe/qvaluespace.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qvaluespace.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qvaluespace_p.h
--- a/qtmobility/src/publishsubscribe/qvaluespace_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qvaluespace_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qvaluespacemanager.cpp
--- a/qtmobility/src/publishsubscribe/qvaluespacemanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qvaluespacemanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qvaluespacemanager_p.h
--- a/qtmobility/src/publishsubscribe/qvaluespacemanager_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qvaluespacemanager_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qvaluespacepublisher.cpp
--- a/qtmobility/src/publishsubscribe/qvaluespacepublisher.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qvaluespacepublisher.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qvaluespacepublisher.h
--- a/qtmobility/src/publishsubscribe/qvaluespacepublisher.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qvaluespacepublisher.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qvaluespacesubscriber.cpp
--- a/qtmobility/src/publishsubscribe/qvaluespacesubscriber.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qvaluespacesubscriber.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/qvaluespacesubscriber.h
--- a/qtmobility/src/publishsubscribe/qvaluespacesubscriber.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/qvaluespacesubscriber.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/registrylayer_win.cpp
--- a/qtmobility/src/publishsubscribe/registrylayer_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/registrylayer_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/settingslayer_symbian.cpp
--- a/qtmobility/src/publishsubscribe/settingslayer_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/settingslayer_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/settingslayer_symbian_p.h
--- a/qtmobility/src/publishsubscribe/settingslayer_symbian_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/settingslayer_symbian_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/sharedmemorylayer.cpp
--- a/qtmobility/src/publishsubscribe/sharedmemorylayer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/sharedmemorylayer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/ccentralrepositoryhandler.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cenrepmonitor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/cpublishandsubscribehandler.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/pubsubmonitor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/settingshandlerbase.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/settingsmanager_global.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/settingsmanager_global.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/settingsmanager_global.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositorysearchcriteria.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqcentralrepositoryutils_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribesecuritypolicy.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqpublishandsubscribeutils_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingskey.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.cpp
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.h
--- a/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/publishsubscribe/xqsettingsmanager_symbian/xqsettingsmanager_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/make_sensor.pl
--- a/qtmobility/src/sensors/make_sensor.pl	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/make_sensor.pl	Fri Jun 11 14:26:25 2010 +0300
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #############################################################################
 ##
-## Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+## Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ## All rights reserved.
 ## Contact: Nokia Corporation (qt-info@nokia.com)
 ##
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qaccelerometer.cpp
--- a/qtmobility/src/sensors/qaccelerometer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qaccelerometer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qaccelerometer.h
--- a/qtmobility/src/sensors/qaccelerometer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qaccelerometer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qaccelerometer_p.h
--- a/qtmobility/src/sensors/qaccelerometer_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qaccelerometer_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qambientlightsensor.cpp
--- a/qtmobility/src/sensors/qambientlightsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qambientlightsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qambientlightsensor.h
--- a/qtmobility/src/sensors/qambientlightsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qambientlightsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qambientlightsensor_p.h
--- a/qtmobility/src/sensors/qambientlightsensor_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qambientlightsensor_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qcompass.cpp
--- a/qtmobility/src/sensors/qcompass.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qcompass.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qcompass.h
--- a/qtmobility/src/sensors/qcompass.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qcompass.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qcompass_p.h
--- a/qtmobility/src/sensors/qcompass_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qcompass_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qmagnetometer.cpp
--- a/qtmobility/src/sensors/qmagnetometer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qmagnetometer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qmagnetometer.h
--- a/qtmobility/src/sensors/qmagnetometer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qmagnetometer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qmagnetometer_p.h
--- a/qtmobility/src/sensors/qmagnetometer_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qmagnetometer_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qorientationsensor.cpp
--- a/qtmobility/src/sensors/qorientationsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qorientationsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qorientationsensor.h
--- a/qtmobility/src/sensors/qorientationsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qorientationsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qorientationsensor_p.h
--- a/qtmobility/src/sensors/qorientationsensor_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qorientationsensor_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qproximitysensor.cpp
--- a/qtmobility/src/sensors/qproximitysensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qproximitysensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qproximitysensor.h
--- a/qtmobility/src/sensors/qproximitysensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qproximitysensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qproximitysensor_p.h
--- a/qtmobility/src/sensors/qproximitysensor_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qproximitysensor_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qrotationsensor.cpp
--- a/qtmobility/src/sensors/qrotationsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qrotationsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qrotationsensor.h
--- a/qtmobility/src/sensors/qrotationsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qrotationsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qrotationsensor_p.h
--- a/qtmobility/src/sensors/qrotationsensor_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qrotationsensor_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensor.cpp
--- a/qtmobility/src/sensors/qsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensor.h
--- a/qtmobility/src/sensors/qsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensor_p.h
--- a/qtmobility/src/sensors/qsensor_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensor_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensorbackend.cpp
--- a/qtmobility/src/sensors/qsensorbackend.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensorbackend.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensorbackend.h
--- a/qtmobility/src/sensors/qsensorbackend.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensorbackend.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensormanager.cpp
--- a/qtmobility/src/sensors/qsensormanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensormanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensormanager.h
--- a/qtmobility/src/sensors/qsensormanager.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensormanager.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensorplugin.cpp
--- a/qtmobility/src/sensors/qsensorplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensorplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensorplugin.h
--- a/qtmobility/src/sensors/qsensorplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensorplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensorpluginloader.cpp
--- a/qtmobility/src/sensors/qsensorpluginloader.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensorpluginloader.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qsensorpluginloader_p.h
--- a/qtmobility/src/sensors/qsensorpluginloader_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qsensorpluginloader_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qtapsensor.cpp
--- a/qtmobility/src/sensors/qtapsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qtapsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -59,7 +59,7 @@
 
     \image sensors-coordinates2.jpg
 
-    By default it returns double tap events. The QTapSensor::returnDoubleTapEvents property
+    By default it returns only double tap events. The QTapSensor::returnDoubleTapEvents property
     must be set to false to return individual tap events.
 */
 
@@ -186,8 +186,11 @@
     \property QTapSensor::returnDoubleTapEvents
     \brief a value indicating if double tap events should be reported.
 
-    Set to true (the default) to have the sensor report on double tap events.
-    Set to false to have the sensor report on individual tap events.
+    Set to true (the default) to have the sensor report only on double tap events.
+    Set to false to have the sensor report only on individual tap events.
+
+    It is not possible to have the sensor report both single and double tap events.
+    If both are needed the app should create 2 sensor objects.
 
     Note that you must access this property via QObject::property() and QObject::setProperty().
     The property must be set before calling start().
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qtapsensor.h
--- a/qtmobility/src/sensors/qtapsensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qtapsensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/qtapsensor_p.h
--- a/qtmobility/src/sensors/qtapsensor_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/qtapsensor_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/sensors/sensorlog_p.h
--- a/qtmobility/src/sensors/sensorlog_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/sensors/sensorlog_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/databasemanager.cpp
--- a/qtmobility/src/serviceframework/databasemanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/databasemanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/databasemanager_p.h
--- a/qtmobility/src/serviceframework/databasemanager_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/databasemanager_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/databasemanager_s60.cpp
--- a/qtmobility/src/serviceframework/databasemanager_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/databasemanager_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/databasemanager_s60_p.h
--- a/qtmobility/src/serviceframework/databasemanager_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/databasemanager_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/dberror.cpp
--- a/qtmobility/src/serviceframework/dberror.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/dberror.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/dberror_p.h
--- a/qtmobility/src/serviceframework/dberror_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/dberror_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qabstractsecuritysession.cpp
--- a/qtmobility/src/serviceframework/qabstractsecuritysession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qabstractsecuritysession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qabstractsecuritysession.h
--- a/qtmobility/src/serviceframework/qabstractsecuritysession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qabstractsecuritysession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qservice.h
--- a/qtmobility/src/serviceframework/qservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qservice.qdoc
--- a/qtmobility/src/serviceframework/qservice.qdoc	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qservice.qdoc	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qservicecontext.cpp
--- a/qtmobility/src/serviceframework/qservicecontext.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qservicecontext.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qservicecontext.h
--- a/qtmobility/src/serviceframework/qservicecontext.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qservicecontext.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qservicefilter.cpp
--- a/qtmobility/src/serviceframework/qservicefilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qservicefilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qservicefilter.h
--- a/qtmobility/src/serviceframework/qservicefilter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qservicefilter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qserviceinterfacedescriptor.cpp
--- a/qtmobility/src/serviceframework/qserviceinterfacedescriptor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qserviceinterfacedescriptor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qserviceinterfacedescriptor.h
--- a/qtmobility/src/serviceframework/qserviceinterfacedescriptor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qserviceinterfacedescriptor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qserviceinterfacedescriptor_p.h
--- a/qtmobility/src/serviceframework/qserviceinterfacedescriptor_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qserviceinterfacedescriptor_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qservicemanager.cpp
--- a/qtmobility/src/serviceframework/qservicemanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qservicemanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -63,7 +63,10 @@
         return libNameOrPath;
 
     // try to find plug-in via QLibrary
-    const QStringList paths = QCoreApplication::libraryPaths();
+    QStringList paths = QCoreApplication::libraryPaths();
+#ifdef QTM_PLUGIN_PATH
+    paths << QLatin1String(QTM_PLUGIN_PATH)+QLatin1String("/serviceframework");
+#endif
     for (int i=0; i<paths.count(); i++) {
         QString libPath = QDir::toNativeSeparators(paths[i]) + QDir::separator() + libNameOrPath;
         
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qservicemanager.h
--- a/qtmobility/src/serviceframework/qservicemanager.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qservicemanager.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qserviceplugininterface.cpp
--- a/qtmobility/src/serviceframework/qserviceplugininterface.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qserviceplugininterface.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/qserviceplugininterface.h
--- a/qtmobility/src/serviceframework/qserviceplugininterface.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/qserviceplugininterface.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/servicedatabase.cpp
--- a/qtmobility/src/serviceframework/servicedatabase.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/servicedatabase.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/servicedatabase_p.h
--- a/qtmobility/src/serviceframework/servicedatabase_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/servicedatabase_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/servicemetadata.cpp
--- a/qtmobility/src/serviceframework/servicemetadata.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/servicemetadata.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/servicemetadata_p.h
--- a/qtmobility/src/serviceframework/servicemetadata_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/servicemetadata_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/clientservercommon.h
--- a/qtmobility/src/serviceframework/symbian/clientservercommon.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/clientservercommon.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/databasemanagerserver.cpp
--- a/qtmobility/src/serviceframework/symbian/databasemanagerserver.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/databasemanagerserver.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/databasemanagerserver.h
--- a/qtmobility/src/serviceframework/symbian/databasemanagerserver.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/databasemanagerserver.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/databasemanagerserver.pan
--- a/qtmobility/src/serviceframework/symbian/databasemanagerserver.pan	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/databasemanagerserver.pan	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/databasemanagerserver_global.h
--- a/qtmobility/src/serviceframework/symbian/databasemanagerserver_global.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/databasemanagerserver_global.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/databasemanagersession.cpp
--- a/qtmobility/src/serviceframework/symbian/databasemanagersession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/databasemanagersession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/databasemanagersession.h
--- a/qtmobility/src/serviceframework/symbian/databasemanagersession.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/databasemanagersession.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/databasemanagersignalhandler.cpp
--- a/qtmobility/src/serviceframework/symbian/databasemanagersignalhandler.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/databasemanagersignalhandler.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/databasemanagersignalhandler.h
--- a/qtmobility/src/serviceframework/symbian/databasemanagersignalhandler.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/databasemanagersignalhandler.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/serviceframework/symbian/exe/databasemanagerservermain.cpp
--- a/qtmobility/src/serviceframework/symbian/exe/databasemanagerservermain.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/serviceframework/symbian/exe/databasemanagerservermain.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qhalservice_linux.cpp
--- a/qtmobility/src/systeminfo/qhalservice_linux.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qhalservice_linux.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qhalservice_linux_p.h
--- a/qtmobility/src/systeminfo/qhalservice_linux_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qhalservice_linux_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qnetworkmanagerservice_linux.cpp
--- a/qtmobility/src/systeminfo/qnetworkmanagerservice_linux.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qnetworkmanagerservice_linux.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qnetworkmanagerservice_linux_p.h
--- a/qtmobility/src/systeminfo/qnetworkmanagerservice_linux_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qnetworkmanagerservice_linux_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qnmdbushelper.cpp
--- a/qtmobility/src/systeminfo/qnmdbushelper.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qnmdbushelper.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qnmdbushelper_p.h
--- a/qtmobility/src/systeminfo/qnmdbushelper_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qnmdbushelper_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo.cpp
--- a/qtmobility/src/systeminfo/qsysteminfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -229,14 +229,14 @@
    /*!
   \fn void QSystemDeviceInfo::powerStateChanged(QSystemDeviceInfo::PowerState state)
 
-  This signal is emitted when the power state has changed, such as when a phone gets plugged qint32o the wall.
+  This signal is emitted when the power state has changed, such as when a phone gets plugged in to the wall.
   \a state is the new power state.
  */
 
 /*!
   \fn  void QSystemDeviceInfo::currentProfileChanged(QSystemDeviceInfo::Profile profile)
 
-  This signal is emitted whenever the network profile changes, specified by \a profile.
+  This signal is emitted whenever the users active profile changes, specified by \a profile.
 */
 
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo.h
--- a/qtmobility/src/systeminfo/qsysteminfo.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_linux.cpp
--- a/qtmobility/src/systeminfo/qsysteminfo_linux.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_linux.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_linux_common.cpp
--- a/qtmobility/src/systeminfo/qsysteminfo_linux_common.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_linux_common.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,7 +44,7 @@
 #include <QDir>
 
 #if !defined(QT_NO_DBUS)
-#include <qhalservice_linux_p.h>
+#include "qhalservice_linux_p.h"
 #include <QtDBus/QtDBus>
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusError>
@@ -191,16 +191,7 @@
          break;
      case QSystemInfo::FmradioFeature :
          {
-             const QString sysPath = "/sys/class/video4linux/";
-             const QDir sysDir(sysPath);
-             QStringList filters;
-             filters << "*";
-             QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
-             foreach(const QString dir, sysList) {
-                if (dir.contains("radio")) {
-                    featureSupported = true;
-                }
-            }
+             featureSupported = !(QDir("/sys/class/video4linux/").entryList(QStringList("radio*")).empty());
          }
          break;
      case QSystemInfo::IrFeature :
@@ -284,14 +275,7 @@
          break;
      case QSystemInfo::VideoOutFeature :
          {
-             const QString sysPath = "/sys/class/video4linux/";
-             const QDir sysDir(sysPath);
-             QStringList filters;
-             filters << "*";
-             const QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
-             if(sysList.contains("video")) {
-                 featureSupported = true;
-             }
+             featureSupported = !(QDir("/sys/class/video4linux/").entryList(QStringList("video*")).empty());
          }
          break;
      case QSystemInfo::HapticsFeature:
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_linux_common_p.h
--- a/qtmobility/src/systeminfo/qsysteminfo_linux_common_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_linux_common_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -61,7 +61,7 @@
 #include "qsysteminfo.h"
 #include <qmobilityglobal.h>
 #if !defined(QT_NO_DBUS)
-#include <qhalservice_linux_p.h>
+#include "qhalservice_linux_p.h"
 #endif
 
 QT_BEGIN_HEADER
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_linux_p.h
--- a/qtmobility/src/systeminfo/qsysteminfo_linux_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_linux_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_mac.mm
--- a/qtmobility/src/systeminfo/qsysteminfo_mac.mm	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_mac.mm	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_mac_p.h
--- a/qtmobility/src/systeminfo/qsysteminfo_mac_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_mac_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_maemo.cpp
--- a/qtmobility/src/systeminfo/qsysteminfo_maemo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_maemo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -38,8 +38,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <qsysteminfo.h>
-#include <qsysteminfo_maemo_p.h>
+#include "qsysteminfo.h"
+#include "qsysteminfo_maemo_p.h"
+
 #include <QStringList>
 #include <QSize>
 #include <QFile>
@@ -166,18 +167,6 @@
             }
         }
         break;
-    case QSystemInfo::VideoOutFeature :
-        {
-            const QString sysPath = "/sys/class/video4linux/";
-            const QDir sysDir(sysPath);
-            QStringList filters;
-            filters << "*";
-            const QStringList sysList = sysDir.entryList( filters ,QDir::Dirs, QDir::Name);
-            if(sysList.contains("video0")) {
-                featureSupported = true;
-            }
-        }
-        break;
     case QSystemInfo::HapticsFeature:
         {
            // if(halIsAvailable) {
@@ -1023,23 +1012,23 @@
         emit currentProfileChanged(currentProfile());
 }
 
-void QSystemDeviceInfoPrivate::profileChanged(bool, bool, QString profile, QList<ProfileDataValue> values)
+void QSystemDeviceInfoPrivate::profileChanged(bool changed, bool active, QString profile, QList<ProfileDataValue> values)
 {
-    const QSystemDeviceInfo::Profile previousProfile = currentProfile();
-
-    profileName = profile;
-    foreach (const ProfileDataValue value, values) {
-        if (value.key == "ringing.alert.type")
-            silentProfile = value.val == "silent";
-        else if (value.key == "vibrating.alert.enabled")
-            vibratingAlertEnabled = value.val == "On";
-        else if (value.key == "ringing.alert.volume")
-            ringingAlertVolume = value.val.toInt();
+    if (active) {
+        const QSystemDeviceInfo::Profile previousProfile = currentProfile();
+        profileName = profile;
+        foreach (const ProfileDataValue value, values) {
+            if (value.key == "ringing.alert.type")
+                silentProfile = value.val == "silent";
+            else if (value.key == "vibrating.alert.enabled")
+                vibratingAlertEnabled = value.val == "On";
+            else if (value.key == "ringing.alert.volume")
+                ringingAlertVolume = value.val.toInt();
+        }
+        QSystemDeviceInfo::Profile newProfile = currentProfile();
+        if (previousProfile != newProfile)
+           emit currentProfileChanged(newProfile);
     }
-
-    QSystemDeviceInfo::Profile newProfile = currentProfile();
-    if (previousProfile != newProfile)
-        emit currentProfileChanged(newProfile);
 }
 
 #endif
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_maemo_p.h
--- a/qtmobility/src/systeminfo/qsysteminfo_maemo_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_maemo_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -62,7 +62,7 @@
 #include "qsysteminfo.h"
 #include <qmobilityglobal.h>
 #if !defined(QT_NO_DBUS)
-#include <qhalservice_linux_p.h>
+#include "qhalservice_linux_p.h"
 
 typedef enum
 {
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_s60.cpp
--- a/qtmobility/src/systeminfo/qsysteminfo_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_s60_p.h
--- a/qtmobility/src/systeminfo/qsysteminfo_s60_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_s60_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_win.cpp
--- a/qtmobility/src/systeminfo/qsysteminfo_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qsysteminfo_win_p.h
--- a/qtmobility/src/systeminfo/qsysteminfo_win_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qsysteminfo_win_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qwmihelper_win.cpp
--- a/qtmobility/src/systeminfo/qwmihelper_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qwmihelper_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/qwmihelper_win_p.h
--- a/qtmobility/src/systeminfo/qwmihelper_win_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/qwmihelper_win_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/symbian/chargingstatus_s60.cpp
--- a/qtmobility/src/systeminfo/symbian/chargingstatus_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/symbian/chargingstatus_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/symbian/chargingstatus_s60.h
--- a/qtmobility/src/systeminfo/symbian/chargingstatus_s60.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/symbian/chargingstatus_s60.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/symbian/telephonyinfo_s60.cpp
--- a/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/systeminfo/symbian/telephonyinfo_s60.h
--- a/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/systeminfo/symbian/telephonyinfo_s60.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qvcard21writer.cpp
--- a/qtmobility/src/versit/qvcard21writer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qvcard21writer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qvcard21writer_p.h
--- a/qtmobility/src/versit/qvcard21writer_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qvcard21writer_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qvcard30writer.cpp
--- a/qtmobility/src/versit/qvcard30writer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qvcard30writer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qvcard30writer_p.h
--- a/qtmobility/src/versit/qvcard30writer_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qvcard30writer_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitcontactexporter.cpp
--- a/qtmobility/src/versit/qversitcontactexporter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitcontactexporter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitcontactexporter.h
--- a/qtmobility/src/versit/qversitcontactexporter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitcontactexporter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitcontactexporter_p.cpp
--- a/qtmobility/src/versit/qversitcontactexporter_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitcontactexporter_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitcontactexporter_p.h
--- a/qtmobility/src/versit/qversitcontactexporter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitcontactexporter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitcontactimporter.cpp
--- a/qtmobility/src/versit/qversitcontactimporter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitcontactimporter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitcontactimporter.h
--- a/qtmobility/src/versit/qversitcontactimporter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitcontactimporter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitcontactimporter_p.cpp
--- a/qtmobility/src/versit/qversitcontactimporter_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitcontactimporter_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitcontactimporter_p.h
--- a/qtmobility/src/versit/qversitcontactimporter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitcontactimporter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitdefs_p.h
--- a/qtmobility/src/versit/qversitdefs_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitdefs_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitdocument.cpp
--- a/qtmobility/src/versit/qversitdocument.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitdocument.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitdocument.h
--- a/qtmobility/src/versit/qversitdocument.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitdocument.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitdocument_p.h
--- a/qtmobility/src/versit/qversitdocument_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitdocument_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitdocumentwriter_p.cpp
--- a/qtmobility/src/versit/qversitdocumentwriter_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitdocumentwriter_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitproperty.cpp
--- a/qtmobility/src/versit/qversitproperty.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitproperty.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitproperty.h
--- a/qtmobility/src/versit/qversitproperty.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitproperty.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitproperty_p.h
--- a/qtmobility/src/versit/qversitproperty_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitproperty_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitreader.cpp
--- a/qtmobility/src/versit/qversitreader.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitreader.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitreader.h
--- a/qtmobility/src/versit/qversitreader.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitreader.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitreader_p.cpp
--- a/qtmobility/src/versit/qversitreader_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitreader_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitreader_p.h
--- a/qtmobility/src/versit/qversitreader_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitreader_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitwriter.cpp
--- a/qtmobility/src/versit/qversitwriter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitwriter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitwriter.h
--- a/qtmobility/src/versit/qversitwriter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitwriter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitwriter_p.cpp
--- a/qtmobility/src/versit/qversitwriter_p.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitwriter_p.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/qversitwriter_p.h
--- a/qtmobility/src/versit/qversitwriter_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/qversitwriter_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/versitutils.cpp
--- a/qtmobility/src/versit/versitutils.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/versitutils.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/src/versit/versitutils_p.h
--- a/qtmobility/src/versit/versitutils_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/src/versit/versitutils_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/databasemanager/tst_databasemanager.cpp
--- a/qtmobility/tests/auto/databasemanager/tst_databasemanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/databasemanager/tst_databasemanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/databasemanager/tst_databasemanager_s60.cpp
--- a/qtmobility/tests/auto/databasemanager/tst_databasemanager_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/databasemanager/tst_databasemanager_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp
--- a/qtmobility/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qabstractsecuritysession/tst_qabstractsecuritysession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp
--- a/qtmobility/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qaudiocapturesource/tst_qaudiocapturesource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qbearertestcommon.h
--- a/qtmobility/tests/auto/qbearertestcommon.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qbearertestcommon.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontact/tst_qcontact.cpp
--- a/qtmobility/tests/auto/qcontact/tst_qcontact.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontact/tst_qcontact.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.cpp
--- a/qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin_p.h
--- a/qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactasync/maliciousplugin/maliciousplugin_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactasync/unittest/tst_qcontactasync.cpp
--- a/qtmobility/tests/auto/qcontactasync/unittest/tst_qcontactasync.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactasync/unittest/tst_qcontactasync.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactdetail/tst_qcontactdetail.cpp
--- a/qtmobility/tests/auto/qcontactdetail/tst_qcontactdetail.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactdetail/tst_qcontactdetail.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactdetaildefinition/tst_qcontactdetaildefinition.cpp
--- a/qtmobility/tests/auto/qcontactdetaildefinition/tst_qcontactdetaildefinition.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactdetaildefinition/tst_qcontactdetaildefinition.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactdetails/tst_qcontactdetails.cpp
--- a/qtmobility/tests/auto/qcontactdetails/tst_qcontactdetails.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactdetails/tst_qcontactdetails.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactfilter/tst_qcontactfilter.cpp
--- a/qtmobility/tests/auto/qcontactfilter/tst_qcontactfilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactfilter/tst_qcontactfilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactmanager/tst_qcontactmanager.cpp
--- a/qtmobility/tests/auto/qcontactmanager/tst_qcontactmanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanager/tst_qcontactmanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactmanagerdataholder.h
--- a/qtmobility/tests/auto/qcontactmanagerdataholder.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerdataholder.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactmanagerfiltering/tst_qcontactmanagerfiltering.cpp
--- a/qtmobility/tests/auto/qcontactmanagerfiltering/tst_qcontactmanagerfiltering.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerfiltering/tst_qcontactmanagerfiltering.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp
--- a/qtmobility/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerplugins/dummyotherplugin/dummyotherplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp
--- a/qtmobility/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerplugins/dummyplugin/dummyplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp
--- a/qtmobility/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmanagerplugins/unittest/tst_qcontactmanagerplugins.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactmemusage/tst_qcontactmemusage.cpp
--- a/qtmobility/tests/auto/qcontactmemusage/tst_qcontactmemusage.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactmemusage/tst_qcontactmemusage.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp
--- a/qtmobility/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcontactrelationship/tst_qcontactrelationship.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qcrmlparser/tst_qcrmlparser.cpp
--- a/qtmobility/tests/auto/qcrmlparser/tst_qcrmlparser.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qcrmlparser/tst_qcrmlparser.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp
--- a/qtmobility/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qgeoareamonitor/tst_qgeoareamonitor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp
--- a/qtmobility/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qgeocoordinate/tst_qgeocoordinate.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp
--- a/qtmobility/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qgeoinfosources_wince/tst_qgeoinfosources_wince.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp
--- a/qtmobility/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qgeopositioninfo/tst_qgeopositioninfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qgeopositioninfosource/tst_qgeopositioninfosource.cpp
--- a/qtmobility/tests/auto/qgeopositioninfosource/tst_qgeopositioninfosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qgeopositioninfosource/tst_qgeopositioninfosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp
--- a/qtmobility/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qgeosatelliteinfo/tst_qgeosatelliteinfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qgeosatelliteinfosource/tst_qgeosatelliteinfosource.cpp
--- a/qtmobility/tests/auto/qgeosatelliteinfosource/tst_qgeosatelliteinfosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qgeosatelliteinfosource/tst_qgeosatelliteinfosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp
--- a/qtmobility/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qgraphicsvideoitem/tst_qgraphicsvideoitem.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qlatin1constant/tst_qlatin1constant.cpp
--- a/qtmobility/tests/auto/qlatin1constant/tst_qlatin1constant.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qlatin1constant/tst_qlatin1constant.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qlocationtestutils.cpp
--- a/qtmobility/tests/auto/qlocationtestutils.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qlocationtestutils.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qlocationtestutils_p.h
--- a/qtmobility/tests/auto/qlocationtestutils_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qlocationtestutils_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qlocationutils/tst_qlocationutils.cpp
--- a/qtmobility/tests/auto/qlocationutils/tst_qlocationutils.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qlocationutils/tst_qlocationutils.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmallocpool/tst_qmallocpool.cpp
--- a/qtmobility/tests/auto/qmallocpool/tst_qmallocpool.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmallocpool/tst_qmallocpool.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediacontent/tst_qmediacontent.cpp
--- a/qtmobility/tests/auto/qmediacontent/tst_qmediacontent.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediacontent/tst_qmediacontent.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp
--- a/qtmobility/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediaimageviewer/tst_qmediaimageviewer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp
--- a/qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediaobject/tst_qmediaobject.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediaplayer/tst_qmediaplayer.cpp
--- a/qtmobility/tests/auto/qmediaplayer/tst_qmediaplayer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediaplayer/tst_qmediaplayer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp
--- a/qtmobility/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediaplaylist/tst_qmediaplaylist.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp
--- a/qtmobility/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediaplaylistnavigator/tst_qmediaplaylistnavigator.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp
--- a/qtmobility/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediapluginloader/tst_qmediapluginloader.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediarecorder/tst_qmediarecorder.cpp
--- a/qtmobility/tests/auto/qmediarecorder/tst_qmediarecorder.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediarecorder/tst_qmediarecorder.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediaresource/tst_qmediaresource.cpp
--- a/qtmobility/tests/auto/qmediaresource/tst_qmediaresource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediaresource/tst_qmediaresource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediaservice/tst_qmediaservice.cpp
--- a/qtmobility/tests/auto/qmediaservice/tst_qmediaservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediaservice/tst_qmediaservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp
--- a/qtmobility/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediaserviceprovider/tst_qmediaserviceprovider.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmediatimerange/tst_qmediatimerange.cpp
--- a/qtmobility/tests/auto/qmediatimerange/tst_qmediatimerange.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmediatimerange/tst_qmediatimerange.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmessage/tst_qmessage.cpp
--- a/qtmobility/tests/auto/qmessage/tst_qmessage.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmessage/tst_qmessage.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmessageservice/tst_qmessageservice.cpp
--- a/qtmobility/tests/auto/qmessageservice/tst_qmessageservice.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmessageservice/tst_qmessageservice.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmessagestore/tst_qmessagestore.cpp
--- a/qtmobility/tests/auto/qmessagestore/tst_qmessagestore.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmessagestore/tst_qmessagestore.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp
--- a/qtmobility/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qmessagestorekeys/tst_qmessagestorekeys.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp
--- a/qtmobility/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnetworkconfiguration/tst_qnetworkconfiguration.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -44,6 +44,13 @@
 #include "../../../src/bearer/qnetworkconfiguration.h"
 #include "../../../src/bearer/qnetworkconfigmanager.h"
 
+/*
+  Although this unit test doesn't use QNetworkAccessManager
+  this include is used to ensure that bearer continues to compile against
+  Qt 4.7+ which has a QNetworkConfiguration enabled QNetworkAccessManager
+*/
+#include <QNetworkAccessManager>
+
 #if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
 #include <stdio.h>
 #include <iapconf.h>
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnetworksession/lackey/main.cpp
--- a/qtmobility/tests/auto/qnetworksession/lackey/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnetworksession/lackey/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -46,6 +46,8 @@
 #include "../../../../src/bearer/qnetworkconfiguration.h"
 #include "../../../../src/bearer/qnetworksession.h"
 
+#include <QEventLoop>
+#include <QTimer>
 #include <QDebug>
 
 QTM_USE_NAMESPACE
@@ -59,7 +61,14 @@
 {
     QCoreApplication app(argc, argv);
 
+    // Update configurations so that everything is up to date for this process too.
+    // Event loop is used to wait for awhile.
     QNetworkConfigurationManager manager;
+    manager.updateConfigurations();
+    QEventLoop iIgnoreEventLoop;
+    QTimer::singleShot(3000, &iIgnoreEventLoop, SLOT(quit()));
+    iIgnoreEventLoop.exec();
+
     QList<QNetworkConfiguration> discovered =
         manager.allConfigurations(QNetworkConfiguration::Discovered);
 
@@ -75,7 +84,6 @@
 
     // Cannot read/write to processes on WinCE or Symbian.
     // Easiest alternative is to use sockets for IPC.
-
     QLocalSocket oopSocket;
 
     oopSocket.connectToServer("tst_qnetworksession");
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
--- a/qtmobility/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,5 +1,5 @@
 /****************************************************************************
-**
+** 
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -96,6 +96,7 @@
 
 private:
     QNetworkConfigurationManager manager;
+    QMap<QString, bool> testsToRun;
 
     uint inProcessSessionManagementCount;
 
@@ -113,6 +114,7 @@
 bool openSession(QNetworkSession *session);
 bool closeSession(QNetworkSession *session, bool lastSessionOnConfiguration = true);
 void updateConfigurations();
+void printConfigurations();
 QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfiguration::Type configType);
 
 void tst_QNetworkSession::initTestCase()
@@ -121,7 +123,19 @@
     qRegisterMetaType<QNetworkSession::SessionError>("QNetworkSession::SessionError");
     qRegisterMetaType<QNetworkConfiguration>("QNetworkConfiguration");
     qRegisterMetaType<QNetworkConfiguration::Type>("QNetworkConfiguration::Type");
-
+	
+    // If you wish to skip tests, set value as false. This is often very convinient because tests are so lengthy.
+    // Better way still would be to make this readable from a file.
+    testsToRun["robustnessBombing"] = true;
+    testsToRun["outOfProcessSession"] = true;
+    testsToRun["invalidSession"] = true;
+    testsToRun["repeatedOpenClose"] = true;
+    testsToRun["roamingErrorCodes"] = true;
+    testsToRun["sessionStop"] = true;
+    testsToRun["sessionProperties"] = true;
+    testsToRun["userChoiceSession"] = true;
+    testsToRun["sessionOpenCloseStop"] = true;
+	
 #if defined(Q_WS_MAEMO_6) || defined(Q_WS_MAEMO_5)
     iapconf = new Maemo::IAPConf("007");
     iapconf->setValue("ipv4_type", "AUTO");
@@ -234,6 +248,10 @@
 // Robustness test for calling interfaces in nonsense order / with nonsense parameters
 void tst_QNetworkSession::robustnessBombing() 
 {
+    if (!testsToRun["robustnessBombing"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
+    
     QNetworkConfigurationManager mgr;
     QNetworkSession testSession(mgr.defaultConfiguration());
     // Should not reset even session is not opened
@@ -241,15 +259,14 @@
     testSession.accept();
     testSession.ignore();
     testSession.reject();
-    quint64 temp;
-    temp = testSession.bytesWritten();
-    temp = testSession.bytesReceived();
-    temp = testSession.activeTime();
 }
 
 
 void tst_QNetworkSession::invalidSession()
-{
+{ 
+    if (!testsToRun["invalidSession"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
     // 1. Verify that session created with invalid configuration remains in invalid state
     QNetworkSession session(QNetworkConfiguration(), 0);
     QVERIFY(!session.isOpen());
@@ -264,11 +281,24 @@
            qvariant_cast<QNetworkSession::SessionError> (errorSpy.first().at(0));
     QVERIFY(error == QNetworkSession::InvalidConfigurationError);
     QVERIFY(session.state() == QNetworkSession::Invalid);
+    	
+#ifdef QNETWORKSESSION_MANUAL_TESTS
 
-#ifdef QNETWORKSESSION_MANUAL_TESTS
+    QNetworkConfiguration invalidatedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint);
+    if (invalidatedConfig.isValid()) {
+        // 3. Verify that invalidating a session after its successfully configured works
+        QNetworkSession invalidatedSession(invalidatedConfig);
+        qDebug() << "Delete the WLAN IAP from phone now (waiting 60 seconds): " << invalidatedConfig.name();
+        QTest::qWait(60000);
+        QVERIFY(!invalidatedConfig.isValid());
+        QVERIFY(invalidatedSession.state() == QNetworkSession::Invalid);
+        qDebug() << "Add the WLAN IAP back (waiting 60 seconds): " << invalidatedConfig.name();
+        QTest::qWait(60000);
+    }
+    
     QNetworkConfiguration definedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint);
     if (definedConfig.isValid()) {
-        // 3. Verify that opening a session with defined configuration emits error and enters notavailable-state
+        // 4. Verify that opening a session with defined configuration emits error and enters notavailable-state
         // TODO these timer waits should be changed to waiting appropriate signals, now these wait excessively
         qDebug() << "Shutdown WLAN IAP (waiting 60 seconds): " << definedConfig.name();
         QTest::qWait(60000);
@@ -277,43 +307,27 @@
         QNetworkSession definedSession(definedConfig);
         QSignalSpy errorSpy(&definedSession, SIGNAL(error(QNetworkSession::SessionError)));
         QNetworkSession::SessionError sessionError;
+        updateConfigurations();
 
         definedSession.open();
+#ifdef Q_OS_SYMBIAN
+        // On symbian, the connection opening is tried even with defined state.
+        qDebug("Waiting for 10 seconds to all signals to propagate.");
+        QTest::qWait(10000);
+#endif
+        updateConfigurations();
 
         QVERIFY(definedConfig.isValid()); // Session remains valid
         QVERIFY(definedSession.state() == QNetworkSession::NotAvailable); // State is not available because WLAN is not in coverage
         QVERIFY(!errorSpy.isEmpty()); // Session tells with error about invalidated configuration
         sessionError = qvariant_cast<QNetworkSession::SessionError> (errorSpy.first().at(0));
-        qDebug() << "Error code is: " << sessionError;
         QVERIFY(sessionError == QNetworkSession::InvalidConfigurationError);
-        
         qDebug() << "Turn the WLAN IAP back on (waiting 60 seconds): " << definedConfig.name();
         QTest::qWait(60000);
-        updateConfigurations();
-        
+        updateConfigurations();        
         QVERIFY(definedConfig.state() == QNetworkConfiguration::Discovered);
     }
-        
-    QNetworkConfiguration invalidatedConfig = suitableConfiguration("WLAN",QNetworkConfiguration::InternetAccessPoint);
-    if (invalidatedConfig.isValid()) {
-        // 4. Verify that invalidating a session after its successfully configured works
-        QNetworkSession invalidatedSession(invalidatedConfig);
-        QSignalSpy errorSpy(&invalidatedSession, SIGNAL(error(QNetworkSession::SessionError)));
-        QNetworkSession::SessionError sessionError;
-        
-        qDebug() << "Delete the WLAN IAP from phone now (waiting 60 seconds): " << invalidatedConfig.name();
-        QTest::qWait(60000);
-        
-        invalidatedSession.open();
-        QVERIFY(!invalidatedConfig.isValid());
-        QVERIFY(invalidatedSession.state() == QNetworkSession::Invalid);
-        QVERIFY(!errorSpy.isEmpty());
-        
-        sessionError = qvariant_cast<QNetworkSession::SessionError> (errorSpy.first().at(0));
-        QVERIFY(sessionError == QNetworkSession::InvalidConfigurationError);
-        qDebug() << "Add the WLAN IAP back (waiting 60 seconds): " << invalidatedConfig.name();
-        QTest::qWait(60000);
-    }
+
 #endif
 }
 
@@ -331,12 +345,12 @@
 
 void tst_QNetworkSession::sessionProperties()
 {
+    if (!testsToRun["sessionProperties"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
     QFETCH(QNetworkConfiguration, configuration);
-
     QNetworkSession session(configuration);
-    
     QVERIFY(session.configuration() == configuration);
-
     QStringList validBearerNames = QStringList() << QLatin1String("Unknown")
                                                  << QLatin1String("Ethernet")
                                                  << QLatin1String("WLAN")
@@ -407,7 +421,12 @@
 }
 
 // Tests repeated-open close.
-void tst_QNetworkSession::repeatedOpenClose() {
+void tst_QNetworkSession::repeatedOpenClose() 
+{	
+    if (!testsToRun["repeatedOpenClose"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
+	
     QFETCH(QString, bearerType);
     QFETCH(QNetworkConfiguration::Type, configurationType);
     QFETCH(int, repeatTimes);
@@ -423,13 +442,20 @@
         !closeSession(&permanentSession)) {
         QSKIP("Unable to open/close session, skipping this round of repeated open-close test.", SkipSingle); 
     }
-    for (int i = repeatTimes; i > 0; i--) { 
+    for (int i = 0; i < repeatTimes; i++) { 
+       qDebug() << "Opening, loop number " << i;
        QVERIFY(openSession(&permanentSession));
+       qDebug() << "Closing, loop number, then waiting 5 seconds: " << i;
        QVERIFY(closeSession(&permanentSession));
+       QTest::qWait(5000);
     }
 }
 
-void tst_QNetworkSession::roamingErrorCodes() {
+void tst_QNetworkSession::roamingErrorCodes() 
+{
+    if (!testsToRun["roamingErrorCodes"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }    
 #ifndef Q_OS_SYMBIAN
     QSKIP("Roaming supported on Symbian.", SkipAll);
 #else 
@@ -453,41 +479,11 @@
     adminIapSession.stop(); // requires NetworkControl capabilities
     QTRY_VERIFY(!errorSpy.isEmpty()); // wait for error signals
     QNetworkSession::SessionError error = qvariant_cast<QNetworkSession::SessionError>(errorSpy.first().at(0));
+    QTest::qWait(2000); // Wait for a moment to all platform signals to propagate
     QVERIFY(error == QNetworkSession::SessionAbortedError);
     QVERIFY(iapSession.state() == QNetworkSession::Disconnected);
     QVERIFY(adminIapSession.state() == QNetworkSession::Disconnected);
 #endif // Q_OS_SYMBIAN
-   
-#ifdef QNETWORKSESSION_MANUAL_TESTS
-     // Check for roaming error.
-     // Case requires that you have controllable WLAN in Internet SNAP (only).
-    QNetworkConfiguration snapConfig = suitableConfiguration("bearer_not_relevant_with_snaps", QNetworkConfiguration::ServiceNetwork);
-    if (!snapConfig.isValid()) {
-        QSKIP("No SNAP accessible, skipping test.", SkipAll);
-    }
-    QNetworkSession snapSession(snapConfig);
-    QVERIFY(openSession(&snapSession));
-    QSignalSpy errorSpySnap(&snapSession, SIGNAL(error(QNetworkSession::SessionError)));
-    qDebug("Disconnect the WLAN now");
-    QTRY_VERIFY(!errorSpySnap.isEmpty()); // wait for error signals
-    QVERIFY(errorSpySnap.count() == 1);
-    error = qvariant_cast<QNetworkSession::SessionError>(errorSpySnap.first().at(0));
-    qDebug() << "Error received when turning off wlan on SNAP: " << error;
-    QVERIFY(error == QNetworkSession::RoamingError);
-    
-    qDebug("Connect the WLAN now");
-    QTest::qWait(60000); // Wait for WLAN to get up
-    QNetworkConfiguration wlanIapConfig2 = suitableConfiguration("WLAN", QNetworkConfiguration::InternetAccessPoint);
-    QNetworkSession iapSession2(wlanIapConfig2);
-    QVERIFY(openSession(&iapSession2));
-    QSignalSpy errorSpy2(&iapSession2, SIGNAL(error(QNetworkSession::SessionError)));
-    qDebug("Disconnect the WLAN now");
-    QTRY_VERIFY(!errorSpy2.isEmpty()); // wait for error signals
-    QVERIFY(errorSpy2.count() == 1);
-    error = qvariant_cast<QNetworkSession::SessionError>(errorSpy2.first().at(0));
-    QVERIFY(error == QNetworkSession::SessionAbortedError);
-    QVERIFY(iapSession2.state() == QNetworkSession::Disconnected);
-#endif
 }
 
 
@@ -502,6 +498,9 @@
 
 void tst_QNetworkSession::sessionStop() 
 {
+    if (!testsToRun["sessionStop"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
 #ifndef Q_OS_SYMBIAN
     QSKIP("Testcase contains mainly Symbian specific checks, because it is only platform to really support interface (IAP-level) Stop.", SkipAll);
 #endif 
@@ -509,6 +508,9 @@
     QFETCH(QNetworkConfiguration::Type, configurationType);
     
     int configWaitdelayInMs = 2000;
+	
+    updateConfigurations();
+    printConfigurations();
     
     QNetworkConfiguration config = suitableConfiguration(bearerType, configurationType);
     if (!config.isValid()) {
@@ -526,6 +528,9 @@
     QSignalSpy closedSessionStateChangedSpy(&closedSession, SIGNAL(stateChanged(QNetworkSession::State)));
     QSignalSpy closedErrorSpy(&closedSession, SIGNAL(error(QNetworkSession::SessionError)));
     
+    QSignalSpy openedSessionClosedSpy(&openedSession, SIGNAL(closed()));
+    QSignalSpy openedSessionStateChangedSpy(&openedSession, SIGNAL(stateChanged(QNetworkSession::State)));
+    
     QSignalSpy innocentSessionClosedSpy(&innocentSession, SIGNAL(closed()));
     QSignalSpy innocentSessionStateChangedSpy(&innocentSession, SIGNAL(stateChanged(QNetworkSession::State)));
     QSignalSpy innocentErrorSpy(&innocentSession, SIGNAL(error(QNetworkSession::SessionError)));
@@ -541,10 +546,18 @@
     closedSessionClosedSpy.clear();
     closedSessionStateChangedSpy.clear();
     closedErrorSpy.clear();
+    openedSessionStateChangedSpy.clear();
+    openedSessionClosedSpy.clear();
+    
     openedSession.stop();
 
+    qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs);
+    QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals
+    
+    // First to closing, then to disconnected
+    QVERIFY(openedSessionStateChangedSpy.count() == 2);
+    QVERIFY(!openedSessionClosedSpy.isEmpty());
     QVERIFY(openedSession.state() == QNetworkSession::Disconnected);
-    QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals
     QVERIFY(config.state() != QNetworkConfiguration::Active);
     
     // 2. Verify that stopping a session based on non-connected configuration does nothing
@@ -570,18 +583,20 @@
     // 3. Check that stopping a opened session affects also other opened session based on the same configuration.
     if (config.type() == QNetworkConfiguration::InternetAccessPoint) {
         qDebug("----------3. Check that stopping a opened session affects also other opened session based on the same configuration.");
+	
         QVERIFY(openSession(&openedSession));
         QVERIFY(openSession(&innocentSession));
-
+	    
         configChangeSpy.clear();
         innocentSessionClosedSpy.clear();
         innocentSessionStateChangedSpy.clear();
         innocentErrorSpy.clear();
-      
+        
         openedSession.stop();    
         qDebug("Waiting for %d ms to get all configurationChange signals from platform.", configWaitdelayInMs);
         QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals
-
+	QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals
+	    
         QVERIFY(!innocentSessionClosedSpy.isEmpty());
         QVERIFY(!innocentSessionStateChangedSpy.isEmpty());
         QVERIFY(!innocentErrorSpy.isEmpty());
@@ -601,14 +616,19 @@
     if (config.type() == QNetworkConfiguration::ServiceNetwork) {
         qDebug("----------4. Skip for SNAP configuration.");
     } else if (config.type() == QNetworkConfiguration::InternetAccessPoint) {
-        qDebug("----------4. Check that stopping a non-opened session stops the other session based on the same configuration");
-        QVERIFY(openSession(&innocentSession));
+        qDebug("----------4.   Check that stopping a non-opened session stops the other session based on the same configuration");
+	qDebug("----------4.1 Opening innocent session");
+        QVERIFY(openSession(&innocentSession));    
         qDebug("Waiting for %d ms after open to make sure all platform indications are propagated", configWaitdelayInMs);
         QTest::qWait(configWaitdelayInMs);
+    qDebug("----------4.2 Calling closedSession.stop()");
         closedSession.stop();
         qDebug("Waiting for %d ms to get all configurationChange signals from platform..", configWaitdelayInMs);
         QTest::qWait(configWaitdelayInMs); // Wait to get all relevant configurationChange() signals
     
+	    QTest::qWait(configWaitdelayInMs);
+	    QTest::qWait(configWaitdelayInMs);
+	    
         QVERIFY(!innocentSessionClosedSpy.isEmpty());
         QVERIFY(!innocentSessionStateChangedSpy.isEmpty());
         QVERIFY(!innocentErrorSpy.isEmpty());
@@ -640,6 +660,9 @@
 
 void tst_QNetworkSession::userChoiceSession()
 {
+    if (!testsToRun["userChoiceSession"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
     QFETCH(QNetworkConfiguration, configuration);
 
     QVERIFY(configuration.type() == QNetworkConfiguration::UserChoice);
@@ -669,7 +692,20 @@
 
         session.open();
 
+#if defined(Q_OS_SYMBIAN)
+        // Opening & closing multiple connections in a row sometimes
+        // results hanging of connection opening on Symbian devices
+        // => If first open fails, wait a moment and try again.
+        if (!session.waitForOpened()) {
+            qDebug("**** Session open Timeout - Wait 5 seconds and try once again ****");        
+            session.close();
+            QTest::qWait(5000); // Wait a while before trying to open session again
+            session.open();
+            session.waitForOpened();
+        }
+#else        
         session.waitForOpened();
+#endif        
 
         if (session.isOpen())
             QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty());
@@ -769,6 +805,9 @@
 
 void tst_QNetworkSession::sessionOpenCloseStop()
 {
+    if (!testsToRun["sessionOpenCloseStop"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
     QFETCH(QNetworkConfiguration, configuration);
     QFETCH(bool, forceSessionStop);
 
@@ -801,7 +840,20 @@
 
         session.open();
 
+#if defined(Q_OS_SYMBIAN)
+        // Opening & closing multiple connections in a row sometimes
+        // results hanging of connection opening on Symbian devices
+        // => If first open fails, wait a moment and try again.
+        if (!session.waitForOpened()) {
+            qDebug("**** Session open Timeout - Wait 5 seconds and try once again ****");        
+            session.close();
+            QTest::qWait(5000); // Wait a while before trying to open session again
+            session.open();
+            session.waitForOpened();
+        }
+#else        
         session.waitForOpened();
+#endif        
 
         if (session.isOpen())
             QVERIFY(!sessionOpenedSpy.isEmpty() || !errorSpy.isEmpty());
@@ -875,24 +927,28 @@
         QVERIFY(session.error() == QNetworkSession::UnknownSessionError);
 
         session2.open();
-
+	    
         QTRY_VERIFY(!sessionOpenedSpy2.isEmpty() || !errorSpy2.isEmpty());
 
+        if (errorSpy2.isEmpty()) {
+            QVERIFY(session2.isOpen());
+            QVERIFY(session2.state() == QNetworkSession::Connected);
+        }
         QVERIFY(session.isOpen());
-        QVERIFY(session2.isOpen());
         QVERIFY(session.state() == QNetworkSession::Connected);
-        QVERIFY(session2.state() == QNetworkSession::Connected);
 #if !(defined(Q_OS_SYMBIAN) && defined(__WINS__))
         // On Symbian emulator, the support for data bearers is limited
         QVERIFY(session.interface().isValid());
 #endif
-        QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress());
-        QCOMPARE(session.interface().index(), session2.interface().index());
+        if (errorSpy2.isEmpty()) {
+            QCOMPARE(session.interface().hardwareAddress(), session2.interface().hardwareAddress());
+            QCOMPARE(session.interface().index(), session2.interface().index());
+        }
     }
 
     sessionOpenedSpy2.clear();
 
-    if (forceSessionStop) {
+    if (forceSessionStop && session2.isOpen()) {
         // Test forcing the second session to stop the interface.
         QNetworkSession::State previousState = session.state();
 #ifdef Q_CC_NOKIAX86
@@ -901,15 +957,17 @@
 #else
         bool expectStateChange = previousState != QNetworkSession::Disconnected;
 #endif
-
         session2.stop();
 
+        // QNetworkSession::stop() must result either closed() signal
+        // or error() signal
         QTRY_VERIFY(!sessionClosedSpy2.isEmpty() || !errorSpy2.isEmpty());
-
         QVERIFY(!session2.isOpen());
 
         if (!errorSpy2.isEmpty()) {
-	    QVERIFY(!errorSpy.isEmpty());
+            // QNetworkSession::stop() resulted error() signal for session2
+            // => also session should emit error() signal
+            QTRY_VERIFY(!errorSpy.isEmpty());
 
             // check for SessionAbortedError
             QNetworkSession::SessionError error =
@@ -929,9 +987,12 @@
 
         QVERIFY(errorSpy.isEmpty());
         QVERIFY(errorSpy2.isEmpty());
-
+        
+        // Wait for Disconnected state 
+        QTRY_NOOP(session2.state() == QNetworkSession::Disconnected);
+	
         if (expectStateChange)
-            QTRY_VERIFY(stateChangedSpy2.count() >= 2 || !errorSpy2.isEmpty());
+            QTRY_VERIFY(stateChangedSpy2.count() >= 1 || !errorSpy2.isEmpty());
 
         if (!errorSpy2.isEmpty()) {
             QVERIFY(session2.state() == previousState);
@@ -975,54 +1036,66 @@
                     state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(3).at(0));
                     QVERIFY(state == QNetworkSession::Disconnected);
                     
+			
+                    QTRY_VERIFY(session.state() == QNetworkSession::Roaming ||
+                                session.state() == QNetworkSession::Connected ||
+                                session.state() == QNetworkSession::Disconnected);
+                    
                     QTRY_VERIFY(stateChangedSpy.count() > 0);
-                    state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(0).at(0));
+                    state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 1).at(0));                    
+                    
                     if (state == QNetworkSession::Roaming) {
-                        QTRY_VERIFY(!errorSpy.isEmpty() || stateChangedSpy.count() > 1);
+                        QTRY_VERIFY(session.state() == QNetworkSession::Connected);
+                        QTRY_VERIFY(session2.state() == QNetworkSession::Connected);
+                        roamedSuccessfully = true;
+                    } else if (state == QNetworkSession::Disconnected) {
+                        QTRY_VERIFY(!errorSpy.isEmpty());
+                        QTRY_VERIFY(session2.state() == QNetworkSession::Disconnected);
+                  	} else if (state == QNetworkSession::Connected) {
+                        QTRY_VERIFY(errorSpy.isEmpty());
                         if (stateChangedSpy.count() > 1) {
-                            state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(1).at(0));
-                            if (state == QNetworkSession::Connected) {
-                                roamedSuccessfully = true;
-                                QTRY_VERIFY(session2.state() == QNetworkSession::Disconnected);
-                            }
+                            state = qvariant_cast<QNetworkSession::State>(stateChangedSpy.at(stateChangedSpy.count() - 2).at(0));                        
+                            QVERIFY(state == QNetworkSession::Roaming);
                         }
-                    }
+                        roamedSuccessfully = true;
+                  	}
+
                     if (roamedSuccessfully) {
                         QString configId = session.sessionProperty("ActiveConfiguration").toString();
                         QNetworkConfiguration config = manager.configurationFromIdentifier(configId); 
                         QNetworkSession session3(config);
                         QSignalSpy errorSpy3(&session3, SIGNAL(error(QNetworkSession::SessionError)));
                         QSignalSpy sessionOpenedSpy3(&session3, SIGNAL(opened()));
-                        
                         session3.open();
-                        session3.waitForOpened();
-                        
+                        session3.waitForOpened();      
                         if (session.isOpen())
                             QVERIFY(!sessionOpenedSpy3.isEmpty() || !errorSpy3.isEmpty());
-                        
                         session.stop();
-
                         QTRY_VERIFY(session.state() == QNetworkSession::Disconnected);
-                        QTRY_VERIFY(session3.state() == QNetworkSession::Disconnected);
                     }
 #ifndef Q_CC_NOKIAX86
                     if (!roamedSuccessfully)
                         QVERIFY(!errorSpy.isEmpty());
 #endif
                 } else {
-                    QCOMPARE(stateChangedSpy2.count(), 2);
-
-                    QNetworkSession::State state =
-                        qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0));
-                    QVERIFY(state == QNetworkSession::Closing);
-
-                    state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(1).at(0));
-                    QVERIFY(state == QNetworkSession::Disconnected);
+                    QTest::qWait(2000); // Wait awhile to get all signals from platform
+        
+                    if (stateChangedSpy2.count() == 2)  {
+                        QNetworkSession::State state =
+                            qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0));
+                        QVERIFY(state == QNetworkSession::Closing);
+                        state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(1).at(0));
+                        QVERIFY(state == QNetworkSession::Disconnected);
+                    } else { // Assume .count() == 1
+                        QCOMPARE(stateChangedSpy2.count(), 1); 
+                        QNetworkSession::State state = qvariant_cast<QNetworkSession::State>(stateChangedSpy2.at(0).at(0));
+                         // Symbian version dependant.
+                        QVERIFY(state == QNetworkSession::Disconnected);	
+                    }
                 }
 
                 QTRY_VERIFY(!sessionClosedSpy.isEmpty());
-                QVERIFY(session.state() == QNetworkSession::Disconnected);
-                QVERIFY(session2.state() == QNetworkSession::Disconnected);
+                QTRY_VERIFY(session.state() == QNetworkSession::Disconnected);
             }
 
             QVERIFY(errorSpy2.isEmpty());
@@ -1041,7 +1114,7 @@
         QVERIFY(!session.isOpen());
 #endif
         QVERIFY(!session2.isOpen());
-    } else {
+    } else if (session2.isOpen()) {
         // Test closing the second session.
         {
             int stateChangedCountBeforeClose = stateChangedSpy2.count();
@@ -1138,9 +1211,15 @@
 // at Discovered -state.
 void tst_QNetworkSession::outOfProcessSession()
 {
+    if (!testsToRun["outOfProcessSession"]) {
+	QSKIP("Temporary skip due to value set false (or it is missing) in testsToRun map", SkipAll);    
+    }
 #if defined(Q_OS_SYMBIAN) && defined(__WINS__)
     QSKIP("Symbian emulator does not support two [QR]PRocesses linking a dll (QtBearer.dll) with global writeable static data.", SkipAll);
 #endif
+	updateConfigurations();	   
+	QTest::qWait(2000);
+	
     QNetworkConfigurationManager manager;
     // Create a QNetworkConfigurationManager to detect configuration changes made in Lackey. This
     // is actually the essence of this testcase - to check that platform mediates/reflects changes
@@ -1161,6 +1240,7 @@
     lackey.start("qnetworksessionlackey");
     QVERIFY(lackey.waitForStarted());
 
+
     QVERIFY(oopServer.waitForNewConnection(-1));
     QLocalSocket *oopSocket = oopServer.nextPendingConnection();
 
@@ -1241,6 +1321,7 @@
     // Refresh configurations and derive configurations matching given parameters.
     QNetworkConfigurationManager mgr;
     QSignalSpy updateSpy(&mgr, SIGNAL(updateCompleted()));
+    
     mgr.updateConfigurations();
     QTRY_NOOP(updateSpy.count() == 1);
     if (updateSpy.count() != 1) {
@@ -1249,8 +1330,7 @@
     }
     QList<QNetworkConfiguration> discoveredConfigs = mgr.allConfigurations(QNetworkConfiguration::Discovered);
     foreach(QNetworkConfiguration config, discoveredConfigs) {
-        if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {
-            // qDebug() << "Dumping config because is active: " << config.name();
+        if ((config.state() & QNetworkConfiguration::Active) == QNetworkConfiguration::Active) {        
             discoveredConfigs.removeOne(config);
         } else if (config.type() != configType) {
             // qDebug() << "Dumping config because type (IAP/SNAP) mismatches: " << config.name();
@@ -1287,9 +1367,23 @@
     QTRY_NOOP(updateSpy.count() == 1);
 }
 
+// A convinience-function: updates and prints all available confiurations and their states
+void printConfigurations()
+{
+    QNetworkConfigurationManager manager;
+    QList<QNetworkConfiguration> allConfigs =
+    manager.allConfigurations();
+    qDebug("tst_QNetworkSession::printConfigurations QNetworkConfigurationManager gives following configurations: ");
+    foreach(QNetworkConfiguration config, allConfigs) {
+        qDebug() << "Name of the configuration: " << config.name();
+        qDebug() << "State of the configuration: " << config.state();
+    }
+}
+
 // A convinience function for test-cases: opens the given configuration and return
 // true if it was done gracefully.
 bool openSession(QNetworkSession *session) {
+    bool result = true;
     QNetworkConfigurationManager mgr;
     QSignalSpy openedSpy(session, SIGNAL(opened()));
     QSignalSpy stateChangeSpy(session, SIGNAL(stateChanged(QNetworkSession::State)));
@@ -1299,43 +1393,57 @@
     // active by some other session
     QNetworkConfiguration::StateFlags configInitState = session->configuration().state();
     QNetworkSession::State sessionInitState = session->state();
+    qDebug() << "tst_QNetworkSession::openSession() name of the configuration to be opened:  " << session->configuration().name();
+    qDebug() << "tst_QNetworkSession::openSession() state of the configuration to be opened:  " << session->configuration().state();
+    qDebug() << "tst_QNetworkSession::openSession() state of the session to be opened:  " << session->state();
 
     if (session->isOpen() ||
         !session->sessionProperty("ActiveConfiguration").toString().isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: session was already open / active.");
-        return false;
+        result = false;
     } else {
         session->open();
         session->waitForOpened(120000); // Bringing interfaces up and down may take time at platform
     }
+    QTest::qWait(5000); // Wait a moment to ensure all signals are propagated
     // Check that connection opening went by the book. Add checks here if more strictness needed.
     if (!session->isOpen()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::open() failed.");
-        return false;
+        result =  false;
     }
     if (openedSpy.count() != 1) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::opened() - signal not received.");
-        return false;
+        result =  false;
     }
     if (!errorSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::error() - signal was detected.");
-        return false;
+        result = false;
     }
     if (sessionInitState != QNetworkSession::Connected && 
         stateChangeSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkSession::stateChanged() - signals not detected.");
-        return false;
+        result =  false;
     }
     if (configInitState != QNetworkConfiguration::Active && 
         configChangeSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::openSession() failure: QNetworkConfigurationManager::configurationChanged() - signals not detected.");
-        return false;
+        result =  false;
     }
     if (session->configuration().state() != QNetworkConfiguration::Active) {
         qDebug("tst_QNetworkSession::openSession() failure: session's configuration is not in 'Active' -state.");
-        return false;
+	qDebug() << "tst_QNetworkSession::openSession() state is:  " << session->configuration().state();
+        result =  false;
     }
-    return true;
+    if (result == false) {
+	    qDebug() << "tst_QNetworkSession::openSession() opening session failed.";
+    } else {
+	    qDebug() << "tst_QNetworkSession::openSession() opening session succeeded.";
+    }
+    qDebug() << "tst_QNetworkSession::openSession() name of the configuration is:  " << session->configuration().name();
+    qDebug() << "tst_QNetworkSession::openSession() configuration state is:  " << session->configuration().state();
+    qDebug() << "tst_QNetworkSession::openSession() session state is:  " << session->state();
+	    
+    return result;
 }
 
 // Helper function for closing opened session. Performs checks that 
@@ -1348,6 +1456,11 @@
         qDebug("tst_QNetworkSession::closeSession() failure: NULL session given");
         return false;
     }
+    
+    qDebug() << "tst_QNetworkSession::closeSession() name of the configuration to be closed:  " << session->configuration().name();
+    qDebug() << "tst_QNetworkSession::closeSession() state of the configuration to be closed:  " << session->configuration().state();
+    qDebug() << "tst_QNetworkSession::closeSession() state of the session to be closed:  " << session->state();
+    
     if (session->state() != QNetworkSession::Connected || 
         !session->isOpen()) {
         qDebug("tst_QNetworkSession::closeSession() failure: session is not opened.");
@@ -1359,38 +1472,48 @@
     QSignalSpy sessionErrorSpy(session, SIGNAL(error(QNetworkSession::SessionError)));
     QSignalSpy configChangeSpy(&mgr, SIGNAL(configurationChanged(QNetworkConfiguration)));
     
+    bool result = true;
     session->close();
+    QTest::qWait(5000); // Wait a moment so that all signals are propagated
     
     if (!sessionErrorSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::error() received.");
-        return false;
+        result = false;
     }
     if (sessionClosedSpy.count() != 1) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::closed() signal not received.");
-        return false;
+        result = false;
     }
     if (lastSessionOnConfiguration && 
         sessionStateChangedSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession::stateChanged() signals not received.");
-        return false;
+        result = false;
     }
     if (lastSessionOnConfiguration &&
         session->state() != QNetworkSession::Disconnected) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkSession is not in Disconnected -state");
-        return false;
+        result = false;
     }
     QTRY_NOOP(!configChangeSpy.isEmpty());
     if (lastSessionOnConfiguration &&
         configChangeSpy.isEmpty()) {
         qDebug("tst_QNetworkSession::closeSession() failure: QNetworkConfigurationManager::configurationChanged() - signal not detected.");
-        return false;
+        result = false;
     }
     if (lastSessionOnConfiguration &&
         session->configuration().state() == QNetworkConfiguration::Active) {
          qDebug("tst_QNetworkSession::closeSession() failure: session's configuration is still in active state.");
-         return false;
+         result = false;
     }
-    return true;
+    if (result == false) {
+	    qDebug() << "tst_QNetworkSession::closeSession() closing session failed.";
+    } else {
+	    qDebug() << "tst_QNetworkSession::closeSession() closing session succeeded.";
+    } 
+    qDebug() << "tst_QNetworkSession::closeSession() name of the configuration is:  " << session->configuration().name();
+    qDebug() << "tst_QNetworkSession::closeSession() configuration state is:  " << session->configuration().state();
+    qDebug() << "tst_QNetworkSession::closeSession() session state is:  " << session->state();
+    return result;
 }
 
 QTEST_MAIN(tst_QNetworkSession)
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp
--- a/qtmobility/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h
--- a/qtmobility/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/qnmeapositioninfosourceproxyfactory.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp
--- a/qtmobility/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/tst_dummynmeapositioninfosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp
--- a/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h
--- a/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp
--- a/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp
--- a/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_realtime_generic.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,7 +1,7 @@
 
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp
--- a/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp
--- a/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qnmeapositioninfosource/tst_qnmeapositioninfosource_simulation_generic.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qpacket/tst_qpacket.cpp
--- a/qtmobility/tests/auto/qpacket/tst_qpacket.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qpacket/tst_qpacket.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp
--- a/qtmobility/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qpacketprotocol/tst_qpacketprotocol.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp
--- a/qtmobility/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qpaintervideosurface/tst_qpaintervideosurface.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qradioplayer/tst_qradioplayer.cpp
--- a/qtmobility/tests/auto/qradioplayer/tst_qradioplayer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qradioplayer/tst_qradioplayer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qradiotuner/tst_qradiotuner.cpp
--- a/qtmobility/tests/auto/qradiotuner/tst_qradiotuner.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qradiotuner/tst_qradiotuner.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsensor/main.cpp
--- a/qtmobility/tests/auto/qsensor/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsensor/test_sensor.cpp
--- a/qtmobility/tests/auto/qsensor/test_sensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/test_sensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsensor/test_sensor.h
--- a/qtmobility/tests/auto/qsensor/test_sensor.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/test_sensor.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsensor/test_sensor_p.h
--- a/qtmobility/tests/auto/qsensor/test_sensor_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/test_sensor_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsensor/test_sensorimpl.cpp
--- a/qtmobility/tests/auto/qsensor/test_sensorimpl.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/test_sensorimpl.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsensor/test_sensorimpl.h
--- a/qtmobility/tests/auto/qsensor/test_sensorimpl.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/test_sensorimpl.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsensor/test_sensorplugin.cpp
--- a/qtmobility/tests/auto/qsensor/test_sensorplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/test_sensorplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsensor/tst_qsensor.cpp
--- a/qtmobility/tests/auto/qsensor/tst_qsensor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsensor/tst_qsensor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qservicecontext/tst_qservicecontext.cpp
--- a/qtmobility/tests/auto/qservicecontext/tst_qservicecontext.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qservicecontext/tst_qservicecontext.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qservicefilter/tst_qservicefilter.cpp
--- a/qtmobility/tests/auto/qservicefilter/tst_qservicefilter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qservicefilter/tst_qservicefilter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp
--- a/qtmobility/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qserviceinterfacedescriptor/tst_qserviceinterfacedescriptor.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qservicemanager/tst_qservicemanager.cpp
--- a/qtmobility/tests/auto/qservicemanager/tst_qservicemanager.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qservicemanager/tst_qservicemanager.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsfwtestutil.cpp
--- a/qtmobility/tests/auto/qsfwtestutil.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsfwtestutil.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsfwtestutil.h
--- a/qtmobility/tests/auto/qsfwtestutil.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsfwtestutil.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp
--- a/qtmobility/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsystemdeviceinfo/tst_qsystemdeviceinfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp
--- a/qtmobility/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsystemdisplayinfo/tst_qsystemdisplayinfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsysteminfo/tst_qsysteminfo.cpp
--- a/qtmobility/tests/auto/qsysteminfo/tst_qsysteminfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsysteminfo/tst_qsysteminfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsysteminfotestcommon.h
--- a/qtmobility/tests/auto/qsysteminfotestcommon.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsysteminfotestcommon.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp
--- a/qtmobility/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsystemnetworkinfo/tst_qsystemnetworkinfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp
--- a/qtmobility/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsystemreadwritelock/tst_qsystemreadwritelock.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsystemreadwritelock_oop/common.h
--- a/qtmobility/tests/auto/qsystemreadwritelock_oop/common.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsystemreadwritelock_oop/common.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsystemreadwritelock_oop/lackey/main.cpp
--- a/qtmobility/tests/auto/qsystemreadwritelock_oop/lackey/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsystemreadwritelock_oop/lackey/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp
--- a/qtmobility/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsystemreadwritelock_oop/tst_qsystemreadwritelock_oop.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp
--- a/qtmobility/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsystemscreensaver/tst_qsystemscreensaver.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp
--- a/qtmobility/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qsystemstorageinfo/tst_qsystemstorageinfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvaluespace/tst_qvaluespace.cpp
--- a/qtmobility/tests/auto/qvaluespace/tst_qvaluespace.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvaluespace/tst_qvaluespace.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp
--- a/qtmobility/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvaluespacepublisher/tst_qvaluespacepublisher.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvaluespacesubscriber/lackey/main.cpp
--- a/qtmobility/tests/auto/qvaluespacesubscriber/lackey/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvaluespacesubscriber/lackey/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp
--- a/qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber/tst_qvaluespacesubscriber.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.cpp
--- a/qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscriber_oop/tst_qvaluespacesubscriber_oop.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp
--- a/qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.h
--- a/qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvaluespacesubscriber/tst_qvaluespacesubscribershared.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvcard21writer/tst_qvcard21writer.cpp
--- a/qtmobility/tests/auto/qvcard21writer/tst_qvcard21writer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvcard21writer/tst_qvcard21writer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvcard21writer/tst_qvcard21writer.h
--- a/qtmobility/tests/auto/qvcard21writer/tst_qvcard21writer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvcard21writer/tst_qvcard21writer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvcard30writer/tst_qvcard30writer.cpp
--- a/qtmobility/tests/auto/qvcard30writer/tst_qvcard30writer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvcard30writer/tst_qvcard30writer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvcard30writer/tst_qvcard30writer.h
--- a/qtmobility/tests/auto/qvcard30writer/tst_qvcard30writer.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvcard30writer/tst_qvcard30writer.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversit/tst_qversit.cpp
--- a/qtmobility/tests/auto/qversit/tst_qversit.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversit/tst_qversit.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversit/tst_qversit.h
--- a/qtmobility/tests/auto/qversit/tst_qversit.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversit/tst_qversit.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.cpp
--- a/qtmobility/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.h
--- a/qtmobility/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitcontactexporter/tst_qversitcontactexporter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.cpp
--- a/qtmobility/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.h
--- a/qtmobility/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitcontactimporter/tst_qversitcontactimporter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitdocument/tst_qversitdocument.cpp
--- a/qtmobility/tests/auto/qversitdocument/tst_qversitdocument.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitdocument/tst_qversitdocument.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitdocument/tst_qversitdocument.h
--- a/qtmobility/tests/auto/qversitdocument/tst_qversitdocument.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitdocument/tst_qversitdocument.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitproperty/tst_qversitproperty.cpp
--- a/qtmobility/tests/auto/qversitproperty/tst_qversitproperty.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitproperty/tst_qversitproperty.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitproperty/tst_qversitproperty.h
--- a/qtmobility/tests/auto/qversitproperty/tst_qversitproperty.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitproperty/tst_qversitproperty.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitreader/tst_qversitreader.cpp
--- a/qtmobility/tests/auto/qversitreader/tst_qversitreader.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitreader/tst_qversitreader.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitreader/tst_qversitreader.h
--- a/qtmobility/tests/auto/qversitreader/tst_qversitreader.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitreader/tst_qversitreader.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitwriter/tst_qversitwriter.cpp
--- a/qtmobility/tests/auto/qversitwriter/tst_qversitwriter.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitwriter/tst_qversitwriter.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qversitwriter/tst_qversitwriter.h
--- a/qtmobility/tests/auto/qversitwriter/tst_qversitwriter.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qversitwriter/tst_qversitwriter.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/qvideowidget/tst_qvideowidget.cpp
--- a/qtmobility/tests/auto/qvideowidget/tst_qvideowidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/qvideowidget/tst_qvideowidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/servicedatabase/tst_servicedatabase.cpp
--- a/qtmobility/tests/auto/servicedatabase/tst_servicedatabase.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/servicedatabase/tst_servicedatabase.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/servicemetadata/tst_servicemetadata.cpp
--- a/qtmobility/tests/auto/servicemetadata/tst_servicemetadata.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/servicemetadata/tst_servicemetadata.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/support/support.h
--- a/qtmobility/tests/auto/support/support.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/support/support.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/support/support_maemo5.cpp
--- a/qtmobility/tests/auto/support/support_maemo5.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/support/support_maemo5.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/support/support_qmf.cpp
--- a/qtmobility/tests/auto/support/support_qmf.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/support/support_qmf.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/support/support_stub.cpp
--- a/qtmobility/tests/auto/support/support_stub.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/support/support_stub.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/support/support_symbian.cpp
--- a/qtmobility/tests/auto/support/support_symbian.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/support/support_symbian.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/support/support_win.cpp
--- a/qtmobility/tests/auto/support/support_win.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/support/support_win.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp
--- a/qtmobility/tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qmediaobject_s60/tst_qmediaobject_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/symbian/qmediaplayer_s60/tst_qmediaplayer_s60.cpp
--- a/qtmobility/tests/auto/symbian/qmediaplayer_s60/tst_qmediaplayer_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qmediaplayer_s60/tst_qmediaplayer_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/symbian/qmediaplaylist_s60/tst_qmediaplaylist_s60.cpp
--- a/qtmobility/tests/auto/symbian/qmediaplaylist_s60/tst_qmediaplaylist_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qmediaplaylist_s60/tst_qmediaplaylist_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp
--- a/qtmobility/tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qmediarecorder_s60/tst_qmediarecorder_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/symbian/qradiotuner_s60/tst_qradiotuner_s60.cpp
--- a/qtmobility/tests/auto/symbian/qradiotuner_s60/tst_qradiotuner_s60.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/symbian/qradiotuner_s60/tst_qradiotuner_s60.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/testqgeopositioninfosource.cpp
--- a/qtmobility/tests/auto/testqgeopositioninfosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/testqgeopositioninfosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/testqgeopositioninfosource_p.h
--- a/qtmobility/tests/auto/testqgeopositioninfosource_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/testqgeopositioninfosource_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/testqgeosatelliteinfosource.cpp
--- a/qtmobility/tests/auto/testqgeosatelliteinfosource.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/testqgeosatelliteinfosource.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/auto/testqgeosatelliteinfosource_p.h
--- a/qtmobility/tests/auto/testqgeosatelliteinfosource_p.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/auto/testqgeosatelliteinfosource_p.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/bearerex/bearerex.cpp
--- a/qtmobility/tests/bearerex/bearerex.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/bearerex/bearerex.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
@@ -299,8 +299,12 @@
 
 SessionTab::~SessionTab()
 {
+    // Need to be nulled, because modal dialogs may return after destruction of this object and
+    // use already released resources.
     delete m_NetworkSession;
+    m_NetworkSession = NULL;
     delete m_http;
+    m_http = NULL;
 }
 
 void SessionTab::on_createQHttpButton_clicked()
@@ -550,10 +554,16 @@
         msgBox.setText(QString("HTTP request finished successfully.\nReceived ")+QString::number(result.length())+QString(" bytes."));
     }
     msgBox.exec();
-    
-    sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+
-                                 QString(" / ")+
-                                 QString::number(m_NetworkSession->bytesReceived()));
+    // Check if the networksession still exists - it may have gone after returning from
+    // the modal dialog (in the case that app has been closed, and deleting QHttp will
+    // trigger the done() invokation).
+    if (m_NetworkSession) {
+        sentRecDataLineEdit->setText(QString::number(m_NetworkSession->bytesWritten())+
+                                     QString(" / ")+
+                                     QString::number(m_NetworkSession->bytesReceived()));
+    } else {
+        sentRecDataLineEdit->setText("Data amounts not available.");
+    }
 }
 
 // End of file
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/bearerex/bearerex.h
--- a/qtmobility/tests/bearerex/bearerex.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/bearerex/bearerex.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/bearerex/main.cpp
--- a/qtmobility/tests/bearerex/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/bearerex/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/bearerex/xqlistwidget.cpp
--- a/qtmobility/tests/bearerex/xqlistwidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/bearerex/xqlistwidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/bearerex/xqlistwidget.h
--- a/qtmobility/tests/bearerex/xqlistwidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/bearerex/xqlistwidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/benchmarks/contacts/tst_bm_contacts.cpp
--- a/qtmobility/tests/benchmarks/contacts/tst_bm_contacts.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/benchmarks/contacts/tst_bm_contacts.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/benchmarks/messaging/tst_messaging.cpp
--- a/qtmobility/tests/benchmarks/messaging/tst_messaging.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/benchmarks/messaging/tst_messaging.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp
--- a/qtmobility/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/benchmarks/qsysteminfo/tst_qsysteminfo.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.cpp
--- a/qtmobility/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.h
--- a/qtmobility/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/benchmarks/sampleserviceplugin/sampleserviceplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/benchmarks/serviceframework/tst_serviceframework.cpp
--- a/qtmobility/tests/benchmarks/serviceframework/tst_serviceframework.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/benchmarks/serviceframework/tst_serviceframework.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/messagingex/main.cpp
--- a/qtmobility/tests/messagingex/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/messagingex/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/messagingex/messagingex.cpp
--- a/qtmobility/tests/messagingex/messagingex.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/messagingex/messagingex.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/messagingex/messagingex.h
--- a/qtmobility/tests/messagingex/messagingex.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/messagingex/messagingex.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/networkmanager/README
--- a/qtmobility/tests/networkmanager/README	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-This application serves as prototype/test-bed for NetworkManager development. The excellent (non-existing) documentation
-for the various NetworkManager interfaces makes this harder than it should be.
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/networkmanager/dialog.ui
--- a/qtmobility/tests/networkmanager/dialog.ui	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>919</width>
-    <height>657</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>Connections</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QTreeWidget" name="cons">
-       <column>
-        <property name="text">
-         <string>Path</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>State</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>Id</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>Settings</string>
-        </property>
-       </column>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Devices:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QTreeWidget" name="devicesTreeWidget">
-       <column>
-        <property name="text">
-         <string>Path</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>Managed</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>Interface</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>Driver</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>Type</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>State</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>IP4 Address</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>IP4 Config</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>Hostname</string>
-        </property>
-       </column>
-       <column>
-        <property name="text">
-         <string>Domains</string>
-        </property>
-       </column>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="2" column="0">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>908</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="3" column="0">
-    <widget class="QTreeWidget" name="accessPointsTreeWidget">
-     <property name="sortingEnabled">
-      <bool>true</bool>
-     </property>
-     <column>
-      <property name="text">
-       <string>SSID</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Strength</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Wpa</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Rsn</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Freq</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Hardware Address</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Mode</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Max Bitrate</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item row="4" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_3">
-     <item>
-      <widget class="QPushButton" name="startButton">
-       <property name="text">
-        <string>Start</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="stopButton">
-       <property name="text">
-        <string>Stop</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="scanButton">
-       <property name="text">
-        <string>Scan</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="updateButton">
-       <property name="text">
-        <string>Update</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/networkmanager/networkmanager.pro
--- a/qtmobility/tests/networkmanager/networkmanager.pro	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-SOURCES  += networkmanagertest.cpp nmview.cpp
-HEADERS  += nmview.h
-TARGET = tst_networkmanagertest
-
-QT = core network dbus gui
-
-#not really a test case but deployment happens same way
-CONFIG += testcase
-
-requires(contains(QT_CONFIG,dbus))
-
-INCLUDEPATH += ../../src/bearer
-include(../../common.pri)
-
-CONFIG += mobility
-MOBILITY = bearer
-
-#MOC_DIR = .moc
-#OBJECTS_DIR = .obj
-FORMS += dialog.ui
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/networkmanager/networkmanagertest.cpp
--- a/qtmobility/tests/networkmanager/networkmanagertest.cpp	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,287 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QDBusConnection>
-#include <QDBusError>
-#include <QDBusInterface>
-#include <QDBusMessage>
-#include <QDBusReply>
-#include <QtDBus>
-#include <QHostAddress>
-#include <QDebug>
-#include <NetworkManager/NetworkManager.h>
-#include <QApplication>
-#include <QMainWindow>
-#include "nmview.h"
-
-#include <arpa/inet.h>
-
-typedef QMap< QString, QMap<QString,QVariant> > SettingsMap;
-Q_DECLARE_METATYPE(SettingsMap)
-
-void printConnectionDetails(const QString& service)
-{
-    QDBusConnection dbc = QDBusConnection::systemBus();
-    if (!dbc.isConnected()) {
-        qWarning() << "Unable to connect to D-Bus:" << dbc.lastError();
-        return;
-    }
-    QDBusInterface allCons(service, NM_DBUS_PATH_SETTINGS, NM_DBUS_IFACE_SETTINGS, dbc);
-    if (allCons.isValid()) {
-        QDBusReply<QList<QDBusObjectPath> > reply = allCons.call("ListConnections");
-        if ( reply.isValid() ) {
-            qWarning() << "Known connections:";
-            QList<QDBusObjectPath> list = reply.value();
-            foreach(QDBusObjectPath path, list) {
-                qWarning() << "  " << path.path();
-                QDBusInterface sysIface(NM_DBUS_SERVICE_SYSTEM_SETTINGS, path.path(), NM_DBUS_IFACE_SETTINGS_CONNECTION, dbc);
-                if (sysIface.isValid()) {
-                    QDBusMessage r = sysIface.call("GetSettings");
-                    QDBusReply< SettingsMap > rep = sysIface.call("GetSettings");
-                    qWarning() << "     GetSettings:" << r.arguments() << r.signature() << rep.isValid() << sysIface.lastError();
-                    QMap< QString, QMap<QString,QVariant> > map = rep.value();
-                    QList<QString> list = map.keys();
-                    foreach (QString key, list) {
-                        QMap<QString,QVariant> innerMap = map[key];
-                        qWarning() << "       Key: " << key;
-                        QMap<QString,QVariant>::const_iterator i = innerMap.constBegin();
-                        while (i != innerMap.constEnd()) {
-                            QString k = i.key();
-                            qWarning() << "          Key: " << k << " Entry: " << i.value();
-                            if (k == "addresses" && i.value().canConvert<QDBusArgument>()) {
-                                QDBusArgument arg = i.value().value<QDBusArgument>();
-                                arg.beginArray();
-                                while (!arg.atEnd()) {
-                                    QDBusVariant addr;
-                                    arg >> addr;
-                                    uint ip = addr.variant().toUInt();
-                                    qWarning() << ip;
-                                    qWarning() << "        " << QHostAddress(htonl(ip)).toString();
-                                }
-
-                            }
-                            i++;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-}
-
-void readConnectionManagerDetails()
-{
-    qDBusRegisterMetaType<SettingsMap>();
-    QDBusConnection dbc = QDBusConnection::systemBus();
-    if (!dbc.isConnected()) {
-        qWarning() << "Unable to connect to D-Bus:" << dbc.lastError();
-        return;
-    }
-    
-    QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbc);
-    if (!iface.isValid()) {
-        qWarning() << "Could not find NetworkManager";
-        return;
-    }
-
-    uint state = iface.property("State").toUInt();
-    switch(state) {
-        case NM_STATE_UNKNOWN:
-            qWarning() << "State: Unknown"; break;
-        case NM_STATE_ASLEEP:
-            qWarning() << "State: Asleep"; break;
-        case NM_STATE_CONNECTING:
-            qWarning() << "State: Connecting"; break;
-        case NM_STATE_CONNECTED:
-            qWarning() << "State: Connected"; break;
-        case NM_STATE_DISCONNECTED:
-            qWarning() << "State: Disconnected"; break;
-    }
-    //get list of network devices
-    QDBusReply<QList<QDBusObjectPath> > reply = iface.call("GetDevices");
-    if ( reply.isValid() ) {
-        qWarning() << "Current devices:";
-        QList<QDBusObjectPath> list = reply.value();
-        foreach(QDBusObjectPath path, list) {
-            qWarning() << "  " << path.path();
-            QDBusInterface devIface(NM_DBUS_SERVICE, path.path(), NM_DBUS_INTERFACE_DEVICE, dbc);
-            if (devIface.isValid()) {
-                qWarning() << "     Managed: " << devIface.property("Managed").toBool();
-                qWarning() << "     Interface: " << devIface.property("Interface").toString();
-                qWarning() << "     HAL UDI: " << devIface.property("Udi").toString();
-                qWarning() << "     Driver: " << devIface.property("Driver").toString();
-                QVariant v = devIface.property("DeviceType");
-                switch(v.toUInt()) {
-                    case DEVICE_TYPE_UNKNOWN:
-                        qWarning() << "     DeviceType: Unknown" ;
-                        break;
-                    case DEVICE_TYPE_802_3_ETHERNET: 
-                        qWarning() << "     DeviceType: Ethernet" ;
-                        break;
-                    case DEVICE_TYPE_802_11_WIRELESS:
-                        qWarning() << "     DeviceType: Wireless" ;
-                        break;
-                    case DEVICE_TYPE_GSM:
-                        qWarning() << "     DeviceType: GSM" ;
-                        break;
-                    case DEVICE_TYPE_CDMA:
-                        qWarning() << "     DeviceType: CDMA" ;
-                        break;
-                    
-                }
-                v = devIface.property("State");
-                switch(v.toUInt()) {
-                    case NM_DEVICE_STATE_UNKNOWN:
-                        qWarning() << "     State: Unknown" ; break;
-                    case NM_DEVICE_STATE_UNMANAGED:
-                        qWarning() << "     State: Unmanaged" ; break;
-                    case NM_DEVICE_STATE_UNAVAILABLE:
-                        qWarning() << "     State: Unavailable" ; break;
-                    case NM_DEVICE_STATE_DISCONNECTED:
-                        qWarning() << "     State: Disconnected" ; break;
-                    case NM_DEVICE_STATE_PREPARE:
-                        qWarning() << "     State: Preparing" ; break;
-                    case NM_DEVICE_STATE_CONFIG:
-                        qWarning() << "     State: Being configured" ; break;
-                    case NM_DEVICE_STATE_NEED_AUTH:
-                        qWarning() << "     State: Awaiting secrets" ; break;
-                    case NM_DEVICE_STATE_IP_CONFIG:
-                        qWarning() << "     State: IP requested" ; break;
-                    case NM_DEVICE_STATE_ACTIVATED:
-                        qWarning() << "     State: Activated" ; break;
-                    case NM_DEVICE_STATE_FAILED:
-                        qWarning() << "     State: FAILED" ; break;
-                }
-                quint32 ip = devIface.property("Ip4Address").toUInt();
-                qWarning() << "     IP4Address: " << QHostAddress(htonl(ip)).toString();
-                if (v.toUInt() == NM_DEVICE_STATE_ACTIVATED) {
-                    QString path = devIface.property("Ip4Config").value<QDBusObjectPath>().path();
-                    qWarning() << "     IP4Config: " << path;
-                    QDBusInterface ipIface(NM_DBUS_SERVICE, path, NM_DBUS_INTERFACE_IP4_CONFIG, dbc);
-                    if (ipIface.isValid()) {
-                        qWarning() << "        Hostname: " << ipIface.property("Hostname").toString();
-                        qWarning() << "        Domains: " << ipIface.property("Domains").toStringList();
-                        qWarning() << "        NisDomain: " << ipIface.property("NisDomain").toString();
-                        QDBusArgument arg=  ipIface.property("Addresses").value<QDBusArgument>();
-                        //qWarning() << "        " << arg.currentType();
-                        qWarning() << "        Addresses: " << ipIface.property("Addresses");
-                        qWarning() << "        Nameservers: " << ipIface.property("Nameservers");
-                        qWarning() << "        NisServers: " << ipIface.property("NisServers");
-                    }
-
-                }
-
-            }
-        }
-    }
-
-    //get list of active connections
-    QVariant prop = iface.property("ActiveConnections");
-    QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >();
-    QString activePath;
-    if ( connections.count() )
-        qWarning() << "Active connections:";
-    foreach(QDBusObjectPath path, connections) {
-        qWarning() << "  " << path.path();
-        activePath = path.path();
-        QString serviceName;
-        QDBusInterface conIface(NM_DBUS_SERVICE, path.path(), NM_DBUS_INTERFACE_ACTIVE_CONNECTION, dbc);
-        if (conIface.isValid()) {
-            qWarning() << "     default connection: " << conIface.property("Default").toBool();
-            serviceName = conIface.property("ServiceName").toString();
-            qWarning() << "     service name: " << serviceName;
-            qWarning() << "     connection path: " << conIface.property("Connection").value<QDBusObjectPath>().path();
-            qWarning() << "     specific object:" << conIface.property("SpecificObject").value<QDBusObjectPath>().path();
-            qWarning() << "     sharedServiceName: " << conIface.property("SharedServiceName").toString();
-            QList<QDBusObjectPath> devs = conIface.property("Devices").value<QList<QDBusObjectPath> >();
-            qWarning() << "     devices: ";
-            foreach(QDBusObjectPath p, devs)
-                qWarning() << "         " << path.path();
-            QVariant v = conIface.property("State");
-            switch (v.toInt()) {
-                case NM_ACTIVE_CONNECTION_STATE_UNKNOWN:
-                    qWarning()<< "     State: unknown"; break;
-                case NM_ACTIVE_CONNECTION_STATE_ACTIVATING:
-                    qWarning()<< "     State: activating"; break;
-                case NM_ACTIVE_CONNECTION_STATE_ACTIVATED:
-                    qWarning()<< "     State: activated"; break;
-            }
-        } else {
-            qWarning() << conIface.lastError();
-        }
-
-    }
-
-    printConnectionDetails(NM_DBUS_SERVICE_SYSTEM_SETTINGS);
-    printConnectionDetails(NM_DBUS_SERVICE_USER_SETTINGS);
-
-
-    //turn active connection off
-    /*QDBusObjectPath dbop("/org/freedesktop/NetworkManager/ActiveConnection/1");
-    QVariant asd = QVariant::fromValue(dbop);
-    iface.call(QLatin1String("DeactivateConnection"), asd);
-    qWarning() << iface.lastError();*/
-
-    /*QDBusObjectPath p1device("/org/freedesktop/Hal/devices/net_00_60_6e_82_02_65");
-    QVariant p1v = QVariant::fromValue(p1device);
-    QDBusObjectPath p1con("/org/freedesktop/NetworkManagerSettings/0");
-    QVariant p1c = QVariant::fromValue(p1con);
-    QDBusObjectPath p1sp("");
-    QVariant p1sp1 = QVariant::fromValue(p1sp);
-    iface.call(QLatin1String("ActivateConnection"), 
-            QString("/org/freedesktop/NetworkManagerSystemSettings"), p1c,p1v, p1v );
-    qWarning() << iface.lastError();
-    */
-}
-
-int main( int argc, char** argv)
-{
-    QApplication app(argc, argv);
-    //readConnectionManagerDetails();
-    QMainWindow main;
-    NMView view;
-    main.setCentralWidget(&view);
-    main.show();
-    return app.exec();
-
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/networkmanager/nmview.cpp
--- a/qtmobility/tests/networkmanager/nmview.cpp	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1028 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "nmview.h"
-
-#include <QLabel>
-#include <QLayout>
-#include <QListWidget>
-#include <QDebug>
-#include <QPushButton>
-
-#include <QtDBus>
-#include <QtNetwork>
-#include <NetworkManager/NetworkManager.h>
-#include <arpa/inet.h>
-
-#include <QDBusConnection>
-#include <QDBusError>
-#include <QDBusInterface>
-#include <QDBusMessage>
-#include <QDBusReply>
-
-#include <QHostAddress>
-#include <QNetworkInterface>
-#include <QTreeWidgetItem>
-#include <QMessageBox>
-
-//#include "ui_dialog.h"
-
-#include <qnetworkconfiguration.h>
-#include <qnetworkconfigmanager.h>
-#include <qnetworksession.h>
-#include <qnetworkmanagerservice_p.h>
-
-//static QDBusConnection dbc = QDBusConnection::systemBus();
-//typedef QMap< QString, QMap<QString,QVariant> > SettingsMap;
-//Q_DECLARE_METATYPE(SettingsMap)
-
-
-NMView::NMView(QDialog* parent)
-    : QDialog(parent, 0), dbc(QDBusConnection::systemBus())
-{
-    init();
-
-    if (!dbc.isConnected()) {
-        qWarning() << "Unable to connect to D-Bus:" << dbc.lastError();
-        return;
-    }
-    updateConnections();
-    getDevices();
-}
-
-NMView::~NMView()
-{
-}
-void NMView::init()
-{
-    setupUi(this);
-    sess = 0;
-//    readSettings();
-    connect(startButton, SIGNAL(clicked()), this, SLOT(activate()));
-    connect(stopButton, SIGNAL(clicked()), this, SLOT(deactivate()));
-    connect(scanButton, SIGNAL(clicked()), this, SLOT(findAccessPoints()));
-    connect(updateButton, SIGNAL(clicked()), this, SLOT(update()));
-
-    connect(cons, SIGNAL(itemActivated(QTreeWidgetItem*, int)),
-            this,SLOT(connectionItemActivated(QTreeWidgetItem*, int)));
-
-
-    connect(devicesTreeWidget, SIGNAL(itemActivated(QTreeWidgetItem*, int)),
-            this, SLOT(deviceItemActivated(QTreeWidgetItem*, int)));
-
-    cons->header()->setResizeMode(QHeaderView::ResizeToContents);
-    devicesTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents);
-    accessPointsTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents);
-//    accessPointsTreeWidget->header()->setResizeMode(QHeaderView::ResizeToContents);
-
-   manager = new QNetworkConfigurationManager(this);
-
-   connect(manager, SIGNAL(updateCompleted()), this, SLOT(updateCompleted()));
-
-   connect(manager, SIGNAL(configurationAdded(const QNetworkConfiguration &)),
-           this, SLOT(configurationAdded(const QNetworkConfiguration&)));
-
-   devicesTreeWidget->header()->hideSection(0);
-   devicesTreeWidget->header()->hideSection(1);
-   devicesTreeWidget->header()->hideSection(3);
-   devicesTreeWidget->header()->hideSection(5);
-   devicesTreeWidget->header()->hideSection(6);
-   devicesTreeWidget->header()->hideSection(7);
-   devicesTreeWidget->header()->hideSection(8);
-   devicesTreeWidget->header()->hideSection(9);
-}
-
-void NMView::updateConnections()
-{
-    cons->clear();
-    manager->updateConfigurations();
-    QList<QNetworkConfiguration> configs = manager->allConfigurations();
-    foreach(QNetworkConfiguration p, configs) {
-        QStringList strlist;
-        strlist << p.name();
-        strlist << stateToString(p.state());
-        strlist << p.identifier();
-        strlist << typeToString(p.type());
-        QTreeWidgetItem *item;
-        item = new QTreeWidgetItem(strlist);
-        cons->insertTopLevelItem(0, item);
-    }
-    cons->sortItems ( 1, Qt::AscendingOrder);
-}
-
-void NMView::getActiveConnections()
-{
-    QList<QNetworkConfiguration> configs = manager->allConfigurations(QNetworkConfiguration::Active);
-    foreach(QNetworkConfiguration p, configs) {
-        qWarning() << __FUNCTION__ << p.name() << p.identifier();
-    }
-
-//     QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbc);
-//     if (!iface.isValid()) {
-//         qWarning() << "Could not find NetworkManager";
-//         return;
-//     }
-
-//     QVariant prop = iface.property("ActiveConnections");
-//     QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >();
-//     foreach(QDBusObjectPath path, connections) {
-//         QDBusInterface conDetails(NM_DBUS_SERVICE, path.path(), NM_DBUS_INTERFACE_ACTIVE_CONNECTION, dbc);
-//         if (conDetails.isValid()) {
-//             QString desc = path.path();
-//            conDetails.property("Connection Path").value<QDBusObjectPath>().path();
-
-//            QList<QDBusObjectPath> devices = conDetails.property("Devices").value<QList<QDBusObjectPath> >();
-//
-//            foreach(QDBusObjectPath devpath, devices) {
-//                QDBusInterface devIface(NM_DBUS_SERVICE, devpath.path(), NM_DBUS_INTERFACE_DEVICE, dbc);
-//                desc += " "+devIface.property("Interface").toString();
-//                desc +=  " "+QHostAddress(htonl(devIface.property("Ip4Address").toUInt())).toString();
-
-//            }
-
-//            qWarning() << conDetails.property("Connection").value<QDBusObjectPath>().path() << path.path();
-
-//            QListWidgetItem* item = new QListWidgetItem(desc,  activeCons);
-//            item->setData(Qt::UserRole, path.path());
-//      }
-//    }
-}
-
-void NMView::update()
-{
-//    QNetworkManagerInterface *dbIface;
-//    dbIface = new QNetworkManagerInterface;
-//    QList <QDBusObjectPath> connections = dbIface->activeConnections();
-//
-//    foreach(QDBusObjectPath conpath, connections) {
-//        QNetworkManagerConnectionActive *aConn;
-//        aConn = new QNetworkManagerConnectionActive(conpath.path());
-//        // in case of accesspoint, specificObject will hold the accessPOintObjectPath
-//        qWarning() << aConn->connection().path() << aConn->specificObject().path() << aConn->devices().count();
-//        QList <QDBusObjectPath>  devs = aConn->devices();
-//        foreach(QDBusObjectPath device, devs) {
-//            qWarning() << "    " << device.path();
-//        }
-//    }
-
-    QStringList connectionServices;
-    connectionServices << NM_DBUS_SERVICE_SYSTEM_SETTINGS;
-    connectionServices << NM_DBUS_SERVICE_USER_SETTINGS;
-    foreach (QString service, connectionServices) {
-        QDBusInterface allCons(service,
-                               NM_DBUS_PATH_SETTINGS,
-                               NM_DBUS_IFACE_SETTINGS,
-                               dbc);
-        if (allCons.isValid()) {
-            QDBusReply<QList<QDBusObjectPath> > reply = allCons.call("ListConnections");
-            if ( reply.isValid() ) {
-                QList<QDBusObjectPath> list = reply.value();
-                foreach(QDBusObjectPath path, list) {
-                    QDBusInterface sysIface(service,
-                                            path.path(),
-                                            NM_DBUS_IFACE_SETTINGS_CONNECTION,
-                                            dbc);
-                    if (sysIface.isValid()) {
-                        qWarning() << "";
-                        qWarning() << path.path();
-
-                        //                        QDBusMessage r = sysIface.call("GetSettings");
-                        QDBusReply< QNmSettingsMap > rep = sysIface.call("GetSettings");
-
-                        QMap< QString, QMap<QString,QVariant> > map = rep.value();
-                        QList<QString> list = map.keys();
-                        foreach (QString key, list) {
-                            QMap<QString,QVariant> innerMap = map[key];
-                            qWarning() << "       Key: " << key;
-                            QMap<QString,QVariant>::const_iterator i = innerMap.constBegin();
-
-                            while (i != innerMap.constEnd()) {
-                                QString k = i.key();
-                                qWarning() << "          Key: " << k << " Entry: " << i.value();
-                                i++;
-                            }//end innerMap
-                        }//end foreach key
-                    }//end settings connection
-                } // foreach path
-            } //end ListConnections
-        } //end settingsInterface
-    }// end services
-    QDBusInterface iface(NM_DBUS_SERVICE,
-                         NM_DBUS_PATH,
-                         NM_DBUS_INTERFACE,
-                         dbc);
-    if (iface.isValid()) {
-        QVariant prop = iface.property("ActiveConnections");
-        QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >();
-        foreach(QDBusObjectPath conpath, connections) {
-            qWarning() << "Active connection" << conpath.path();
-            QDBusInterface conDetails(NM_DBUS_SERVICE,
-                                      conpath.path(),
-                                      NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
-                                      dbc);
-            if (conDetails.isValid()) {
-
-                QVariant prop = conDetails.property("Connection");
-                QDBusObjectPath connection = prop.value<QDBusObjectPath>();
-                qWarning() << conDetails.property("Default").toBool() << connection.path();
-
-//                QVariant Sprop = conDetails.property("Devices");
-//                QList<QDBusObjectPath> so = Sprop.value<QList<QDBusObjectPath> >();
-//                foreach(QDBusObjectPath device, so) {
-//                    if(device.path() == devicePath) {
-//                        path = connection.path();
-//                    }
-//                    break;
-//                }
-            }
-        }
-    }
-qWarning() << "";
-}
-
-void NMView::deactivate()
-{
-    QList<QNetworkConfiguration> configs = manager->allConfigurations(QNetworkConfiguration::Active);
-    foreach(QNetworkConfiguration p, configs) {
-        qWarning() << "Active cons" << p.name();
-        if(p.name() == cons->currentItem()->text(0)
-            && p.identifier() == cons->currentItem()->text(2)) {
-            qWarning() <<__FUNCTION__<< p.name();
-            if(!sess) {
-                sess = new QNetworkSession(p);
-
-                connect(sess,  SIGNAL(stateChanged(QNetworkSession::State)),
-                        this, SLOT(stateChanged(QNetworkSession::State)));
-
-                connect(sess,  SIGNAL(error(QNetworkSession::SessionError)),
-                        this,  SLOT(networkSessionError(QNetworkSession::SessionError)));
-            }
-            sess->close();
-            delete sess;
-            sess = 0;
-        }
-    }
-}
-
-void NMView::activate()
-{
-    qWarning() << __FUNCTION__ << cons->currentItem()->text(0);
-
-    QList<QNetworkConfiguration> configs = manager->allConfigurations();
-    foreach(QNetworkConfiguration p, configs) {
-        if(p.name() == cons->currentItem()->text(0)) {
-
-            sess = new QNetworkSession(p);
-
-            connect(sess, SIGNAL(newConfigurationActivated()),
-                    this, SLOT(getActiveConnections()));
-
-            connect(sess,  SIGNAL(stateChanged(QNetworkSession::State)),
-                    this, SLOT(stateChanged(QNetworkSession::State)));
-
-            connect(sess,  SIGNAL(error(QNetworkSession::SessionError)),
-                    this,  SLOT(networkSessionError(QNetworkSession::SessionError)));
-
-            sess->open();
-        }
-    }
-}
-
-void NMView::getDevices()
-{
-    qWarning() << "";
-    qWarning() << __FUNCTION__;
-    devicesTreeWidget->clear();
-    //qDBusRegisterMetaType<SettingsMap>();
-
-    if (!dbc.isConnected()) {
-        qWarning() << "Unable to connect to D-Bus:" << dbc.lastError();
-        return;
-    }
-        QDBusInterface iface(NM_DBUS_SERVICE,
-                             NM_DBUS_PATH,
-                             NM_DBUS_INTERFACE,
-                             dbc);
-//NetworkManager interface
-        if (!iface.isValid()) {
-            qWarning() << "Could not find NetworkManager";
-            return;
-        }
-
-//         uint state = iface.property("State").toUInt();
-//         switch(state) {
-//         case NM_STATE_UNKNOWN:
-//             qWarning() << "State: Unknown"; break;
-//         case NM_STATE_ASLEEP:
-//             qWarning() << "State: Asleep"; break;
-//         case NM_STATE_CONNECTING:
-//             qWarning() << "State: Connecting"; break;
-//         case NM_STATE_CONNECTED:
-//             qWarning() << "State: Connected"; break;
-//         case NM_STATE_DISCONNECTED:
-//             qWarning() << "State: Disconnected"; break;
-//         }
-
-        //get list of network devices
-        QTreeWidgetItem *item;
-        QDBusReply<QList<QDBusObjectPath> > reply = iface.call("GetDevices");
-        if ( reply.isValid() ) {
-//            qWarning() << "Current devices:";
-            QList<QDBusObjectPath> list = reply.value();
-            foreach(QDBusObjectPath path, list) {
-                QStringList devicesList;
-                qWarning() << "  " << path.path();
-                devicesList << path.path();
-
-                QDBusInterface devIface(NM_DBUS_SERVICE,
-                                        path.path(),
-                                        NM_DBUS_INTERFACE_DEVICE,
-                                        dbc);
-                if (devIface.isValid()) {
-
-
-
-                    ////// connect the dbus signal
-//                     /*if(*/dbc.connect(NM_DBUS_SERVICE,
-//                                    path.path(),
-//                                    NM_DBUS_INTERFACE_DEVICE,
-//                                    "StateChanged",
-//                                    this,SLOT(deviceStateChanged(quint32)));
-//                    {
-//                        qWarning() << "XXXXXXXXXX dbus connect successful" <<  path.path();
-//                    }
-
-
-          //          qWarning() << "     Managed: " << devIface.property("Managed").toBool();
-                    devicesList << devIface.property("Managed").toString();
- //                   qWarning() << "     Interface: " << devIface.property("Interface").toString();
-                    devicesList <<  devIface.property("Interface").toString();
-  //                  qWarning() << "     HAL UDI: " << devIface.property("Udi").toString();
-   //                 qWarning() << "     Driver: " << devIface.property("Driver").toString();
-                    devicesList  << devIface.property("Driver").toString();
-
-                    QString x =  deviceTypeToString(devIface.property("DeviceType").toUInt());
- //                   qWarning() << "     Type:" << x;
-                    devicesList << x;
-
-                                 if( devIface.property("DeviceType").toUInt() == DEVICE_TYPE_802_11_WIRELESS) {
-                                     qWarning() << "Device is WIFI";
-                    //                //    findAccessPoints(path.path());
-                                    }
-
-                    QVariant v = devIface.property("State");
-                    x = deviceStateToString(v.toUInt());
-//                    qWarning() << "     State:" << x;
-                    devicesList << x;
-
-                    quint32 ip = devIface.property("Ip4Address").toUInt();
-//                    qWarning() << "     IP4Address: " << QHostAddress(htonl(ip)).toString();
-                    devicesList << QHostAddress(htonl(ip)).toString();
-
-
-                    if (v.toUInt() == NM_DEVICE_STATE_ACTIVATED) {
-                        QString path = devIface.property("Ip4Config").value<QDBusObjectPath>().path();
-//                        qWarning() << "     IP4Config: " << path;
-                        devicesList << path;
-                        QDBusInterface ipIface(NM_DBUS_SERVICE,
-                                               path,
-                                               NM_DBUS_INTERFACE_IP4_CONFIG,
-                                               dbc);
-                        if (ipIface.isValid()) {
-      //                      qWarning() << "        Hostname: " << ipIface.property("Hostname").toString();
-                            devicesList << ipIface.property("Hostname").toString();
-//                            qWarning() << "        Domains: " << ipIface.property("Domains").toStringList();
-                            devicesList <<  ipIface.property("Domains").toStringList().join(", ");
-//                            qWarning() << "        NisDomain: " << ipIface.property("NisDomain").toString();
-                            QDBusArgument arg=  ipIface.property("Addresses").value<QDBusArgument>();
-//                            qWarning() << "        Addresses: " << ipIface.property("Addresses");
-//                            qWarning() << "        Nameservers: " << ipIface.property("Nameservers");
-//                            qWarning() << "        NisServers: " << ipIface.property("NisServers");
-                        }
-
-                    }
-
-                }
-                item = new QTreeWidgetItem(devicesList);
-                devicesTreeWidget->insertTopLevelItem(0, item);
-            }
-        }
-
-
-//        netconfig();
-
-}
-
-void NMView::readSettings()
-{
-        QDBusInterface settingsiface(NM_DBUS_SERVICE_SYSTEM_SETTINGS,
-                                     NM_DBUS_PATH_SETTINGS,
-                                     NM_DBUS_IFACE_SETTINGS,
-                                     dbc);
-        //NetworkManagerSettings interface
-        if (settingsiface.isValid()) {
-            QDBusReply<QList<QDBusObjectPath> > reply = settingsiface.call("ListConnections");
-            if ( reply.isValid() ) {
-                QList<QDBusObjectPath> list = reply.value();
-                foreach(QDBusObjectPath path, list) {
-                    qWarning() <<__FUNCTION__ << path.path();
-
-                }
-            }
-        }
-
-        QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbc);
-        if (!iface.isValid()) {
-            qWarning() << "Could not find NetworkManager";
-            return;
-        }
-
-        //   QStringList list = item->text().split(" -> ");
-
-        QVariant prop = iface.property("ActiveConnections");
-        QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >();
-        foreach(QDBusObjectPath path, connections) {
-            QDBusInterface conDetails(NM_DBUS_SERVICE,
-                                      path.path(),
-                                      NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
-                                      dbc);
-
-            if (conDetails.isValid()) {
-                QString desc = path.path();
-                qWarning() << desc;
-                //if ( item->text(0) == conDetails.property("Connection").value<QDBusObjectPath>().path() ) {
-                    //                QListWidgetItem* item = new QTreeWidgetItem( desc,
-                    //                                                             cons);
-                    //                item->setData(Qt::UserRole, desc);
-                    //                activeItemActivated( item );
-                //}
-            }
-        }
-}
-
-void NMView::printConnectionDetails(const QString& service)
-{
-    Q_UNUSED(service);
-
-//
-//    qWarning() << __FUNCTION__ << service;
-//
-//    QDBusConnection dbc = QDBusConnection::systemBus();
-//    if (!dbc.isConnected()) {
-//        qWarning() << "Unable to connect to D-Bus:" << dbc.lastError();
-//        return;
-//    }
-//    QDBusInterface allCons(service,
-//                           NM_DBUS_PATH_SETTINGS,
-//                           NM_DBUS_IFACE_SETTINGS,
-//                           dbc);
-//
-//    if (allCons.isValid()) {
-//        QDBusReply<QList<QDBusObjectPath> > reply = allCons.call("ListConnections");
-//
-//        if ( reply.isValid() ) {
-//            qWarning() << "Known connections:";
-//            QList<QDBusObjectPath> list = reply.value();
-//
-//            foreach(QDBusObjectPath path, list) {
-//                qWarning() << "  " << path.path();
-//
-//                QDBusInterface sysIface(NM_DBUS_SERVICE_SYSTEM_SETTINGS,
-//                                        path.path(),
-//                                        NM_DBUS_IFACE_SETTINGS_CONNECTION,
-//                                        dbc);
-//
-//                if (sysIface.isValid()) {
-//                    QDBusMessage r = sysIface.call("GetSettings");
-//                    QDBusReply< QSettingsMap > rep = sysIface.call("GetSettings");
-//
-//                    qWarning() << "     GetSettings:" << r.arguments() << r.signature() << rep.isValid() << sysIface.lastError();
-//
-//                    QMap< QString, QMap<QString,QVariant> > map = rep.value();
-//                    QList<QString> list = map.keys();
-//
-//                    foreach (QString key, list) {
-//                        QMap<QString,QVariant> innerMap = map[key];
-//                        qWarning() << "       Key: " << key;
-//                        QMap<QString,QVariant>::const_iterator i = innerMap.constBegin();
-//
-//                        while (i != innerMap.constEnd()) {
-//                            QString k = i.key();
-//                            qWarning() << "          Key: " << k << " Entry: " << i.value();
-//
-//                            if (k == "addresses" && i.value().canConvert<QDBusArgument>()) {
-//                                QDBusArgument arg = i.value().value<QDBusArgument>();
-//                                arg.beginArray();
-//
-//                                while (!arg.atEnd()) {
-//                                    QDBusVariant addr;
-//                                    arg >> addr;
-//                                    uint ip = addr.variant().toUInt();
-//                                    qWarning() << ip;
-//                                    qWarning() << "        " << QHostAddress(htonl(ip)).toString();
-//                                }
-//
-//                            }
-//                            i++;
-//                        }
-//                    }
-//                }
-//            }
-//        }
-//    }
-    qWarning() << "";
-}
-
-void NMView::getNetworkDevices()
-{
-
-}
-
-void NMView::connectionItemActivated( QTreeWidgetItem * item, int col )
-{
-    Q_UNUSED(col);
-
-    qWarning() <<__FUNCTION__<< item->text(0);
-    QDBusInterface iface(NM_DBUS_SERVICE,
-                         NM_DBUS_PATH,
-                         NM_DBUS_INTERFACE,
-                         dbc);
-    if (!iface.isValid()) {
-        qWarning() << "Could not find NetworkManager";
-        return;
-    }
-    QVariant prop = iface.property("ActiveConnections");
-    QList<QDBusObjectPath> connections = prop.value<QList<QDBusObjectPath> >();
-    foreach(QDBusObjectPath path, connections) {
-        QDBusInterface conDetails(NM_DBUS_SERVICE,
-                                  path.path(),
-                                  NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
-                                  dbc);
-
-        if (conDetails.isValid()) {
-            QString desc = path.path();
-            qWarning() << desc;
-            if ( item->text(0) == conDetails.property("Connection").value<QDBusObjectPath>().path() ) {
-//                QListWidgetItem* item = new QTreeWidgetItem( desc,
-//                                                             cons);
-//                item->setData(Qt::UserRole, desc);
-//                activeItemActivated( item );
-            }
-        }
-    }
-}
-
-
-
-void NMView::deviceItemActivated( QTreeWidgetItem * item , int section)
-{
-    Q_UNUSED(item);
-    Q_UNUSED(section);
-
-  //  qWarning() << item->text(section) << item->text(4);
-    //if(item->text(4) == "Wireless") findAccessPoints(item->text(0));
-}
-
-
-void NMView::netconfig()
-{
-//    qWarning() << __FUNCTION__;
-
-//    qDBusRegisterMetaType<SettingsMap>();
-    QDBusConnection dbc = QDBusConnection::systemBus();
-    if (!dbc.isConnected()) {
-        qWarning() << "Unable to connect to D-Bus:" << dbc.lastError();
-        return;
-    }
-
-    QDBusInterface iface(NM_DBUS_SERVICE,
-                         NM_DBUS_PATH,
-                         NM_DBUS_IFACE_SETTINGS_CONNECTION,
-                         dbc);
-    if (!iface.isValid()) {
-        qWarning() << "Could not find NetworkManager Settings";
-        return;
-    } else {
-        QDBusReply<QList<QDBusObjectPath> > reply = iface.call("ListConnections");
-            QList<QDBusObjectPath> list = reply.value();
-//            qWarning() << reply.value();
-            foreach(QDBusObjectPath path, list) {
-                qWarning() << "  " << path.path();
-            }
-    }
-}
-
-
-void NMView::findAccessPoints()
-{
-    accessPointsTreeWidget->clear();
-
-    QDBusInterface iface(NM_DBUS_SERVICE,
-                         NM_DBUS_PATH,
-                         NM_DBUS_INTERFACE,
-                         dbc);
-
-    QDBusReply<QList<QDBusObjectPath> > reply = iface.call("GetDevices");
-    if ( reply.isValid() ) {
-        QList<QDBusObjectPath> list = reply.value();
-        foreach(QDBusObjectPath path, list) {
-            QDBusInterface devIface(NM_DBUS_SERVICE,
-                                    path.path(),
-                                    NM_DBUS_INTERFACE_DEVICE,
-                                    dbc);
-            if (devIface.isValid()) {
-
-                if( devIface.property("DeviceType").toUInt() == DEVICE_TYPE_802_11_WIRELESS) {
-
-//                    qWarning() <<"deviface"<< devIface.path();
-                    QDBusInterface wififace(NM_DBUS_SERVICE,
-                                            devIface.path(),
-                                            NM_DBUS_INTERFACE_DEVICE_WIRELESS,
-                                            dbc);
-                    if (!wififace.isValid()) {
-                        qWarning() << "Could not find NetworkManager wireless interface";
-                        return;
-                    }
-
-/////////////////////////
-//                     if(dbc.connect(NM_DBUS_SERVICE,
-//                                    path.path(),
-//                                    NM_DBUS_INTERFACE_DEVICE_WIRELESS,
-//                                    "PropertiesChanged",
-//                                    this,SLOT(aPPropertiesChanged( QMap<QString,QVariant>))) ) {
-//                         qWarning() << "PropertiesChanged connect";
-//                     } else {
-//                         qWarning() << "NOT connect";
-
-//                     }
-/////////////////////////
-                    qWarning() <<"wififace"<< wififace.path();
-                    QDBusReply<QList<QDBusObjectPath> > reply2 = wififace.call("GetAccessPoints");
-                    if ( reply2.isValid() ) {
-                        QTreeWidgetItem *item;
-                        QList<QDBusObjectPath> list2 = reply2.value();
-                        foreach(QDBusObjectPath path2, list2) {
-                            QDBusInterface accessPointIface(NM_DBUS_SERVICE,
-                                                            path2.path(),
-                                                            NM_DBUS_INTERFACE_ACCESS_POINT,
-                                                            dbc);
-                            if (accessPointIface.isValid()) {
-////                                qWarning() <<"path2" <<  path2.path();
-
-//                                if(dbc.connect(NM_DBUS_SERVICE, //signal strength
-//                                               path2.path(),
-//                                               NM_DBUS_INTERFACE_ACCESS_POINT,
-//                                               "PropertiesChanged",
-//                                               this,SLOT(aPPropertiesChanged( QMap<QString,QVariant>))) ) {
-//                                    qWarning() << "PropertiesChanged connect";
-//                                } else {
-//                                    qWarning() << "NOT connect";
-//
-//                                }
-
-                                QStringList accessPoints;
-                                accessPoints << accessPointIface.property("Ssid").toString();
-                                accessPoints << QString::number(accessPointIface.property("Strength").toInt());
-                                accessPoints << securityCapabilitiesToString(accessPointIface.property("WpaFlags" ).toInt());
-                                accessPoints << securityCapabilitiesToString(accessPointIface.property("RsnFlags" ).toInt());
-                                accessPoints << accessPointIface.property("Frequency" ).toString();
-                                accessPoints << accessPointIface.property("HwAddress" ).toString();
-                                accessPoints << deviceModeToString(accessPointIface.property("Mode" ).toInt());
-                                accessPoints << accessPointIface.property("MaxBitrate" ).toString();
-                                //HwAddress
-                                //                if(accessPointIface.property("Flags" ).toInt() == NM_802_11_AP_FLAGS_PRIVACY ) {
-                                //                    qWarning() << "Secure";
-                                //                }
-                                item = new QTreeWidgetItem(accessPoints);
-                                accessPointsTreeWidget->insertTopLevelItem(0, item);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
-
-QString NMView::deviceStateToString(int state)
-{
-    QString ret;
-    switch(state) {
-    case NM_DEVICE_STATE_UNKNOWN:
-        ret = "Unknown";
-        break;
-    case NM_DEVICE_STATE_UNMANAGED:
-        ret =  "Unmanaged";
-        break;
-    case NM_DEVICE_STATE_UNAVAILABLE:
-        ret =  "Unavailable";
-        break;
-    case NM_DEVICE_STATE_DISCONNECTED:
-        ret = "Disconnected";
-        break;
-    case NM_DEVICE_STATE_PREPARE:
-        ret = "Preparing to connect";
-        break;
-    case NM_DEVICE_STATE_CONFIG:
-        ret = "Being configured";
-        break;
-    case NM_DEVICE_STATE_NEED_AUTH:
-        ret = "Awaiting secrets";
-        break;
-    case NM_DEVICE_STATE_IP_CONFIG:
-        ret = "IP requested";
-        break;
-    case NM_DEVICE_STATE_ACTIVATED:
-        ret = "Activated";
-        break;
-    case NM_DEVICE_STATE_FAILED:
-        ret = "FAILED";
-        break;
-    };
-    return ret;
-}
-
-QString NMView::deviceTypeToString(int device)
-{
-    QString ret;
-    switch(device) {
-    case DEVICE_TYPE_UNKNOWN:
-        ret = "Unknown";
-        break;
-    case DEVICE_TYPE_802_3_ETHERNET:
-        ret = "Ethernet";
-        break;
-    case DEVICE_TYPE_802_11_WIRELESS:
-        ret = "Wireless";
-        break;
-    case DEVICE_TYPE_GSM:
-        ret = "GSM";
-        break;
-    case DEVICE_TYPE_CDMA:
-        ret = "CDMA";
-        break;
-    };
-    return ret;
-}
-
-QString NMView::securityCapabilitiesToString(int caps)
-{
-    int check = caps;
-//    qWarning() << __FUNCTION__<< caps;
-    QString ret;
-    if( check == 0 )
-        ret += "None.";
-    if( (check & NM_802_11_AP_SEC_PAIR_WEP40))
-        ret += " 40-bit WEP encryption. ";
-    if( (check & NM_802_11_AP_SEC_PAIR_WEP104) )
-        ret += " 104-bit WEP encryption. ";
-    if( (check & NM_802_11_AP_SEC_PAIR_TKIP) )
-        ret += " TKIP encryption. ";
-    if( (check & NM_802_11_AP_SEC_PAIR_CCMP) )
-        ret += " CCMP encryption. ";
-    if( (check & NM_802_11_AP_SEC_GROUP_WEP40))
-        ret += " 40-bit WEP cipher. ";
-    if( (check & NM_802_11_AP_SEC_GROUP_WEP104))
-        ret += " 104-bit WEP cipher. ";
-    if( (check & NM_802_11_AP_SEC_GROUP_TKIP)  )
-        ret += " TKIP cipher. ";
-    if( (check & NM_802_11_AP_SEC_GROUP_CCMP)  )
-        ret += " CCMP cipher. ";
-    if( (check & NM_802_11_AP_SEC_KEY_MGMT_PSK))
-        ret += " PSK key management. ";
-    if( (check & NM_802_11_AP_SEC_KEY_MGMT_802_1X) )
-        ret += " 802.1x key management. ";
-    return ret;
-}
-
-QString NMView::deviceModeToString(int mode)
-{
-    QString ret;
-    switch (mode) {
-    case NM_802_11_MODE_UNKNOWN:
-        ret = "Unknown";
-        break;
-    case NM_802_11_MODE_ADHOC:
-        ret = " (Adhoc).";
-        break;
-    case NM_802_11_MODE_INFRA:
-        ret = " (Infrastructure)";
-    };
-    return ret;
-}
-
-void NMView::netManagerState(quint32 state)
-{
-    qWarning() << __FUNCTION__ << state;// << old << reason;
-    switch(state) {
-    case NM_STATE_UNKNOWN:
-        qWarning() << "The NetworkManager daemon is in an unknown state. ";
-        break;
-    case NM_STATE_ASLEEP:
-        qWarning() << "The NetworkManager daemon is asleep and all interfaces managed by it are inactive. ";
-        break;
-    case NM_STATE_CONNECTING:
-        qWarning() << "The NetworkManager daemon is connecting a device. FIXME: What does this mean when one device is active and another is connecting? ";
-        break;
-    case NM_STATE_CONNECTED:
-        qWarning() <<"The NetworkManager daemon is connected. ";
-        break;
-    case NM_STATE_DISCONNECTED:
-        qWarning() << "The NetworkManager daemon is disconnected.";
-        break;
-
-    };
-}
-
-void NMView::deviceStateChanged(quint32 state)
-{
-  qWarning() << __FUNCTION__ << state;
-    switch(state) {
-    case NM_DEVICE_STATE_UNKNOWN :
-        qWarning() <<"The device is in an unknown state. ";
-        break;
-    case NM_DEVICE_STATE_UNMANAGED:
-        qWarning() <<"The device is not managed by NetworkManager.";
-        break;
-    case NM_DEVICE_STATE_UNAVAILABLE:
-        qWarning() <<"The device cannot be used (carrier off, rfkill, etc).";
-        break;
-    case NM_DEVICE_STATE_DISCONNECTED:
-        qWarning() <<"The device is not connected.";
-        break;
-    case NM_DEVICE_STATE_PREPARE:
-        qWarning() <<"The device is preparing to connect.";
-        break;
-    case NM_DEVICE_STATE_CONFIG:
-        qWarning() <<"The device is being configured.";
-        break;
-    case NM_DEVICE_STATE_NEED_AUTH:
-        qWarning() <<"The device is awaiting secrets necessary to continue connection.";
-        break;
-    case NM_DEVICE_STATE_IP_CONFIG:
-        qWarning() <<"The IP settings of the device are being requested and configured.";
-        break;
-    case NM_DEVICE_STATE_ACTIVATED:
-        qWarning() <<"The device is active.";
-        break;
-    case NM_DEVICE_STATE_FAILED:
-        qWarning() <<"The device is in a failure state following an attempt to activate it.";
-        break;
-    };
-}
-
-void NMView::updateCompleted()
-{
-    qWarning() << __FUNCTION__;
-}
-
-void NMView::newConfigurationActivated()
-{
-    qWarning() << __FUNCTION__;
-    getActiveConnections();
-}
-
-void NMView::stateChanged(QNetworkSession::State state)
-{
-  //  QString stateStringstr;
-    switch (state) {
-    case QNetworkSession::Invalid:
-        stateString = "Invalid session";
-        break;
-    case QNetworkSession::NotAvailable:
-        stateString = "Session is defined but not yet discovered";
-        break;
-    case QNetworkSession::Connecting:
-        stateString = "Session is being established";
-        break;
-    case QNetworkSession::Connected:
-        stateString = "Session is active and can be used for socket operations";
-        cons->currentItem()->setText(1, "Active");
-        break;
-    case QNetworkSession::Closing:
-        stateString = "Session is being shutdown";
-        break;
-    case QNetworkSession::Disconnected:
-        qWarning() << __FUNCTION__;
-        manager->updateConfigurations();
-        stateString = "Session disconnected";
-        cons->currentItem()->setText(1,"Discovered") ;
-        break;
-    case QNetworkSession::Roaming:
-        stateString = "session is roaming from one AP to another";
-        break;
-    };
-    qWarning() << __FUNCTION__ << state << stateString;
-}
-
-QString NMView::stateToString(int state)
-{
-    switch (state) {
-    case QNetworkConfiguration::Undefined:
-        return "Undefined";
-        break;
-    case QNetworkConfiguration::Defined:
-        return "Defined";
-        break;
-    case QNetworkConfiguration::Discovered:
-        return "Discovered";
-        break;
-    case QNetworkConfiguration::Active:
-        return "Active";
-        break;
-    };
-    return "";
-}
-
-void NMView::configurationAdded(const QNetworkConfiguration &config)
-{
-    qWarning() << __FUNCTION__<< config.name() << config.identifier();
-}
-
-QString NMView::typeToString(int type)
-{
-    switch(type) {
-    case QNetworkConfiguration::InternetAccessPoint:
-        return "Internet AccessPoint";
-        break;
-    case QNetworkConfiguration::ServiceNetwork:
-        return "Service Network";
-        break;
-    };
-    return QString();
-}
-
-void NMView::aPPropertiesChanged( QMap<QString,QVariant> map)
-{
-    //QMap<QString, QVariant>::const_iterator iterator = d->values.find(type + QLatin1String("Path"))
-    QMapIterator<QString, QVariant> i(map);
-    while (i.hasNext()) {
-        i.next();
-        if( i.key() == "State") {
-            qWarning()  << __FUNCTION__ << i.key() << ": " << i.value().toUInt();
-//            deviceStateChanged(i.value().toUInt());
-        } else if( i.key() == "ActiveAccessPoint") {
-            qWarning()  << __FUNCTION__ << i.key() << ": " << i.value().value<QDBusObjectPath>().path();
-        } else if( i.key() == "Strength")
-            qWarning()  << __FUNCTION__ << i.key() << ": " << i.value().toUInt();
-        else
-            qWarning()  << __FUNCTION__ << i.key() << ": " << i.value();
-    }
-}
-
-void NMView::networkSessionError(QNetworkSession::SessionError error)
-{
-    QString errorStr;
-    switch(error) {
-    case QNetworkSession::RoamingError:
-        errorStr = "Roaming error";
-        break;
-    case QNetworkSession::SessionAbortedError:
-        errorStr = "Session aborted by user or system";
-        break;
-    default:
-    case QNetworkSession::UnknownSessionError:
-        errorStr = "Unidentified Error";
-        break;
-    };
-
-    QMessageBox::warning(this, tr("NMView"), errorStr, QMessageBox::Ok);
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/networkmanager/nmview.h
--- a/qtmobility/tests/networkmanager/nmview.h	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QWidget>
-#include <QDBusConnection>
-#include <qnetworkconfigmanager.h>
-#include <qnetworksession.h>
-#include <qnetworkconfiguration.h>
-
-#include "ui_dialog.h"
-
-QTM_USE_NAMESPACE
-
-QT_BEGIN_NAMESPACE
-class QListWidget;
-class QTreeWidget;
-class QTreeWidgetItem;
-QT_END_NAMESPACE
-
-class NMView : public QDialog, private Ui::Dialog
-{
-    Q_OBJECT
-public:
-    NMView(QDialog* parent = 0);
-    virtual ~NMView();
-
-private:
-    void init();
-    QString stateString;
-
-    QDBusConnection dbc;
-    void printConnectionDetails(const QString&);
-
-    QString deviceStateToString(int state);
-    QString deviceTypeToString(int device);
-    QString securityCapabilitiesToString(int caps);
-    QString deviceModeToString(int mode);
-//QDBusInterface getInterface();
-    QNetworkConfigurationManager *manager;
-    QNetworkSession *sess;
-    QString stateToString(int state);
-    QString typeToString(int type);
-
-private slots:
-    void update();
-    void deactivate();
-    void activate();
-    void getActiveConnections();
-    void updateConnections();
-    void getDevices();
- //   void readConnectionManagerDetails();
-    void getNetworkDevices();
-    void connectionItemActivated( QTreeWidgetItem *, int);
-//    void activeItemActivated( QListWidgetItem *);
-    void deviceItemActivated( QTreeWidgetItem *, int);
-    void netconfig();
-    void findAccessPoints();
-
-    void netManagerState(quint32);
-    void readSettings();
-    void updateCompleted();
-    void newConfigurationActivated();
-
-    void stateChanged(QNetworkSession::State);
-    void deviceStateChanged(quint32 state);
-
-    void configurationAdded(const QNetworkConfiguration &config);
-    void aPPropertiesChanged( QMap<QString,QVariant> map);
-    void networkSessionError(QNetworkSession::SessionError);
-
-};
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/networkmanager/startdlg.cpp
--- a/qtmobility/tests/networkmanager/startdlg.cpp	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include "startdlg.h"
-#include <NetworkManager/NetworkManager.h>
-
-
-StartDialog::StartDialog(QWidget * parent)
-    :QDialog(parent)
-{
-    QVBoxLayout *layout = new QVBoxLayout(this);
-    box = new QComboBox();
-    layout->addWidget(box);
-
-    QHBoxLayout* hbox = new QHBoxLayout();
-    QPushButton* start = new QPushButton("Start");
-    connect(start, SIGNAL(clicked()), this, SLOT(accept()));
-    QPushButton* cancel = new QPushButton("Cancel");
-    connect(cancel, SIGNAL(clicked()), this, SLOT(reject()));
-
-
-    hbox->addWidget(start);
-    hbox->addWidget(cancel);
-
-    layout->addLayout(hbox);
-    
-    QDBusConnection dbc = QDBusConnection::systemBus();
-    if (!dbc.isConnected()) {
-        qWarning() << "Unable to connect to D-Bus:" << dbc.lastError();
-        return;
-    }
-    QDBusInterface iface(NM_DBUS_SERVICE, NM_DBUS_PATH, NM_DBUS_INTERFACE, dbc);
-    if (!iface.isValid()) {
-        qWarning() << "Could not find NetworkManager";
-        return;
-    }
-    QDBusReply<QList<QDBusObjectPath> > reply = iface.call("GetDevices");
-    if ( reply.isValid() ) {
-        QList<QDBusObjectPath> list = reply.value();
-        foreach(QDBusObjectPath path, list) {
-            QDBusInterface devIface(NM_DBUS_SERVICE, path.path(), NM_DBUS_INTERFACE_DEVICE, dbc);
-            if ( devIface.isValid() ) {
-                box->addItem(devIface.property("Interface").toString(), QVariant(path.path()));
-            }
-        }
-    }
-}
-
-QString StartDialog::device() const
-{
-    return dev;
-}
-
-void StartDialog::accept()
-{
-    dev = box->itemData(box->currentIndex(), Qt::UserRole).toString();
-    QDialog::accept();
-}
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/networkmanager/startdlg.h
--- a/qtmobility/tests/networkmanager/startdlg.h	Thu May 27 13:42:11 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** 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$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#include <QDialog>
-#include <QtDBus>
-#include <QtGui>
-
-class StartDialog : public QDialog 
-{
-    Q_OBJECT
-public:
-    StartDialog(QWidget* parent = 0);
-
-    QString device() const;
-
-public slots:
-    void accept();
-private:
-    QString dev;
-    QComboBox* box;
-};
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/publishsubscribeex/main.cpp
--- a/qtmobility/tests/publishsubscribeex/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/publishsubscribeex/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/publishsubscribeex/publishsubscribemainwindow.cpp
--- a/qtmobility/tests/publishsubscribeex/publishsubscribemainwindow.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/publishsubscribeex/publishsubscribemainwindow.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/publishsubscribeex/publishsubscribemainwindow.h
--- a/qtmobility/tests/publishsubscribeex/publishsubscribemainwindow.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/publishsubscribeex/publishsubscribemainwindow.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/sampleserviceplugin/sampleserviceplugin.cpp
--- a/qtmobility/tests/sampleserviceplugin/sampleserviceplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/sampleserviceplugin/sampleserviceplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/sampleserviceplugin/sampleserviceplugin.h
--- a/qtmobility/tests/sampleserviceplugin/sampleserviceplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/sampleserviceplugin/sampleserviceplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/sampleserviceplugin2/sampleserviceplugin2.cpp
--- a/qtmobility/tests/sampleserviceplugin2/sampleserviceplugin2.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/sampleserviceplugin2/sampleserviceplugin2.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/sampleserviceplugin2/sampleserviceplugin2.h
--- a/qtmobility/tests/sampleserviceplugin2/sampleserviceplugin2.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/sampleserviceplugin2/sampleserviceplugin2.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/tests.pro
--- a/qtmobility/tests/tests.pro	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/tests.pro	Fri Jun 11 14:26:25 2010 +0300
@@ -5,9 +5,6 @@
 
 contains(mobility_modules,serviceframework): SUBDIRS += testservice2 sampleserviceplugin sampleserviceplugin2
 contains(mobility_modules,bearer) {
-    contains(QT_CONFIG,dbus) {
-        !symbian:!mac:!maemo6:!maemo5:unix:SUBDIRS += networkmanager
-    }
     symbian:SUBDIRS += bearerex
 }
 
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/testservice2/testservice.h
--- a/qtmobility/tests/testservice2/testservice.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/testservice2/testservice.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/testservice2/testserviceinterface.h
--- a/qtmobility/tests/testservice2/testserviceinterface.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/testservice2/testserviceinterface.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/testservice2/testserviceplugin.cpp
--- a/qtmobility/tests/testservice2/testserviceplugin.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/testservice2/testserviceplugin.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tests/testservice2/testserviceplugin.h
--- a/qtmobility/tests/testservice2/testserviceplugin.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tests/testservice2/testserviceplugin.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/qcrmlgen/main.cpp
--- a/qtmobility/tools/qcrmlgen/main.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/qcrmlgen/main.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/qcrmlgen/qcrmlgen.cpp
--- a/qtmobility/tools/qcrmlgen/qcrmlgen.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/qcrmlgen/qcrmlgen.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/qcrmlgen/qcrmlgen.h
--- a/qtmobility/tools/qcrmlgen/qcrmlgen.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/qcrmlgen/qcrmlgen.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicefw/servicefw.cpp
--- a/qtmobility/tools/servicefw/servicefw.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicefw/servicefw.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/errorcollector.cpp
--- a/qtmobility/tools/servicexmlgen/errorcollector.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/errorcollector.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/errorcollector.h
--- a/qtmobility/tools/servicexmlgen/errorcollector.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/errorcollector.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/interfacestabwidget.cpp
--- a/qtmobility/tools/servicexmlgen/interfacestabwidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/interfacestabwidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/interfacestabwidget.h
--- a/qtmobility/tools/servicexmlgen/interfacestabwidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/interfacestabwidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/interfacewidget.cpp
--- a/qtmobility/tools/servicexmlgen/interfacewidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/interfacewidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/interfacewidget.h
--- a/qtmobility/tools/servicexmlgen/interfacewidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/interfacewidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/mandatorylineedit.cpp
--- a/qtmobility/tools/servicexmlgen/mandatorylineedit.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/mandatorylineedit.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/mandatorylineedit.h
--- a/qtmobility/tools/servicexmlgen/mandatorylineedit.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/mandatorylineedit.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/servicewidget.cpp
--- a/qtmobility/tools/servicexmlgen/servicewidget.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/servicewidget.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/servicewidget.h
--- a/qtmobility/tools/servicexmlgen/servicewidget.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/servicewidget.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/servicexmlgen.cpp
--- a/qtmobility/tools/servicexmlgen/servicexmlgen.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/servicexmlgen.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/servicexmlgen/servicexmlgen.h
--- a/qtmobility/tools/servicexmlgen/servicexmlgen.h	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/servicexmlgen/servicexmlgen.h	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff -r 71781823f776 -r 06b8e2af4411 qtmobility/tools/vsexplorer/vsexplorer.cpp
--- a/qtmobility/tools/vsexplorer/vsexplorer.cpp	Thu May 27 13:42:11 2010 +0300
+++ b/qtmobility/tools/vsexplorer/vsexplorer.cpp	Fri Jun 11 14:26:25 2010 +0300
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **