Merge branch 'gl2engine-new-shaders' into graphics-master

Conflicts:
	src/gui/painting/qpaintengine_raster.cpp

30 files changed, 284 insertions, 533 deletions

diff --git a/doc/src/activeqt.qdoc b/doc/src/activeqt.qdoc
index ea13e59..473f815 100644
--- a/doc/src/activeqt.qdoc
+++ b/doc/src/activeqt.qdoc
@@ -73,7 +73,7 @@
     To build the static libraries, change into the \c activeqt directory 
     (usually \c QTDIR/src/activeqt), and run \c qmake and your make
     tool in both the \c container and the \c control subdirectory.
-    The libraries \c qaxcontainer.lib and \c qaxserver.lib will be linked 
+    The libraries \c qaxcontainer.lib and \c qaxserver.lib will be linked
     into \c QTDIR/lib.
 
     If you are using a shared configuration of Qt enter the \c plugin
@@ -81,8 +81,8 @@
     plugin that integrates the QAxContainer module into \l{Qt
     Designer}.
 
-    The ActiveQt modules are part of the \l{Qt Full Framework Edition}. They
-    are \e not part of the \l{Open Source Versions of Qt}.
+    The ActiveQt modules are part of the \l{Qt Full Framework Edition} and
+    the \l{Open Source Versions of Qt}.
 
     \sa {QAxContainer Module}, {QAxServer Module}
 */
diff --git a/doc/src/deployment.qdoc b/doc/src/deployment.qdoc
index d9f7c1a..bcfa93d 100644
--- a/doc/src/deployment.qdoc
+++ b/doc/src/deployment.qdoc
@@ -911,7 +911,7 @@
     Then qApp->libraryPaths() would return something like this:
 
     "C:/customPath/plugins " 
-    "C:/Qt/4.5.0/plugins" 
+    "C:/Qt/%VERSION%/plugins" 
     "E:/myApplication/directory/"
 
     The executable will look for the plugins in these directories and 
diff --git a/doc/src/examples.qdoc b/doc/src/examples.qdoc
index e3c2291..29c6c0b 100644
--- a/doc/src/examples.qdoc
+++ b/doc/src/examples.qdoc
@@ -209,6 +209,7 @@
     \o  \l{network/loopback}{Loopback}
     \o  \l{network/threadedfortuneserver}{Threaded Fortune Server}\raisedaster
     \o  \l{network/torrent}{Torrent}
+    \o  \l{network/googlesuggest}{Google Suggest}
     \endlist
 
     \section1 OpenGL
@@ -348,6 +349,8 @@
     \list
     \o \l{webkit/previewer}{Previewer}\raisedaster
     \o \l{webkit/formextractor}{Form Extractor}
+    \o \l{webkit/googlechat}{Google Chat}
+    \o \l{webkit/fancybrowser}{Fancy Browser}
     \endlist
 
     \section1 Widgets
diff --git a/doc/src/snippets/webkit/simple/main.cpp b/doc/src/examples/fancybrowser.qdoc
index a6a4fc2..9001c20 100644
--- a/doc/src/snippets/webkit/simple/main.cpp
+++ b/doc/src/examples/fancybrowser.qdoc
@@ -39,18 +39,13 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
-#include <QUrl>
-#include <QWebView>
+/*!
+    \example webkit/fancybrowser
+    \title Fancy Browser Example
 
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-    QWidget *parent = 0;
-//! [Using QWebView]
-    QWebView *view = new QWebView(parent);
-    view->load(QUrl("http://qtsoftware.com/"));
-    view->show();
-//! [Using QWebView]
-    return app.exec();
-}
+    The Fancy Browser example shows how to use jQuery with QtWebKit to
+    make a web browser with some special effects and content manipulation.
+
+    \image fancybrowser-example.png
+
+*/
diff --git a/doc/src/examples/flowlayout.qdoc b/doc/src/examples/flowlayout.qdoc
index 557ba39..5fdafe2 100644
--- a/doc/src/examples/flowlayout.qdoc
+++ b/doc/src/examples/flowlayout.qdoc
@@ -43,8 +43,117 @@
     \example layouts/flowlayout
     \title Flow Layout Example
 
-    The Flow Layout example demonstrates a custom layout that arranges child widgets from
-    left to right and top to bottom in a top-level widget.
+    The Flow Layout example demonstrates a custom layout that arranges child 
+    widgets from left to right and top to bottom in a top-level widget.
 
-    \image flowlayout-example.png
-*/
+    \image flowlayout-example.png Screenshot of the Flow Layout example
+
+    The items are first laid out horizontally and then vertically when each line
+    in the layout runs out of space. 
+
+	The Flowlayout class mainly uses QLayout and QWidgetItem, while the
+	Window uses QWidget and QLabel. We will only document the definition 
+	and implementation of \cFlowLayout below.
+
+    \section1 FlowLayout Class Definition
+    
+    The \c FlowLayout class inherits QLayout. It is a custom layout class 
+    that arranges its child widgets horizontally and vertically. 
+
+    \snippet examples/layouts/flowlayout/flowlayout.h 0
+
+    We reimplement functions inherited from QLayout. These functions add items to
+    the layout and handle their orientation and geometry. 
+    
+    We also declare two private methods, \c doLayout() and \c smartSpacing().
+    \c doLayout() lays out the layout items, while the \c
+    smartSpacing() function calculates the spacing between them.
+
+    \section1 FlowLayout Class Implementation 
+
+    We start off by looking at the constructor:
+
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 1
+
+    In the constructor we call \c setContentsMargins() to set the left, top,
+    right and bottom margin. By default, QLayout uses values provided by
+    the current style (see QStyle::PixelMetric). 
+
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 2
+
+    In this example we reimplement \c addItem(), which is a pure virtual 
+    function. When using \c addItem() the ownership of the layout items is 
+    transferred to the layout, and it is therefore the layout's 
+    responsibility to delete them. 
+    
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 3
+    
+    \c addItem() is implemented to add items to the layout. 
+
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 4
+
+    We implement \c horizontalSpacing() and \c verticalSpacing() to get
+    hold of the spacing between the widgets inside the layout. If the value 
+    is less than or equal to 0, this value will be used. If not, 
+    \c smartSpacing() will be called to calculate the spacing.
+
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 5
+    
+    We then implement \c count() to return the number of items in the 
+    layout. To navigate the list of items we use \c itemAt() and 
+    takeAt() to remove and return items from the list. If an item is 
+    removed, the remaining items will be renumbered. All three 
+    functions are pure virtual functions from QLayout.
+
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 6
+
+    \c expandingDirections() returns the \l{Qt::Orientation}s in which the
+    layout can make use of more space than its \c sizeHint().
+
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 7
+
+    To adjust to widgets of which height is dependent on width, we implement \c
+    heightForWidth(). The function \c hasHeightForWidth() is used to test for this
+    dependency, and \c heightForWidth() passes the width on to \c doLayout() which
+    in turn uses the width as an argument for the layout rect, i.e., the bounds in
+    which the items are laid out. This rect does not include the layout margin().
+    
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 8
+
+    \c setGeometry() is normally used to do the actual layout, i.e., calculate
+    the geometry of the layout's items. In this example, it calls \c doLayout()
+    and passes the layout rect.
+
+    \c sizeHint() returns the preferred size of the layout and \c minimumSize()
+    returns the minimum size of the layout.
+
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 9
+
+    \c doLayout() handles the layout if \c horizontalSpacing() or \c
+    verticalSpacing() don't return the default value. It uses 
+    \c getContentsMargins() to calculate the area available to the 
+    layout items. 
+ 
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 10
+
+	It then sets the proper amount of spacing for each widget in the 
+	layout, based on the current style. 
+	
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 11
+
+	The position of each item in the layout is then calculated by 
+	adding the items width and the line height to the initial x and y 
+	coordinates. This in turn lets us find out whether the next item 
+	will fit on the current line or if it must be moved down to the next. 
+	We also find the height of the current line based on the widgets height. 
+	
+    \snippet examples/layouts/flowlayout/flowlayout.cpp 12
+
+	\c smartSpacing() is designed to get the default spacing for either 
+	the top-level layouts or the sublayouts. The default spacing for 
+	top-level layouts, when the parent is a QWidget, will be determined 
+	by querying the style. The default spacing for sublayouts, when 
+	the parent is a QLayout, will be determined by querying the spacing 
+	of the parent layout.
+
+*/
\ No newline at end of file
diff --git a/doc/src/examples/googlechat.qdoc b/doc/src/examples/googlechat.qdoc
new file mode 100644
index 0000000..f2d61cf
--- /dev/null
+++ b/doc/src/examples/googlechat.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkit/googlechat
+    \title Google Chat Example
+
+    The Google Chat example shows how to use implement a simple Google Chat
+    client with QtWebKit.
+
+    \image googlechat-example.png
+
+*/
diff --git a/doc/src/examples/googlesuggest.qdoc b/doc/src/examples/googlesuggest.qdoc
new file mode 100644
index 0000000..a9b09f9
--- /dev/null
+++ b/doc/src/examples/googlesuggest.qdoc
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (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 qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example network/googlesuggest
+    \title Google Suggest Example
+
+    The Google Suggest example shows how to use the network access manager
+    to get the list of suggested search terms from Google.
+
+    \image googlesuggest-example.png
+
+*/
diff --git a/doc/src/images/fancybrowser-example.png b/doc/src/images/fancybrowser-example.png
new file mode 100644
index 0000000..717ac9d
--- /dev/null
+++ b/doc/src/images/fancybrowser-example.png
diff --git a/doc/src/images/flowlayout-example.png b/doc/src/images/flowlayout-example.png
index 27660d6..61abe1f 100644
--- a/doc/src/images/flowlayout-example.png
+++ b/doc/src/images/flowlayout-example.png
diff --git a/doc/src/images/googlechat-example.png b/doc/src/images/googlechat-example.png
new file mode 100644
index 0000000..0338445
--- /dev/null
+++ b/doc/src/images/googlechat-example.png
diff --git a/doc/src/images/googlesuggest-example.png b/doc/src/images/googlesuggest-example.png
new file mode 100644
index 0000000..4ef072a
--- /dev/null
+++ b/doc/src/images/googlesuggest-example.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 49dfafd..4ead9e4 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -85,12 +85,6 @@
         \endif
     \endif
 
-    \if defined(opensourceedition)
-    \bold{Note:} This edition is for the development of \l{Qt
-    Open Source Edition}{Free and Open Source} software only; see
-    \l{Qt Commercial Editions}.
-    \endif
-
     \raw HTML
         <table cellpadding="2" cellspacing="1" border="0" width="100%" bgcolor="#e5e5e5">
         <tr>
diff --git a/doc/src/known-issues.qdoc b/doc/src/known-issues.qdoc
index 60fd63d..91e122f 100644
--- a/doc/src/known-issues.qdoc
+++ b/doc/src/known-issues.qdoc
@@ -60,11 +60,10 @@
 
     \section2 Intel Compiler Support
 
-    Although it is possible to build applications against Qt 4.5.0 using Intel
-    CC 10, these applications will crash when run. A fix for this issue is
-    scheduled for Qt 4.5.1. We recommend that developers who rely on this
-    compiler wait until the fix is applied before upgrading to the Qt 4.5.x
-    series of releases.
+    Although it is possible to build applications against Qt 4.5.x using Intel
+    CC 10, these applications will crash when run.  We recommend that developers
+    who rely on this compiler wait until a fix is available before upgrading to
+    the Qt 4.5.x series of releases.
 
     \section2 X11 Hardware Support
 
diff --git a/doc/src/layout.qdoc b/doc/src/layout.qdoc
index 38163c8..55dfd8b 100644
--- a/doc/src/layout.qdoc
+++ b/doc/src/layout.qdoc
@@ -371,7 +371,7 @@
             should store the value in a local variable if you need it again
             later within in the same function.
         \o  You should not call QLayoutItem::setGeometry() twice on the same
-            item in the smae function. This call can be very expensive if the
+            item in the same function. This call can be very expensive if the
             item has several child widgets, because the layout manager must do
             a complete layout every time. Instead, calculate the geometry and
             then set it. (This does not only apply to layouts, you should do
diff --git a/doc/src/licenses.qdoc b/doc/src/licenses.qdoc
index b42b882..1c3f6d2 100644
--- a/doc/src/licenses.qdoc
+++ b/doc/src/licenses.qdoc
@@ -239,6 +239,24 @@
     \o Parts of the internal QImageSmoothScaler::scale() function use code
     based on pnmscale.c by Jef Poskanzer.
     \endlist
+
+    \hr
+
+    jQuery JavaScript Library v1.3.2
+    http://jquery.com/
+
+    Copyright (c) 2009 John Resig
+    Dual licensed under the MIT and GPL licenses.
+    http://docs.jquery.com/License
+
+    Sizzle CSS Selector Engine - v0.9.3
+    Copyright 2009, The Dojo Foundation
+    Released under the MIT, BSD, and GPL Licenses.
+    More information: http://sizzlejs.com/
+
+    \list
+    \o examples/webkit/fancybrowser/jquery.min.js
+    \endlist
 */
 
 /*!
diff --git a/doc/src/phonon-api.qdoc b/doc/src/phonon-api.qdoc
index 3d04c68..501b5a5 100644
--- a/doc/src/phonon-api.qdoc
+++ b/doc/src/phonon-api.qdoc
@@ -4457,12 +4457,12 @@
 */
 
 /*!
-    \fn QList<int> Phonon::GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, HideAdvancedDevicesOverride override = FromSettings) const
+    \fn QList<int> Phonon::GlobalConfig::audioOutputDeviceListFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const
     \internal
 */
 
 /*!
-    \fn int Phonon::GlobalConfig::audioOutputDeviceFor(Phonon::Category category) const
+    \fn int Phonon::GlobalConfig::audioOutputDeviceFor(Phonon::Category category, int override = AdvancedDevicesFromSettings) const
     \internal
 */
 
diff --git a/doc/src/platform-notes.qdoc b/doc/src/platform-notes.qdoc
index 6532d1e..c8046c4 100644
--- a/doc/src/platform-notes.qdoc
+++ b/doc/src/platform-notes.qdoc
@@ -232,9 +232,7 @@
 
     \section1 Windows Vista
 
-    Known issues for Qt on Vista will be listed here.
-
-    As of Qt 4.2.0 no Vista-specific issues are known.
+    At the time Qt %VERSION% was released, there were no known Vista-specific issues.
 
     \target Windows NT
     \section1 Windows XP, Windows 2000 and Windows NT
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index d9f001e..9ea6b52 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -129,13 +129,8 @@
            Therefore, if it is important to minimize resource
            consumption, do not set this attribute.
 
-    \value AA_MSWindowsUseDirect3DByDefault Is a Windows specific
-           attribute, that will make the Direct3D paint engine the
-           default Qt widget paint engine.  Note that you can toggle
-           usage of the Direct3D engine on individual QWidgets by
-           setting/clearing the \c WA_MSWindowsUseDirect3D attribute
-           on a specific widget. \bold {This functionality is
-           experimental}.
+    \value AA_MSWindowsUseDirect3DByDefault This value is obsolete and
+           has no effect.
 
     \value AA_DontShowIconsInMenus Actions with the Icon property won't be
            shown in any menus unless specifically set by the
@@ -948,10 +943,8 @@
     position. This is set/cleared by QWidget::move() and
     by QWidget::setGeometry().
 
-    \value WA_MSWindowsUseDirect3D Makes drawing to a widget
-    with this attribute set use the Direct3D paint engine, if the
-    Direct3D paint engine is available. \bold {This functionality
-    is experimental.}
+    \value WA_MSWindowsUseDirect3D This value is obsolete and has no
+    effect.
 
     \value WA_NoBackground This value is obsolete. Use
     WA_OpaquePaintEvent instead.
@@ -2658,3 +2651,16 @@
     \sa QGraphicsWidget::windowFrameSectionAt()
 
 */
+
+/*!
+  \enum Qt::TileRule
+  \since 4.6
+
+  This enum describes how to repeat or stretch the parts of an image when drawing.
+
+  \value Stretch   Scale the image to fit to the available area.
+  \value Repeat    Tile the image until there is no more space. May crop the last image.
+  \value Round     Like Repeat, but scales the images down to ensure that the last image is not cropped.
+
+  \sa QPixmapBorders, qDrawBorderPixmap()
+*/
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index cd66c10..5d83ef2 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -161,9 +161,9 @@
     \o Support for OLE verbs and MIME data handling in \l{ActiveQt}.
     \endlist
 
-    For more information about improvements in the current release, see
-    the \l{http://www.qtsoftware.com/developer/changes/changes-4.1.4/}
-    {detailed list of changes}.
+    For more information about improvements in each Qt release, see
+    the \l{http://www.qtsoftware.com/developer/changes/}
+    {detailed lists of changes}.
 
     \section1 Significant Improvements
 
@@ -447,11 +447,10 @@
     \l{http://www.qtsoftware.com/developer/changes/changes-4.5.0}{available online}.
     A \l{Known Issues in %VERSION%}{list of known issues} for this release is also
     available.
-    \omit
+
     Changes between this release and the previous release are provided
     in the \c{changes-%VERSION%} file (also
     \l{http://www.qtsoftware.com/developer/changes/changes-%VERSION%}{available online}).
-    \endomit
 
     A list of other Qt 4 features can be found on the
     \bold{\l{What's New in Qt 4}} page.
diff --git a/doc/src/qtcocoa-known-issues.qdoc b/doc/src/qtcocoa-known-issues.qdoc
deleted file mode 100644
index eedbd68..0000000
--- a/doc/src/qtcocoa-known-issues.qdoc
+++ /dev/null
@@ -1,168 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (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 qt-sales@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page qtcocoa-known-issues.html
-    \title Known Issues with the Qt/Mac Cocoa Port
-
-    This document explains the current list of features in the Qt/Mac Cocoa port
-    that are currently not working. Most of the issues will be addressed in
-    upcoming snapshots and beta releases. We hope that all the issues should be
-    addressed by the time the of the final 4.5.0 release.
-
-    \tableofcontents
-
-    \section1 What Works
-    
-    Here are the things that we can say about the current state of the Qt/Mac Cocoa port.
-
-    \list
-    \i \e{64-bit Support}:
-    The Qt libraries currently do build and link as 64-bit frameworks and it is
-    possible to build and run many of the Qt examples as 64-bit.
-
-    \i \e{HIViews are now NSViews}:
-    Every QWidget is now backed by an NSView pointer instead of an HIViewRef.
-    QWidget::winId() will return an NSView pointer that can be used in other
-    Cocoa technologies (e.g., Core Animation).
-
-    \i \e{Some Native Dialogs Work}:
-    QFileDialog and QColorDialog have been ported to use NSOpen-/NSSavePanel and
-    NSColorPanel respectively. QPrintDialog and QPageSetupDialog are not in
-    this release, but are on their way. Currently, none of these dialogs show
-    up as sheets pending the creation of an asynchronous API.
-
-    \i \e{Painting, Printing, and Styles}:
-    Since printing and painting used Quartz 2D and styling used HITheme, these
-    sub-systems work without any changes.
-
-    \i \e {OpenGL}:
-    OpenGL is fully supported,including pixel buffers and framebuffer objects.
-
-    \i \e{Clipboard}:
-    Using QClipboard to copy and paste data works as expected.
-
-    \i \e{Mouse, Keyboard, and Wheel events}:
-    Mouse, keyboard, and wheel events are dispatched to the proper
-    widget. The Qt/Mac Cocoa port respects Cocoa's idea of a "First
-    Responder."
-
-    \endlist
-
-    \section1 Current Known Issues
-
-    The following are items that don't currently work, but that we plan to have
-    resolved before the final release of the Qt/Mac Cocoa port. Please do not
-    file bugs on these. 
-
-    \list
-    \i \e{Carbon Support}:
-    The current source tree for the Qt/Mac Cocoa port contains source for
-    building Qt/Mac with Cocoa. It contains some of the source code that is
-    used for the Carbon port, but it is currently not set up to build the
-    Carbon Qt/Mac libraries. Please use a normal release or snapshot if you
-    want to use Carbon.
-
-    \i \e{Drag and Drop Support}:
-    Drag and Drop is currently not implemented and needs to be ported to Cocoa,
-    but using the clipboard does work at this time.
-
-    \i \e {Accessibility}:
-    Accessibility support is not implemented and needs to be ported to Cocoa.
-
-    \i \e {Text}:
-    Most text rendering works fine for Latin-1 characters. However, rendering
-    non-Latin-1 characters has not been tested.
-
-    \i \e {Input Methods}:
-    Input methods also need to be ported to Cocoa.
-
-    \i \e {Shortcuts}:
-    Shortcuts that exist outside of the menu bar may not be dispatched.
-
-    \i \e {Tablet Support}:
-    The tablet support has not been ported from Carbon yet. However, it should
-    still be possible to use the tablet as a mouse.
-
-    \i \e {Phonon}:
-    Phonon uses the QuickTime backend that is only available on 32-bit. Using
-    Phonon in 64-bit requires a QTKit-based backend and has not been done.
-
-    \i \e {Unified Toolbar}:
-    The QMainWindow::setUnifiedTitleAndToolBarOnMac() method currently does nothing.
-
-    \i \e {Dialogs, Tool Windows, Sheets, and Drawers}:
-    At the moment, all windows are subclasses of NSWindow. This means that
-    window types like drawers and sheets do not work and tool windows do not
-    get the right decorations. Modal dialogs do show up at the correct window
-    level, but are not yet considered "panels." Many window flags are not
-    recognized.
-
-    \endlist
-
-    \section1 Things We Don't Expect to Support
-
-    The following items that we do not plan on spending any resources on unless
-    there is monumental outcry for their inclusion.
-
-    \list 
-    \i \e{Qt3Support}:
-    At this time we have no plans for making the Qt3Support module work with
-    the Qt/Mac Cocoa port in 64-bit mode. Following in footsteps of Apple, we
-    would like to encourage you to consider the time of going Cocoa and 64-bit
-    as a chance to jettison Qt 3 constructs and classes.
-
-    \i \e{Support for versions of Mac OS X below 10.5}:
-    We are using methods and classes that are only available in 10.5 and
-    higher. Most of these functions don't have any equivalent on earlier
-    versions. We recommend using the Carbon version for earlier versions of Mac
-    OS X. We anticipate keeping the Carbon port supported at least for the
-    lifetime of 4.5.
-
-    \i \e{Support for -no-framework or -static}:
-    Cocoa requires that we load a nib in order to properly access the global
-    menu bar. This nib has to reside on disk somewhere. The most logical place
-    for it to reside is inside the QtGui framework. For this reason, building
-    Qt as standard "dylibs" or statically is no longer supported.
-
-    \endlist
-
-*/
diff --git a/doc/src/qtwebkit.qdoc b/doc/src/qtwebkit.qdoc
deleted file mode 100644
index 0092950..0000000
--- a/doc/src/qtwebkit.qdoc
+++ /dev/null
@@ -1,189 +0,0 @@
-/*!
-    \module QtWebKit
-    \title QtWebKit Module
-    \contentspage Qt's Modules
-    \previouspage QtSvg
-    \nextpage QtXml
-    \ingroup architecture
-    \ingroup modules
-    \brief An introduction to the QtWebKit module.
-
-    \keyword Browser
-    \keyword Web Browser
-
-    \since 4.4
-
-    QtWebKit provides a Web browser engine that makes it easy to embed content
-    from the World Wide Web into your Qt application. At the same time Web
-    content can be enhanced with native controls.
-
-    QtWebKit provides facilities for rendering of HyperText Markup Language
-    (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector
-    Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and
-    scripted with JavaScript.
-
-    A bridge between the JavaScript execution environment and the Qt object
-    model makes it possible for custom QObjects to be scripted. Integration
-    with the Qt networking module enables Web pages to be transparently loaded
-    from Web servers, the local file system or even the Qt resource system.
-
-    In addition to providing pure rendering features, HTML documents can be
-    made fully editable to the user through the use of the \c{contenteditable}
-    attribute on HTML elements.
-
-    QtWebKit is based on the Open Source WebKit engine. More information about
-    WebKit itself can be found on the \l{WebKit Open Source Project} Web site.
-
-    The QtWebKit module is part of the \l{Qt Full Framework Edition}, and the
-    \l{Open Source Versions of Qt}.
-
-    \note Building the QtWebKit module with debugging symbols is problematic
-    on many platforms due to the size of the WebKit engine. We recommend
-    building the module in release mode only for embedded platforms.
-
-    \note Web site icons, also known as "FavIcons", are currently not supported
-    on Windows. We plan to address this in a future release.
-
-    \note WebKit has certain minimum requirements that must be met on
-    Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements}
-    document for more information.
-
-    Topics:
-
-    \tableofcontents
-
-    \section1 Configuring the Build Process
-
-    Applications that use QtWebKit's classes need to be configured to be built
-    against the QtWebKit module. The following declaration in a \c qmake
-    project file ensures that an application is compiled and linked
-    appropriately:
-
-    \snippet doc/src/snippets/code/doc_src_qtwebkit.qdoc 0
-
-    This line is necessary because only the QtCore and QtGui modules are used
-    in the default build process.
-
-    To include the definitions of the module's classes, use the following
-    directive:
-
-    \snippet doc/src/snippets/code/doc_src_qtwebkit.qdoc 1
-
-    \section1 Architecture
-
-    The easiest way to render content is through the QWebView class. As a
-    widget it can be embedded into your forms or a graphics view, and it
-    provides convenience functions for downloading and rendering web sites.
-
-    \snippet snippets/webkit/simple/main.cpp Using QWebView
-
-    QWebView acts as a view onto Web pages, each of which is represented by an
-    instance of the QWebPage class. QWebPage provides access to the document
-    structure in a page, describing features such as frames, the navigation
-    history, and the undo/redo stack for editable content.
-
-    HTML documents can be nested using frames in a frameset. An individual
-    frame in HTML is represented using the QWebFrame class. It includes the
-    bridge to the JavaScript window object and can be painted using QPainter.
-    Each QWebPage has one QWebFrame object as its main frame.
-
-    Individual browser features, defaults and other settings can be configured
-    through the QWebSettings class. It is possible to provide defaults for all
-    QWebPage instances through the default settings. Individual attributes
-    can be overidden by the page specific settings object.
-
-    \section1 Netscape Plugin Support
-
-    Since WebKit supports the Netscape Plugin API, Qt applications can display
-    Web pages that embed common plugins, as long as the user has the appropriate
-    binary files for those plugins installed.
-
-    The following locations are searched for plugins:
-
-    \table
-    \header \o Linux/Unix  \o Windows
-    \row \o{1,3}
-    \list
-    \o \c{.mozilla/plugins} in the user's home directory
-    \o \c{.netscape/plugins} in the user's home directory
-    \o System locations, such as
-    \list
-    \o \c{/usr/lib/browser/plugins}
-    \o \c{/usr/local/lib/mozilla/plugins}
-    \o \c{/usr/lib/firefox/plugins}
-    \o \c{/usr/lib64/browser-plugins}
-    \o \c{/usr/lib/browser-plugins}
-    \o \c{/usr/lib/mozilla/plugins}
-    \o \c{/usr/local/netscape/plugins}
-    \o \c{/opt/mozilla/plugins}
-    \o \c{/opt/mozilla/lib/plugins}
-    \o \c{/opt/netscape/plugins}
-    \o \c{/opt/netscape/communicator/plugins}
-    \o \c{/usr/lib/netscape/plugins}
-    \o \c{/usr/lib/netscape/plugins-libc5}
-    \o \c{/usr/lib/netscape/plugins-libc6}
-    \o \c{/usr/lib64/netscape/plugins}
-    \o \c{/usr/lib64/mozilla/plugins}
-    \endlist
-    \o Locations specified by environment variables:
-    \list
-    \o \c{$MOZILLA_HOME/plugins}
-    \o \c{$MOZ_PLUGIN_PATH}
-    \o \c{$QTWEBKIT_PLUGIN_PATH}
-    \endlist
-    \endlist
-
-    \o
-    \list
-    \o The user's \c{Application Data\Mozilla\plugins} directory
-    \o Standard system locations of plugins for Quicktime, Flash, etc.
-    \endlist
-
-    \row
-    \raw HTML
-    <th class="qt-style">Mac OS X</th>
-    \endraw
-    \row
-    \o
-    \list
-    \o \c{Library/Internet Plug-Ins} in the user's home directory
-    \o The system \c{/Library/Internet Plug-Ins} directory
-    \endlist
-    \endtable
-
-    \section1 License Information
-
-    This is a snapshot of the Qt port of WebKit. The exact version information
-    can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt.
-
-    Qt Commercial Edition licensees that wish to distribute applications that
-    use the QtWebKit module need to be aware of their obligations under the
-    GNU Lesser General Public License (LGPL). 
-
-    Developers using the Open Source Edition can choose to redistribute
-    the module under the appropriate version of the GNU LGPL; version 2.1
-    for applications and libraries licensed under the GNU GPL version 2,
-    or version 3 for applications and libraries licensed under the GNU
-    GPL version 2.
-
-    \legalese
-    WebKit is licensed under the GNU Library General Public License.
-    Individual contributor names and copyright dates can be found
-    inline in the code.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-    \endlegalese
-*/
diff --git a/doc/src/snippets/alphachannel.cpp b/doc/src/snippets/alphachannel.cpp
index 7783271..ad0885a 100644
--- a/doc/src/snippets/alphachannel.cpp
+++ b/doc/src/snippets/alphachannel.cpp
@@ -47,11 +47,8 @@
 #include <qfile.h>
 #include <qdir.h>
 #include <qfileinfo.h>
-
-#if (QT_VERSION) >= 0x040000
 #include <QtGui>
 #include <QtCore>
-#endif
 
 class MyClass : public QWidget
 {
@@ -95,12 +92,10 @@ protected:
 //! [0]
     }
 
-    QPixmap channelImage, pixmap; 
+    QPixmap channelImage, pixmap;
     QSize sizeHint() const { return QSize(500, 500); }
 };
 
-    
-
 int main(int argc, char **argv)
 {
      QApplication app(argc, argv);
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index 66bb998..e35dad9 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -44,7 +44,7 @@ PATH               - to locate qmake, moc and other Qt tools
 
 //! [8]
 C:
-cd /D C:\Qt\4.4.0-rc1
+cd /D C:\Qt\%VERSION%
 configure
 //! [8]
 
diff --git a/doc/src/snippets/code/doc_src_qtestlib.qdoc b/doc/src/snippets/code/doc_src_qtestlib.qdoc
index a4ef52e..a0e4944 100644
--- a/doc/src/snippets/code/doc_src_qtestlib.qdoc
+++ b/doc/src/snippets/code/doc_src_qtestlib.qdoc
@@ -61,7 +61,7 @@ void TestQString::toUpper()
 
 
 //! [9]
-/myTestDirectory$ qmake -project "QT += testlib"
+/myTestDirectory$ qmake -project "CONFIG += qtestlib"
 /myTestDirectory$ qmake
 /myTestDirectory$ make
 //! [9]
@@ -69,7 +69,7 @@ void TestQString::toUpper()
 
 //! [10]
 ********* Start testing of TestQString *********
-Config: Using QTest library 4.1.0, Qt 4.1.0
+Config: Using QTest library %VERSION%, Qt %VERSION%
 PASS   : TestQString::initTestCase()
 PASS   : TestQString::toUpper()
 PASS   : TestQString::cleanupTestCase()
@@ -99,4 +99,4 @@ private slots:
         }
     }
 };
-//! [12]
\ No newline at end of file
+//! [12]
diff --git a/doc/src/snippets/code/doc_src_qtwebkit.qdoc b/doc/src/snippets/code/doc_src_qtwebkit.qdoc
deleted file mode 100644
index d4fc2bd..0000000
--- a/doc/src/snippets/code/doc_src_qtwebkit.qdoc
+++ /dev/null
@@ -1,8 +0,0 @@
-//! [0]
-QT += webkit
-//! [0]
-
-
-//! [1]
-#include <QtWebKit>
-//! [1]
diff --git a/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp b/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp
deleted file mode 100644
index f04cd29..0000000
--- a/doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-
-void wrapInFunction()
-{
-
-//! [0]
-    view->page()->history();
-//! [0]
-
-
-//! [1]
-    view->page()->settings();
-//! [1]
-
-
-//! [2]
-    view->triggerAction(QWebPage::Copy);
-//! [2]
-
-
-//! [3]
-    view->page()->triggerPageAction(QWebPage::Stop);
-//! [3]
-
-
-//! [4]
-    view->page()->triggerPageAction(QWebPage::GoBack);
-//! [4]
-
-
-//! [5]
-    view->page()->triggerPageAction(QWebPage::GoForward);
-//! [5]
-
-}
-
diff --git a/doc/src/snippets/code/src_qdbus_qdbusargument.cpp b/doc/src/snippets/code/src_qdbus_qdbusargument.cpp
index b982510..efd54ac 100644
--- a/doc/src/snippets/code/src_qdbus_qdbusargument.cpp
+++ b/doc/src/snippets/code/src_qdbus_qdbusargument.cpp
@@ -4,7 +4,7 @@ struct MyStructure
     int count;
     QString name;
 };
-QT_DECLARE_METATYPE(MyStructure)
+Q_DECLARE_METATYPE(MyStructure)
 
 // Marshall the MyStructure data into a D-Bus argument
 QDBusArgument &operator<<(QDBusArgument &argument, const MyStructure &mystruct)
diff --git a/doc/src/snippets/webkit/simple/simple.pro b/doc/src/snippets/webkit/simple/simple.pro
deleted file mode 100644
index 61cd3bf..0000000
--- a/doc/src/snippets/webkit/simple/simple.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-QT       += webkit
-SOURCES   = main.cpp
diff --git a/doc/src/snippets/webkit/webpage/main.cpp b/doc/src/snippets/webkit/webpage/main.cpp
deleted file mode 100644
index b433ac2..0000000
--- a/doc/src/snippets/webkit/webpage/main.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-#include <QtGui>
-#include <QWebPage>
-#include <QWebFrame>
-
-//! [0]
-class Thumbnailer : public QObject
-{
-    Q_OBJECT
-
-public:
-    Thumbnailer(const QUrl &url);
-
-signals:
-    void finished();
-
-private slots:
-    void render();
-
-private:
-    QWebPage page;
-
-};
-//! [0]
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    Thumbnailer thumbnail(QUrl("http://qtsoftware.com"));
-
-    QObject::connect(&thumbnail, SIGNAL(finished()),
-        &app, SLOT(quit()));
-
-    return app.exec();
-}
-
-//! [1]
-Thumbnailer::Thumbnailer(const QUrl &url)
-{
-    page.mainFrame()->load(url);
-    connect(&page, SIGNAL(loadFinished(bool)),
-        this, SLOT(render()));
-}
-//! [1]
-
-//! [2]
-void Thumbnailer::render()
-{
-    page.setViewportSize(page.mainFrame()->contentsSize());
-    QImage image(page.viewportSize(), QImage::Format_ARGB32);
-    QPainter painter(&image);
-
-    page.mainFrame()->render(&painter);
-    painter.end();
-
-    QImage thumbnail = image.scaled(400, 400);
-    thumbnail.save("thumbnail.png");
-
-    emit finished();
-}
-//! [2]
-#include "main.moc"
diff --git a/doc/src/snippets/webkit/webpage/webpage.pro b/doc/src/snippets/webkit/webpage/webpage.pro
deleted file mode 100644
index fcad03b..0000000
--- a/doc/src/snippets/webkit/webpage/webpage.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG += console
-QT += webkit
-SOURCES = main.cpp
\ No newline at end of file