Merge branch 'master' into ipc

Conflicts:
	doc/html/annotated.html
	doc/html/classes.html
	doc/html/functions.html
	doc/html/qservicefilter.html
	doc/html/qserviceinterfacedescriptor.html
	src/serviceframework/qservicemanager.cpp

6 files changed, 64 insertions, 5 deletions

diff --git a/bin/pathhelper b/bin/pathhelper
new file mode 100755
index 0000000000..ba272d189f
--- /dev/null
+++ b/bin/pathhelper
@@ -0,0 +1,59 @@
+#!/usr/bin/perl
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+use strict;
+use warnings;
+use Cwd;
+use Cwd "abs_path";
+
+my $path = shift(@ARGV) or usage();
+my $resolvedpath = abs_path($path);
+print "$resolvedpath\n";
+
+exit 0;
+
+sub usage
+{
+    warn " Usage:  pathhelper <path>\n";
+    warn "         Converts <path> to an absolute path and returns it to the caller\n";
+    exit 2;
+}
diff --git a/bin/purge.sh b/bin/purge.sh
index bdd6927a69..58aad74f94 100755
--- a/bin/purge.sh
+++ b/bin/purge.sh
@@ -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 --git a/bin/rununittests.bat b/bin/rununittests.bat
index 639c977d88..6c8d23a8d3 100644
--- a/bin/rununittests.bat
+++ b/bin/rununittests.bat
@@ -1,6 +1,6 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 :: All rights reserved.
 :: Contact: Nokia Corporation (qt-info@nokia.com)
 ::
diff --git a/bin/rununittests.sh b/bin/rununittests.sh
index 9603a3caf5..c40e614231 100755
--- a/bin/rununittests.sh
+++ b/bin/rununittests.sh
@@ -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 --git a/bin/syncheaders b/bin/syncheaders
index 92aad67779..5f66cb6f9c 100755
--- a/bin/syncheaders
+++ b/bin/syncheaders
@@ -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 --git a/bin/syncheaders.bat b/bin/syncheaders.bat
index 671686b408..742be362a8 100644
--- a/bin/syncheaders.bat
+++ b/bin/syncheaders.bat
@@ -1,6 +1,6 @@
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 ::
-:: Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+:: Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 :: All rights reserved.
 :: Contact: Nokia Corporation (qt-info@nokia.com)
 ::