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, 118 insertions, 0 deletions

diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
new file mode 100644
index 0000000..2a1e383
--- /dev/null
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -0,0 +1,118 @@
+/****************************************************************************
+**
+** 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 how-to-learn-qt.html
+    \title How to Learn Qt
+    \brief Links to guides and resources for learning Qt.
+
+    \nextpage Tutorials
+
+    We assume that you already know C++ and will be using it for Qt
+    development. See the \l{Qt website} for more information about
+    using other programming languages with Qt.
+
+    The best way to learn Qt is to read the official Qt book,
+    \l{http://www.amazon.com/gp/product/0132354160/ref=ase_trolltech/}{C++
+    GUI Programming with Qt 4, Second Edition} (ISBN 0-13-235416-0). This book
+    provides comprehensive coverage of Qt programming all the way
+    from "Hello Qt" to advanced features such as multithreading, 2D and
+    3D graphics, networking, item view classes, and XML. (The first edition,
+    which is based on Qt 4.1, is available
+    \l{http://www.qtrac.eu/C++-GUI-Programming-with-Qt-4-1st-ed.zip}{online}.)
+
+    If you want to program purely in C++, designing your interfaces
+    in code without the aid of any design tools, take a look at the
+    \l{Tutorials}. These are designed to get you into Qt programming,
+    with an emphasis on working code rather than being a tour of features.
+
+    If you want to design your user interfaces using a design tool, then
+    read at least the first few chapters of the \l{Qt Designer manual}.
+
+    By now you'll have produced some small working applications and have a
+    broad feel for Qt programming. You could start work on your own
+    projects straight away, but we recommend reading a couple of key
+    overviews to deepen your understanding of Qt: \l{Qt Object Model}
+    and \l{Signals and Slots}.
+
+    At this point, we recommend looking at the
+    \l{All Overviews and HOWTOs}{overviews} and reading those that are
+    relevant to your projects. You may also find it useful to browse the
+    source code of the \l{Qt Examples}{examples} that have things in
+    common with your projects. You can also read Qt's source code since
+    this is supplied.
+
+    \table 50%
+    \header
+    \o {2,1} Getting an Overview
+    \row
+    \o \inlineimage qtdemo-small.png
+    \o
+    If you run the \l{Examples and Demos Launcher}, you'll see many of Qt's
+    widgets in action.
+
+    The \l{Qt Widget Gallery} also provides overviews of selected Qt
+    widgets in each of the styles used on various supported platforms.
+    \endtable
+
+    Qt comes with extensive documentation, with hypertext
+    cross-references throughout, so you can easily click your way to
+    whatever interests you. The part of the documentation that you'll
+    probably use the most is the \link index.html API
+    Reference\endlink. Each link provides a different way of
+    navigating the API Reference; try them all to see which work best
+    for you. You might also like to try \l{Qt Assistant}:
+    this tool is supplied with Qt and provides access to the entire
+    Qt API, and it provides a full text search facility.
+
+    There are also a growing number of books about Qt programming; see
+    \l{Books about Qt Programming} for a complete list of Qt books,
+    including translations to various languages.
+
+    Another valuable source of example code and explanations of Qt
+    features is the archive of articles from \l {http://qt.nokia.com/doc/qq}
+    {Qt Quarterly}, a quarterly newsletter for users of Qt.
+
+    For documentation on specific Qt modules and other guides, refer to
+    \l{All Overviews and HOWTOs}.
+
+    Good luck, and have fun!
+*/