Merge commit 'qt/master'

Conflicts:
	doc/src/examples.qdoc
	doc/src/plugins-howto.qdoc
	doc/src/topics.qdoc
	examples/phonon/musicplayer/mainwindow.cpp
	src/3rdparty/freetype/src/base/ftobjs.c
	src/corelib/global/qglobal.h
	src/corelib/tools/qalgorithms.h
	src/corelib/tools/qshareddata.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/corelib/tools/tools.pri
	src/corelib/xml/qxmlstream.h
	src/gui/painting/painting.pri
	src/gui/widgets/qdatetimeedit.cpp
	tests/auto/qdesktopservices/qdesktopservices.pro
	tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
	tests/auto/qtextcodec/test/test.pro

1 files changed, 72 insertions, 0 deletions

diff --git a/doc/src/platforms/emb-differences.qdoc b/doc/src/platforms/emb-differences.qdoc
new file mode 100644
index 0000000000..cf3ab75357
--- /dev/null
+++ b/doc/src/platforms/emb-differences.qdoc
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at http://qt.nokia.com/contact.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qt-embedded-differences.html
+
+    \title Porting Qt Applications to Qt for Embedded Linux
+    \ingroup porting
+    \ingroup qt-embedded-linux
+
+    Existing Qt applications should require no porting provided there is no
+    platform dependent code.
+
+    \table 100%
+    \header \o Platform Dependent Code
+
+    \row
+    \o
+    Platform dependent code includes system calls, calls to the
+    underlying window system (Windows or X11), and Qt platform
+    specific methods such as QApplication::x11EventFilter().
+
+    For cases where it is necessary to use platform dependent code
+    there are macros defined that can be used to enable and disable
+    code for each platform using \c #ifdef directives:
+
+    \list
+    \o Qt for Embedded Linux: Q_WS_QWS
+    \o Qt for Mac OS X: Q_WS_MAC
+    \o Qt for Windows: Q_WS_WIN
+    \o Qt for X11: Q_WS_X11
+    \endlist
+    \endtable
+*/