From 5467c3f8eb6f7d2b5c5a72b9c2e0fd94ae325c24 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Thu, 20 May 2010 14:28:36 +1000
Subject: Fix crash on exit in native wifi plugin on Vista+ when run in
 debugger.

Close the wlanapi handle before main function returns.
---
 .../bearer/nativewifi/qnativewifiengine.cpp        | 91 +++++++++++++++++-----
 src/plugins/bearer/nativewifi/qnativewifiengine.h  |  5 +-
 2 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
index 9b6ffa0..1a55402 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.cpp
@@ -46,6 +46,7 @@
 #include <QtNetwork/private/qnetworkconfiguration_p.h>
 
 #include <QtCore/qstringlist.h>
+#include <QtCore/qcoreapplication.h>
 
 #include <QtCore/qdebug.h>
 
@@ -79,38 +80,26 @@ void qNotificationCallback(WLAN_NOTIFICATION_DATA *data, QNativeWifiEngine *d)
 }
 
 QNativeWifiEngine::QNativeWifiEngine(QObject *parent)
-:   QBearerEngineImpl(parent), handle(0)
+:   QBearerEngineImpl(parent), handle(INVALID_HANDLE_VALUE)
 {
-    DWORD clientVersion;
-
-    DWORD result = local_WlanOpenHandle(1, 0, &clientVersion, &handle);
-    if (result != ERROR_SUCCESS) {
-#ifdef BEARER_MANAGEMENT_DEBUG
-        if (result != ERROR_SERVICE_NOT_ACTIVE)
-            qDebug("%s: WlanOpenHandle failed with error %ld\n", __FUNCTION__, result);
-#endif
-
-        return;
-    }
-
-    result = local_WlanRegisterNotification(handle, WLAN_NOTIFICATION_SOURCE_ALL, true,
-                                            WLAN_NOTIFICATION_CALLBACK(qNotificationCallback),
-                                            this, 0, 0);
-#ifdef BEARER_MANAGEMENT_DEBUG
-    if (result != ERROR_SUCCESS)
-        qDebug("%s: WlanRegisterNotification failed with error %ld\n", __FUNCTION__, result);
-#endif
+    connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(closeHandle()));
 }
 
 QNativeWifiEngine::~QNativeWifiEngine()
 {
-    local_WlanCloseHandle(handle, 0);
+    closeHandle();
 }
 
 void QNativeWifiEngine::scanComplete()
 {
     QMutexLocker locker(&mutex);
 
+    if (!available()) {
+        locker.unlock();
+        emit updateCompleted();
+        return;
+    }
+
     // enumerate interfaces
     WLAN_INTERFACE_INFO_LIST *interfaceList;
     DWORD result = local_WlanEnumInterfaces(handle, 0, &interfaceList);
@@ -249,6 +238,9 @@ QString QNativeWifiEngine::getInterfaceFromId(const QString &id)
 {
     QMutexLocker locker(&mutex);
 
+    if (!available())
+        return QString();
+
     // enumerate interfaces
     WLAN_INTERFACE_INFO_LIST *interfaceList;
     DWORD result = local_WlanEnumInterfaces(handle, 0, &interfaceList);
@@ -304,6 +296,9 @@ bool QNativeWifiEngine::hasIdentifier(const QString &id)
 {
     QMutexLocker locker(&mutex);
 
+    if (!available())
+        return false;
+
     // enumerate interfaces
     WLAN_INTERFACE_INFO_LIST *interfaceList;
     DWORD result = local_WlanEnumInterfaces(handle, 0, &interfaceList);
@@ -364,6 +359,12 @@ void QNativeWifiEngine::connectToId(const QString &id)
 {
     QMutexLocker locker(&mutex);
 
+    if (!available()) {
+        locker.unlock();
+        emit connectionError(id, InterfaceLookupError);
+        return;
+    }
+
     WLAN_INTERFACE_INFO_LIST *interfaceList;
     DWORD result = local_WlanEnumInterfaces(handle, 0, &interfaceList);
     if (result != ERROR_SUCCESS) {
@@ -440,6 +441,12 @@ void QNativeWifiEngine::disconnectFromId(const QString &id)
 {
     QMutexLocker locker(&mutex);
 
+    if (!available()) {
+        locker.unlock();
+        emit connectionError(id, InterfaceLookupError);
+        return;
+    }
+
     QString interface = getInterfaceFromId(id);
 
     if (interface.isEmpty()) {
@@ -479,6 +486,12 @@ void QNativeWifiEngine::requestUpdate()
 {
     QMutexLocker locker(&mutex);
 
+    if (!available()) {
+        locker.unlock();
+        emit updateCompleted();
+        return;
+    }
+
     // enumerate interfaces
     WLAN_INTERFACE_INFO_LIST *interfaceList;
     DWORD result = local_WlanEnumInterfaces(handle, 0, &interfaceList);
@@ -555,6 +568,42 @@ QNetworkConfigurationPrivatePointer QNativeWifiEngine::defaultConfiguration()
     return QNetworkConfigurationPrivatePointer();
 }
 
+bool QNativeWifiEngine::available()
+{
+    if (handle != INVALID_HANDLE_VALUE)
+        return true;
+
+    DWORD clientVersion;
+
+    DWORD result = local_WlanOpenHandle(1, 0, &clientVersion, &handle);
+    if (result != ERROR_SUCCESS) {
+#ifdef BEARER_MANAGEMENT_DEBUG
+        if (result != ERROR_SERVICE_NOT_ACTIVE)
+            qDebug("%s: WlanOpenHandle failed with error %ld\n", __FUNCTION__, result);
+#endif
+
+        return false;
+    }
+
+    result = local_WlanRegisterNotification(handle, WLAN_NOTIFICATION_SOURCE_ALL, true,
+                                            WLAN_NOTIFICATION_CALLBACK(qNotificationCallback),
+                                            this, 0, 0);
+#ifdef BEARER_MANAGEMENT_DEBUG
+    if (result != ERROR_SUCCESS)
+        qDebug("%s: WlanRegisterNotification failed with error %ld\n", __FUNCTION__, result);
+#endif
+
+    return handle != INVALID_HANDLE_VALUE;
+}
+
+void QNativeWifiEngine::closeHandle()
+{
+    if (handle != INVALID_HANDLE_VALUE) {
+        local_WlanCloseHandle(handle, 0);
+        handle = INVALID_HANDLE_VALUE;
+    }
+}
+
 bool QNativeWifiEngine::requiresPolling() const
 {
     // On Windows XP SP2 and SP3 only connection and disconnection notifications are available.
diff --git a/src/plugins/bearer/nativewifi/qnativewifiengine.h b/src/plugins/bearer/nativewifi/qnativewifiengine.h
index 3b21985..0e9576b 100644
--- a/src/plugins/bearer/nativewifi/qnativewifiengine.h
+++ b/src/plugins/bearer/nativewifi/qnativewifiengine.h
@@ -91,12 +91,13 @@ public:
 
     QNetworkConfigurationPrivatePointer defaultConfiguration();
 
-    inline bool available() const { return handle != 0; }
+    bool available();
 
     bool requiresPolling() const;
 
-public Q_SLOTS:
+private Q_SLOTS:
     void scanComplete();
+    void closeHandle();
 
 private:
     Qt::HANDLE handle;
-- 
cgit v0.12


From 2eed3e243d6db81433bfdc2dee76edee1d53ceb9 Mon Sep 17 00:00:00 2001
From: Peter Yard <peter.yard@nokia.com>
Date: Thu, 20 May 2010 14:51:55 +1000
Subject: Docs: added an intro for qml, Quick for Beginners.

---
 doc/src/declarative/qml-intro.qdoc    | 969 ++++++++++++++++++++++++++++++++++
 doc/src/images/qml-dial.png           | Bin 0 -> 43754 bytes
 doc/src/images/qml-intro-anchors1.png | Bin 0 -> 15198 bytes
 doc/src/images/qml-intro-anchors2.png | Bin 0 -> 15343 bytes
 doc/src/images/qml-intro-anchors3.png | Bin 0 -> 16745 bytes
 doc/src/images/qml-intro-helloa.png   | Bin 0 -> 18246 bytes
 6 files changed, 969 insertions(+)
 create mode 100644 doc/src/declarative/qml-intro.qdoc
 create mode 100644 doc/src/images/qml-dial.png
 create mode 100644 doc/src/images/qml-intro-anchors1.png
 create mode 100644 doc/src/images/qml-intro-anchors2.png
 create mode 100644 doc/src/images/qml-intro-anchors3.png
 create mode 100644 doc/src/images/qml-intro-helloa.png

diff --git a/doc/src/declarative/qml-intro.qdoc b/doc/src/declarative/qml-intro.qdoc
new file mode 100644
index 0000000..457efa8
--- /dev/null
+++ b/doc/src/declarative/qml-intro.qdoc
@@ -0,0 +1,969 @@
+/**************************************************************************
+**
+**
+** 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 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 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$
+**
+***************************************************************************
+*/
+
+
+
+/*!
+
+\page  qml-intro.html
+\title Beginning Qt Quick
+
+
+\section1 Overview
+
+
+QML is a high level, scripted language. Its commands, more correctly \e elements,
+leverage the power and efficiency of the Qt libraries to make easy to use
+commands that perform intuitive functions. Draw a rectangle, display an image at
+a position and so on. Behind these elements are complex C++ libraries that
+efficiently perform the action. As with any graphical application, always
+consider that this ability to easily build graphically rich applications means
+that some care may be needed to prevent performance problems.
+
+The language also allows more flexibility of these commands by using
+Javascript rather than C++ to add new layers of logic to your application.
+Javascript is easier to learn than C++ and can be embedded into the QML
+files or imported from a separate file.
+
+\bold{In QML the types of various 'objects' are referred to as \l {QML
+Elements}{ elements}}.
+
+An element usually has various \e properties that help define the element. For
+example, if we created an element called Circle then the radius of the circle
+would be a property.
+
+
+\section1 A First Look
+
+The basic syntax of an \l {QML Elements}{element} is
+
+    \code
+    SomeElement {
+        id: myObject
+        ... some other things here ...
+    }
+    \endcode
+
+Here we are defining a new object. We specify its 'type' first as SomeElement.
+Then within matching braces { ... } we specify the various parts of our 
+element.
+
+The \c id is a unique identifier for the element, it must start with a lower
+case letter and only contain letters, numbers and underscores. It is this
+particular object's name. If this SomeElement \l {QML Elements}{element} was
+a Rectangle instead and it was one of many then the \e optional unique id
+would allow us to manipulate each element individually.
+
+Each visual element is ultimately based on, or inherits from, an element
+called \l Item. \l Item has certain properties and actions that may be
+useful. The properties have default values so you need only specify the
+ones you will need.
+
+Take a simple element such as a \l Rectangle. It has an \c id, we will call
+it \e myRectangle, it has a \c width and a \c height. Imagine that we
+want a rectangle that is 500 pixels by 400 pixels in the x and y directions
+(horizontal by vertical).
+
+We can implement this \l Rectangle with these properties this way
+
+    \code
+    import Qt 4.7
+
+    // This is a comment. And below myRectangle is defined.
+    Rectangle {
+        id: myRectangle
+        width: 500
+        height: 400
+    }
+    \endcode
+
+This is a valid QML script. To run it, copy it and save it to a file, say
+myexample.qml, and on the command line run the command
+
+    \code
+    qml myexample.qml
+    \endcode
+
+It will create a very boring rectangle in its own window.
+
+
+
+\section1 Hello World!
+
+We can now add some color and text to make a Hello World QML program.
+
+\l Rectangle has the property \l {Rectangle::color}{color} to produce a
+background color.
+
+Text is handled by a different element called \l Text. We need to create a
+\l Text object inside the \l Rectangle and set its \l {Text::text}{text}
+property to "Hello World!". So to set the text to 'Hello world' and the
+background colour to light gray,
+
+    \code
+    import Qt 4.7
+    
+    Rectangle {
+        id: myRectangle
+        width: 500
+        height: 400
+
+        Text { text: "Hello World!" }
+
+        color: "lightgray"
+    }
+    \endcode
+
+
+\section1 Hello World Again
+
+From now on we will not always show the import statement for Qt but it
+should still be there when you create your QML scripts.
+
+To make our Hello World example a little nicer set the position of the text
+to be at pixel position x = 100, y = 100 within the displayed window. This
+position belongs to the \l Text element so we set the position inside its
+definition. Note that we separate different QML statements on the same line
+with a semi-colon, or we could have simply put each statement on a new line
+
+    \code
+    Text {
+        text: "<h2>Hello World</h2>"; color: "darkgreen"
+        x: 100; y:100
+    }
+    \endcode
+
+Not only did we reposition the text, but the text was altered by adding
+HTML tags to change the font size. The text color was also changed from the
+default black to dark green by using a standard string for the color's SVG
+name.
+
+We could also have used a hexadecimal string for the RGB (red-green-blue, as
+#rrggbb) values of the color similar to the method used in HTML. For
+example, mostly blue with a green tint,
+
+    \code
+    Text {
+        text: "<h1>Hello world again</h1>"
+        color: "#002288"
+        x: 100; y: 100
+    }
+    \endcode
+
+All of these changes occurred within the \l Text object which is the scope
+of these property changes.
+
+Other objects may use the information but it belongs to the element where
+the property has been defined.
+
+
+\section1 Images
+
+To add an image to our little application we use the \l Image element. An
+\l Image uses a path to an image file, and has properties to control
+the aspect ratio, the image size, to tile the area amongst others. The
+source of the image, the path to the file, is a URL. Therefore the file can
+be local: \e {mydir/myimage1.png}. Or it can be remote:
+\e {"http://www.example.com/images/myimage1.png"}.
+
+    \code
+    Image {
+        source: "images/qt-logo.png"
+    }
+    \endcode
+
+This displays the image, as we would expect, at the top left of the window.
+The position of the default x = 0, y = 0 coordinate. The example here uses
+a PNG file, but it could have been one of various supported formats,
+including JPG and GIF.
+
+Let us reposition the image and enlarge it. Place it at the same 'x' offset
+as the "Hello world again" text, but put it another 50 pixels below the
+text, also make it 150 by 150 pixels in size,
+
+    \code
+    Image {
+        source: "images/qt-logo.png"
+        x: 100; y: 150
+        width: 150; height: 150
+    }
+    \endcode
+
+Adding the Hello World example, with the text and the image example we can
+write a simple piece of QML that starts to look a bit better.
+
+    \code
+    import Qt 4.7
+
+    Rectangle {
+        id: myRectangle
+        width: 500
+        height: 400
+        
+        // A light gray background
+        color: "lightgray"
+
+        // Position and color some text
+        Text {
+            text: "<h1>Hello world again</h1>"
+            color: "darkgreen"
+            x: 100; y: 100
+        }
+
+        // Using the opportunity to resize the image.
+        Image {
+            source: "images/qt-logo.png"
+            x: 100; y: 150
+            width: 150; height: 150
+        }
+
+    }
+    \endcode
+
+The result is still quite simple
+
+\image qml-intro-helloa.png
+
+
+\section1 Anchors: Aligning Elements
+
+Using absolute positioning, such as saying x = 100 and y = 150, works well
+until the user or developer stretches or increases the size of the window.
+Then the positions need to be recalculated. What would be nice would be a
+relative means of positioning of objects in a window or rectangle. For
+example, we want to place an image at the bottom of a rectangle, we would
+like to specify the image's location as the 'bottom of the window', not a
+specific coordinate. We can do this with the anchors property, which
+objects inherit from Item.
+
+The anchors property is really a property group. It is a collection of
+related properties. It has properties within it which can be used by means
+of the dot notation.
+
+The dot notation uses object \c{id}s and property names to use a particular
+object or property. Say I have a rectangle r1, which contains a rectangle
+r2, which contains an Item item1, which has an 'x' property I want to
+change. I just use the dot notation to identify it: r1.r2.item1.x
+
+If we want to position an image at the bottom of the rectangle it is
+inside. I have to specify that the bottom of the image is also at the
+bottom of the rectangle
+
+    \code
+    import Qt 4.7
+
+    Rectangle {
+        id: myWin
+        width: 500
+        height: 400
+
+        Image {
+            id: image1
+            source: "images/qt-logo.png"
+            width: 150; height: 150
+            anchors.bottom: myWin.bottom
+        }
+    }
+    \endcode
+
+This places the logo at the bottom left of the window.
+
+\image qml-intro-anchors1.png  "A simple anchor"
+
+We would like it centered and not touching the bottom of the window, for
+aesthetic reasons. For the centering we use the horizontalCenter property,
+and to prevent the touching of the image to the bottom of the rectangle,
+the bottomMargin property is used. So the new actions for the script are
+
+    \list
+    \o set the bottom of the image (anchors.bottom) to be the bottom of the window
+    \o move the image to be in the horizontal center of the window
+    \o set a margin of 10 pixels so that the image does not touch the bottom window border
+    \endlist
+
+Encoded into QML the script becomes
+
+    \code
+    import Qt 4.7
+
+    Rectangle {
+        id: myWin
+        width: 500
+        height: 400
+
+        Image {
+            id: image1
+            source: "images/qt-logo.png"
+            width: 150; height: 150
+            anchors.bottom: myWin.bottom
+            anchors.horizontalCenter: myWin.horizontalCenter
+            anchors.bottomMargin: 10
+        }
+    }
+    \endcode
+
+
+Run this and resize the window. You will see that now the position of the
+image adjusts during the resize.
+
+\image qml-intro-anchors2.png  "Image Centered at the Bottom"
+
+You can also add another object say a block of descriptive text and place
+it above or below the image or to the side. This code places some text just
+above the image
+
+    \code
+    Text {
+        text: "<h2>The Qt Logo</h2>"
+        anchors.bottom: image1.top
+        anchors.horizontalCenter: myWin.horizontalCenter
+        anchors.bottomMargin: 15
+    }
+    \endcode
+
+\image qml-intro-anchors3.png
+
+\note \e anchors is a property group, to be used within the object. When
+referencing these properties from another object we use the property
+directly, instead of saying:
+
+    \code
+    myRectangle.anchors.top  // Wrong
+    \endcode
+
+we use
+
+    \code
+    myRectangle.top         // Correct
+    \endcode
+
+
+
+
+\section1 Transformations
+
+We can transform a graphical object to get additional effects. Rotate a
+piece of text by 180 degrees to display upside-down text. Rotate an image
+by 90 degrees to lay it on its side. These transformations require
+additonal information.
+
+For rotation, the additional information includes: the origin relative to
+the object being rotated, the axis of rotation, and the angle in degrees to
+rotate the image through in a clockwise direction. The axis does not have
+to be the z-axis, the line between your eyes and the image, it could be
+along the vertical y-axis or the horizontal x-axis. We have three
+dimensions to play with. For simplicity in this example we will rotate
+about the z-axis by 90 degrees in a negative direction, anti-clockwise.
+
+Rotation of text was also suggested. It could also be useful to scale the
+text. We can do both. The \l {Item::transform}{transform} property is a
+\e list of \l Transform elements, so using the list syntax
+
+    \code
+    myList: [ listElement1, listElement2, ... } ]
+    \endcode
+
+we can produce a list of transformations.
+
+The text will be rotated by 45 degrees anti-clockwise and scaled 
+vertically by a factor of 1.5 and by 1.2 horizontally.
+
+Using the example above as the basis for this we have,
+
+    \code
+    import Qt 4.7
+
+    Rectangle {
+        id: myWin
+        width: 500
+        height: 400
+
+        Image {
+            id: image1
+            source: "images/qt-logo.png"
+            width: 150; height: 150
+            anchors.bottom: myWin.bottom
+            anchors.horizontalCenter: myWin.horizontalCenter
+            anchors.bottomMargin: 10
+
+            transform: Rotation {
+                origin.x: 75; origin.y: 75
+                axis{ x: 0; y: 0; z:1 }  angle: -90
+            }
+
+        }
+        
+        Text {
+            text: "<h2>The Qt Logo -- taking it easy</h2>"
+            anchors.bottom: image1.top
+            anchors.horizontalCenter: myWin.horizontalCenter
+            anchors.bottomMargin: 15
+
+            transform: [
+                Scale { xScale: 1.5; yScale: 1.2 } ,
+            
+                Rotation {
+                    origin.x: 75; origin.y: 75
+                    axis{ x: 0; y: 0; z:1 }  angle: -45
+                }
+            ]
+        }
+    }
+    \endcode
+
+The code block in \c image1 starting with \c transform specifies that the
+\l {Item::transform}{transform} property will be a Rotation through -90
+degrees, which is anti-clockwise, about the z-axis running through the
+center of the image at (75,75), since the image is 150 x 150 pixels.
+
+The other transformation available is \l Translate. This produces a change
+in position of the item.
+
+\note In a list of transformations the order of the transformations is
+important. In the above example try swapping around the Scale transform with
+the Rotation transform, remember to remove or add the comma. The results are
+acceptable for our little test but not the same.
+
+
+\section1 Animations
+
+Animation in QML is done by animating properties of objects. Properties
+that are numbers, colors, Rectangles, points and directions. In QML these
+are \l {QML Basic Types} named as real, int, color, rect, point, size, and
+vector3d. There are a number of different ways to do animation. Here we
+will look at a few of them.
+
+\section2 Number Animation
+
+Previously we have used a rotation transformation to change the orientation
+of an image. We could easily animate this rotation so that instead of a
+straight rotation counter-clockwise of 90 degrees we could rotate the image
+through a full 360 degrees in an animation. The axis of rotation wont
+change, the position of the center of the image will not change, only the
+angle will change. Therefore, a NumberAnimation of a rotation's angle should
+be enough for the task. If we wish for a simple rotation about the center
+of the image then we can use the \c rotation property that is inherited
+from \l Item. The rotation property is a real number that specifies the
+angle in a clockwise direction for the rotation of the object. Here is the
+code for our animated rotating image.
+
+    \code
+    import Qt 4.7
+
+    Rectangle {
+        id: mainRec
+        width:  600
+        height: 400
+
+        Image {
+            id: image1
+            source: "images/qt-logo.png"
+            x: 200; y: 100
+            width: 100; height: 100
+            
+            // Animate a rotation
+            transformOrigin: Item.Center
+            NumberAnimation on rotation {
+                from: 0; to: 360
+                duration: 2000
+                loops: Animation.Infinite
+            }
+        }
+    }
+    \endcode
+
+The \c {transformOrigin: Item.Center} is redundant since this is the default
+axis of rotation anyway. But if you change \c Center to \c BottomRight you
+will see an interesting variation.
+
+Also if instead the \l Rotation transformation had been used then we would have
+more control over the various parameters. We could vary the axis, to be not
+just a different offset from the z-axis but along the y-axis, x-axis or
+combination. For example, if the task had been to animate the rotation
+about the y-axis passing through the center of the image then the following
+code would do it.
+
+    \code
+    import Qt 4.7
+
+    Rectangle {
+        id: mainRec
+        width:  600
+        height: 400
+
+        Image {
+            id: image1
+            source: "images/qt-logo.png"
+            x: 200; y: 100
+            width: 100; height: 100
+
+            // Animate a rotation
+            transform: Rotation {
+                origin.x: 50; origin.y: 50; axis {x:0; y:1; z:0} angle:0
+                NumberAnimation on angle  {
+                    from: 0; to: 360;
+                    duration: 3000;
+                    loops: Animation.Infinite
+                }
+            }
+        }
+    }
+    \endcode
+
+Here there is a rectangle 600 by 400 pixels. Placed within that rectangle
+is an image 100 by 100 pixels. It is rotated about the center of the image
+about the y-axis so that it looks as if it is rotating about an invisible
+vertical string holding it up. The time it takes to complete the rotation is 3
+seconds (3,000 milliseconds). The NumberAnimation is applied to the angle
+taking it from 0 (no change) to 360 degrees, back where it started.
+Strictly speaking it isn't necessary to go from 0 to 360 since the same
+location is duplicated, but it makes it easier to read in this example and
+it has no visible effect on the animation. The number of loops that the
+animation will execute is set to \c {Animation.Infinite} which means that the
+animation is in an endless loop.
+
+To see an interesting variation. Change the axis to \c {axis { x:1; y:1; z:1
+}}. This is a line coming from the center of the image downwards to the
+right and out of the screen. Although the change is simple the rotation
+seems complex.
+
+\section2 Sequential Animation
+
+For a more complex animation we will need two images. The first image will
+be placed at the center of a window (Rectangle) and the second image will
+be at the upper left of the window. The animation will move the second
+image from the top left of the window to the bottom right. In doing so we
+will be animating the position and the size of the image.
+
+First create two images
+
+    \code
+    import Qt 4.7
+
+    Rectangle {
+        id: mainRec
+        width:  600
+        height: 400
+        z: 0
+
+        Image {
+            id: image1
+            source: "images/qt-logo.png"
+            x: 20; y: 20 ; z: 1
+            width: 100; height: 100
+        }
+
+        Image {
+            id: image2
+            source: "images/qt-logo.png"
+            width: 100; height: 100
+            x: (mainRec.width - 100)/2; y: (mainRec.height - 100)/2
+            z: 2
+        }
+    }
+    \endcode
+
+We will add to 'image1' a SequentialAnimation from x = 20 to the target of
+x = 450. The 'from' values will be used because we will be repeating the
+animation, so the object needs to know where the original position is, both
+x and y. The SequentialAnimation of x will set it to repeat by indicating
+that the number of animation loops is infinite, meaning that the 'loop'
+counter will be set to a value Animation.Infinite that indicates an endless
+cycle. Also there will be a NumberAnimation to vary the numeric property
+between the x values and over a given duration. After the NumberAnimation
+there will be a PauseAnimation that will pause the animation for 500
+milliseconds (half a second) simply for the visual effect.
+
+    \code
+    SequentialAnimation on x {
+        loops: Animation.Infinite
+        NumberAnimation { from: 20; to: 450; easing.type: "InOutQuad";
+duration: 2000 }
+        PauseAnimation { duration: 500 }
+    }
+    \endcode
+
+A similar block of code is written for the animation of the 'y' value of
+the position.
+
+We will also animate the scale of the object, so as it goes from top left
+to bottom right of the window it will become smaller until about midway,
+and then become larger. To complete the animation we will set the 'z'
+values of the images. 'z' is the stacking order, the z-axis effectively
+points out from the screen to your eyes with the default value of 'z' being
+0. So if we set the Rectangle to have z with value zero, just to be sure,
+and image1 to 1 and image2 to 2 then image2 will be in the foreground and
+image1 in the background. When image1 passes image2 it will pass behind it.
+The completed code looks like
+
+    \code
+    Rectangle {
+        id: mainRec
+        width:  600
+        height: 400
+        z: 0
+
+        Image {
+            id: image2
+            source: "images/qt-logo.png"
+            width: 100; height: 100
+            x: (mainRec.width - 100)/2; y: (mainRec.height - 100)/2
+            z: 2
+        }
+
+        Image {
+            id: image1
+            source: "images/qt-logo.png"
+            x: 20; y: 20 ; z: 1
+            width: 100; height: 100
+
+            SequentialAnimation on x {
+                loops: Animation.Infinite
+                NumberAnimation {
+                    from: 20; to: 450
+                    easing.type: "InOutQuad"; duration: 2000
+                }
+                PauseAnimation { duration: 500 }
+            }
+            
+            SequentialAnimation on y {
+                loops: Animation.Infinite
+                NumberAnimation {
+                    from: 20; to: 250
+                    easing.type: "InOutQuad"; duration: 2000
+                }
+                PauseAnimation { duration: 500 }
+            }
+
+            SequentialAnimation on scale {
+                loops: Animation.Infinite
+                NumberAnimation { from: 1; to: 0.5; duration: 1000 }
+                NumberAnimation { from: 0.5; to: 1; duration: 1000 }
+                PauseAnimation { duration: 500 }
+            }
+        }
+    }
+    \endcode
+
+The \c {easing.type} has many options, expressed as a string. It specifies the
+kind of equation that describes the acceleration of the property value, not
+necessarily position, over time.
+
+For example, \e InOutQuad means that at the start and the end of the animation the
+'velocity' is low but the acceleration or deceleration is high. Much like a car
+accelerating from stop, and decelerating to stop at the end of a journey,
+with the maximum speed being in the middle. Examine the \l {PropertyAnimation::easing.type}
+{easing} documentation and the various graphs that show the effect. The horizontal
+axis, 'progress', can be thought of as time. The vertical axis is the value
+of the particular property.
+
+In discussing animation we need to describe three objects: State, MouseArea
+and Signals. Although independent of the animation elements, animation
+delivers some of the best examples that illustrate these new elements.
+
+
+
+\section2 Animation Summary
+
+\table
+    \header
+        \o Name
+        \o Description
+    \row
+        \o PropertyAnimation
+        \o a property value on a target object is varied to a specified value over a given time.
+
+    \row
+        \o NumberAnimation
+        \o animate a numeric property from one value to another over a given time.
+
+    \row
+        \o PauseAnimation
+        \o results in the task waiting for the specified duration, in milliseconds.
+
+    \row
+        \o SequentialAnimation
+        \o allows us to list in order the animation events we want to occur, first A then B then C and so on.
+
+    \row
+        \o ParallelAnimation
+        \o enables us to run different animations at the same time instead of sequentially.
+
+\endtable
+
+
+
+
+
+\section1 Using States
+
+A state is a defined set of values in the configuration of an object and
+often depends on the previous state. For example, a glass could be in a
+state we call 'HalfFull' if it is being filled with a liquid and has
+reached half of its total capacity. We could also have a state called
+HalfEmpty which is the state that occurs when the amount of liquid drops to
+half of the glass's capacity. Both states represent the same amount of
+liquid, but we consider them different. Likewise, states in a program
+represent not just values but may include how the current values were
+reached.
+
+When a state changes a \e transition occurs. This is an opportunity to make
+changes or take actions that depend on the movement to the new state. For
+example, if we had a scene in the country where the state variable has two
+states "daylight" and "night". Then when the state changes to "night" at
+this transition the sky would be made dark, stars would be shown, the
+countryside would be darkened. And when the state changes to "daylight" the
+opposite changes would be made: the sky is now blue, the scenery is green,
+there is a sun in the sky.
+
+Here is a simple QML program that shows the change of state in the above
+example. We have two rectangles, the top one is the 'sky' and the bottom
+one is the 'ground'. We will animate the change from daylight to night.
+There will be two states, but we only need to define one since 'daylight'
+will be the default state. We will just go to 'night' by clicking and
+holding the left mouse button down, releasing the mouse button will reverse
+the process
+
+    \code
+    import Qt 4.7
+
+    Rectangle {
+        id: mainRectangle
+        width:  600
+        height: 400
+        color: "black"
+
+        Rectangle {
+            id: sky
+            width: 600
+            height: 200
+            y: 0
+            color: "lightblue"
+        }
+
+        Rectangle {
+            id: ground
+            width: 600; height: 200
+            y: 200
+            color: "green"
+        }
+
+        MouseArea {
+            id: mousearea
+            anchors.fill: mainRectangle
+        }
+
+        states: [ State {
+                name: "night"
+                when: mousearea.pressed == true
+                PropertyChanges { target: sky; color: "darkblue" }
+                PropertyChanges { target: ground; color: "black" }
+            },
+            State {
+                name: "daylight"
+                when: mousearea.pressed == false
+                PropertyChanges { target: sky; color: "lightblue" }
+                PropertyChanges { target: ground; color: "green" }
+            }
+        ]
+
+        transitions: [ Transition {
+                from: "daylight"; to: "night"
+                ColorAnimation { duration: 1000 }
+            },
+            Transition {
+                from: "night"; to: "daylight"
+                ColorAnimation { duration: 500 }
+            }
+        ]
+    }
+    \endcode
+
+Several new things appear in this sample. Firstly, we use a \l MouseArea
+element to detect mouse clicks in the \e mainRectangle. Secondly, we use
+the list notation [ thing1 , thing2, ... ] to build a list of states and a
+list of transitions.
+
+\l MouseArea defines a region that will respond to mouse clicks. In this case
+we are only concerned with when the mouse is pressed or not pressed, not
+the particular button or other details. The area of the MouseArea is the
+entire main window, mainRectangle, so that clicking anywhere in this region
+will start the animation. Since we are using the 'pressed' mouse state,
+then the animation will move from 'daylight' to 'night' only while the mouse
+button remains pressed.
+
+When the button is released the 'daylight' state is entered and the
+transition from 'night' to 'daylight' is triggered causing the animation to
+run. The transition specifies the duration in milliseconds of the
+ColorAnimation, while the state specifies the color of the new state.
+
+The PropertyChanges command is the way that we nominate which properties
+will change in a change of state, and what new value the property will
+take. Since, for example, we want the 'sky' region to turn to dark blue and
+the 'ground' region to turn to black for the 'night' state, then the
+rectangles for those regions are the 'target' and the property in the target
+is 'color'.
+
+
+\section1 Signals
+
+Signals are simply events that can be hooked up to actions we want performed.
+In QML they are usually preceded by the word 'on', for example in the animation
+using a MouseArea the signal was \l {MouseArea::onPressed}{onPressed}. If
+you look at the C++ documentation you will see a lot of talk about
+\l {Signals & Slots}{Signals and Slots}. Signals are connected to Slots. The
+signal represents an event and the Slot is the function that does something
+based on that event. You can also have Signals connected to other Signals, so
+that one Signal (event) triggers another Signal (event), and so forth. It is
+nice to know this is what happens beneath the QML layer but not essential for
+using QML.
+
+Most elements do not have Signals associated with them. However, a few like
+the \l Audio element have many signals. Some of the \l Audio signals are
+used to represent events such as when the audio is stopped, play is pressed,
+paused, and reaching the end of the media. They allow the developer to connect,
+ for example, the press of a user interface button (perhaps a MouseArea) to
+ some QML that will handle this event.
+
+
+\section1 Analyzing An Example: Dial
+
+In the Qt \e {examples/declarative/toys} folder you will find a folder
+\e {dial} which contains the \e dial example.
+
+\image qml-dial.png  "QML Dial example with Slider"
+
+In essence this small application has a sliding bar that you can slide using
+a mouse, and a graphical dial that responds to the position of the slider.
+
+The code for the example is in two parts: Dial.qml and dial-example.qml.
+
+\e {Dial.qml} can be found in the \e content sub-directory. It defines a Dial
+component similar to an odometer. Eventually, the example will hook up a slider
+component so that moving the slider will change the position of a needle on the
+dial.
+
+The code for the Dial, identified by the name of the file, contains four images
+in overlapping order: the background (numbers and divisions), the shadow of the
+needle, the needle itself, and finally the 'glass' overlay (containing
+transparent layers).
+
+The needle_shadow.png image has a Rotation assigned to the \e transform
+attribute of the \l Image. The rotation is set to match the angle of the needle
+image angle value \e {needleRotation.angle}. Both the needle and the
+needle_shadow have the same default \e x and \e y values but the rotation origin
+for the needle is slightly different so that a shadow will be evident as the
+needle moves.
+
+\snippet ../../examples/declarative/toys/dial/content/Dial.qml  needle_shadow
+
+And the needle
+
+\snippet ../../examples/declarative/toys/dial/content/Dial.qml  needle
+
+The final image is the overlay which simply has a position defined.
+
+\snippet ../../examples/declarative/toys/dial/content/Dial.qml  overlay
+
+\e {dial-example.qml} in the \e {examples/declarative/toys/dial} directory is the
+main file of the example. It defines the visual environment that the Dial
+will fit into. Because the \e Dial component and the images live in the \e
+content sub-directory we will have to import this into \e dial-example. So the
+start of the file looks like
+
+    \code
+    import Qt 4.7
+    import "content"
+    \endcode
+
+The visual space is bound by a 300 by 300 pixel \l Rectangle which is given
+a gray color. Inside this rectangle is our component \e Dial and a \l Rectangle.
+Inside the rectangle called 'container' is another rectangle with the
+interesting name 'slider'.
+
+\snippet ../../examples/declarative/toys/dial/dial-example.qml  0
+
+The Dial component, named 'dial, is \e anchored to the center of the main
+rectangle. The \c value attribute of 'dial' is set to a value based on the
+'slider' horizontal position and the 'container' width. So changes to the
+'slider' position will change the Dial \c value which is used in Dial to compute
+the rotation of the needle image. Notice this piece of code in Dial where
+the change in \c value modifies the position of the needle.
+
+    \code
+    SpringFollow on angle {
+        spring: 1.4
+        damping: .15
+        to: Math.min(Math.max(-130, root.value*2.6 - 130), 133)
+    }
+    \endcode
+
+This is part of the \c needleRotation that rotates the needle and causes the
+rotation of its shadow. \l SpringFollow is an element that modifies the value
+of that rotation angle \e to and mimics the oscillatory behavior of a spring,
+with the appropriate \e spring constant to control the acceleration and the \e
+damping to control how quickly the effect dies away.
+
+The 'container' is light gray with a color gradient defined using
+\l GradientStop. The gradient is applied vertically. If you need a horizontal
+gradient then you could apply the vertical gradient and then rotate the item
+by 90 degrees.
+
+The 'slider' is dark gray and also has a vertical color gradient. The most
+important thing about the 'slider' is that it has a MouseArea defined, which
+specifies a \c {drag.target} on itself along the X-axis. With minimum
+and maximum values on the X-axis defined. So we can click on the 'slider' and
+drag it left and right within the confines of the 'container'. The motion of
+the 'slider' will then change the \c value attribute in \e Dial as discussed
+already.
+
+Also notice the use of a \c radius value for a rectangle. This produces rounded
+corners. That is how the 'container' and 'slider' are displayed with a
+pleasant rounded look.
+
+
+
+*/
+
+
+
diff --git a/doc/src/images/qml-dial.png b/doc/src/images/qml-dial.png
new file mode 100644
index 0000000..da5c031
Binary files /dev/null and b/doc/src/images/qml-dial.png differ
diff --git a/doc/src/images/qml-intro-anchors1.png b/doc/src/images/qml-intro-anchors1.png
new file mode 100644
index 0000000..fdb301e
Binary files /dev/null and b/doc/src/images/qml-intro-anchors1.png differ
diff --git a/doc/src/images/qml-intro-anchors2.png b/doc/src/images/qml-intro-anchors2.png
new file mode 100644
index 0000000..84f43bd
Binary files /dev/null and b/doc/src/images/qml-intro-anchors2.png differ
diff --git a/doc/src/images/qml-intro-anchors3.png b/doc/src/images/qml-intro-anchors3.png
new file mode 100644
index 0000000..21ae97b
Binary files /dev/null and b/doc/src/images/qml-intro-anchors3.png differ
diff --git a/doc/src/images/qml-intro-helloa.png b/doc/src/images/qml-intro-helloa.png
new file mode 100644
index 0000000..00b34b0
Binary files /dev/null and b/doc/src/images/qml-intro-helloa.png differ
-- 
cgit v0.12


From c152b5dc859a47c45c7be70b7869e747ec58d8a9 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Thu, 20 May 2010 10:04:58 +0200
Subject: Doc: Updating CSS and JS Fixed bugs on index page, moved JS from
 template to script file.

---
 doc/src/template/scripts/functions.js       | 17 +++++++++++++++++
 doc/src/template/style/style.css            |  2 ++
 tools/qdoc3/test/qt-html-templates.qdocconf | 14 ++++++--------
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 7d93486..afd1ec3 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -33,7 +33,21 @@ $('#bigA').click(function() {
 		$(this).addClass('active')
 });
 
+$('.feedclose').click(function() {
+	$('.bd').show();
+	$('.hd').show();
+	$('.footer').show();
+	$('#feedbackBox').hide();
+	$('#blurpage').hide();
+});
 
+$('.feedback').click(function() {
+	$('.bd').hide();
+	$('.hd').hide();
+	$('.footer').hide();
+	$('#feedbackBox').show();
+	$('#blurpage').show();
+});
 var lookupCount = 0;
 var articleCount = 0;
 var exampleCount = 0;
@@ -131,6 +145,9 @@ else
 	*/
 // Loads on doc ready
 	$(document).ready(function () {
+	var pageUrl = window.location.href;
+	//alert(pageUrl);
+	$('#pageUrl').attr('foo',pageUrl);
 	var pageTitle = $('title').html();
 		$('#feedform').append('<input id="page" name="pageVal" value="'+pageTitle+'" style="display:none;">');
           var currentString = $('#pageType').val() ;
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 5ad90e3..3f35642 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -456,6 +456,7 @@
     .wrap .content
     {
         padding: 30px;
+		word-wrap:break-word;
     }
 
     .wrap .content li
@@ -1067,6 +1068,7 @@
     .indexboxcont .sectionlist
     {
         display: inline-block;
+		vertical-align:top;
 		width: 32.5%;
         padding: 0;
     }
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index e83e666..50bf0c3 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -109,7 +109,7 @@ HTML.postpostheader     = "            </ul>\n" \
 			  "        <div class=\"content\">\n"
 
 HTML.footer             = "        <!-- /div -->\n" \
-			  "        <div class=\"feedback t_button\" onclick=\"\$(\'.bd\').hide();\$(\'.hd\').hide();\$(\'.footer\').hide();\$(\'#feedbackBox\').show();\$(\'#blurpage\').show()\">\n" \
+			  "        <div class=\"feedback t_button\">\n" \
 			  "          [+] Documentation Feedback</div>\n" \
 			  "      </div>\n" \
 			  "    </div>\n" \
@@ -127,14 +127,12 @@ HTML.footer             = "        <!-- /div -->\n" \
 			  "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
 			  "  </div>\n" \
 			  "  <div id=\"feedbackBox\">\n" \
-			  "      <div id=\"feedcloseX\">\n" \
-			  "        <a href=\"#\" onclick=\"\$(\'.bd\').show();\$(\'.hd\').show();\$(\'.footer\').show();\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\">X</a>\n" \
-			  "      </div>\n" \
-			  "    <form id=\"feedform\" action=\"feedback.php\" method=\"get\">\n" \
+			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
 			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \
-			  "      <input id=\"page\" name=\"pageVal\" value=\"\$(\'title\').html();\" style=\"display:none;\">\n" \
-			  "      <p><input id=\"feedsubmit\" type=\"submit\" onclick=\"\$(\'.bd\').show();\$(\'.hd\').show();\$(\'.footer\').show();\$(\'#feedbackBox\').hide();\$(\'#blurpage\').hide()\"\n" \
-			  "        name=\"feedback\" /></p>\n" \
+			  "      <input id=\"pageUrl\" name=\"pageUrl\" value=\"window.location.href;\" style=\"display:none;\">\n" \
+			  "      <input id=\"pageVal\" name=\"pageVal\" value=\"\$(\'title\').html();\" style=\"display:none;\">\n" \
+			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
 			  "    </form>\n" \
 			  "  </div>\n" \
 			  "  <div id=\"blurpage\">\n" \
-- 
cgit v0.12


From e61b3eb9903e9a63f107074c0e8d60e3ee689a52 Mon Sep 17 00:00:00 2001
From: Martin Petersson <martin.petersson@nokia.com>
Date: Thu, 20 May 2010 10:12:52 +0200
Subject: Added support for .rc files on VS2010.

Reviewed-by: Thierry
---
 qmake/generators/win32/msbuild_objectmodel.cpp | 39 ++++++++++++++++++++++++--
 1 file changed, 37 insertions(+), 2 deletions(-)

diff --git a/qmake/generators/win32/msbuild_objectmodel.cpp b/qmake/generators/win32/msbuild_objectmodel.cpp
index 99cdd11..75fc910 100644
--- a/qmake/generators/win32/msbuild_objectmodel.cpp
+++ b/qmake/generators/win32/msbuild_objectmodel.cpp
@@ -2656,6 +2656,14 @@ bool VCXFilter::outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QSt
 
                     xml << tag("ClCompile")
                         << attrTag("Include",Option::fixPathToLocalOS(filename));
+                } else if(filename.endsWith(".res")) {
+
+                    xmlFilter << tag("CustomBuild")
+                              << attrTag("Include",Option::fixPathToLocalOS(filename))
+                              << attrTagS("Filter", filtername);
+
+                    xml << tag("CustomBuild")
+                        << attrTag("Include",Option::fixPathToLocalOS(filename));
                 } else {
 
                     xmlFilter << tag("CustomBuild")
@@ -2665,6 +2673,16 @@ bool VCXFilter::outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QSt
                     xml << tag("CustomBuild")
                         << attrTag("Include",Option::fixPathToLocalOS(filename));
                 }
+            } else if(filtername == "Root Files") {
+
+                if (filename.endsWith(".rc")) {
+
+                    xmlFilter << tag("ResourceCompile")
+                              << attrTag("Include",Option::fixPathToLocalOS(filename));
+
+                    xml << tag("ResourceCompile")
+                        << attrTag("Include",Option::fixPathToLocalOS(filename));
+                }
             }
         }
 
@@ -2696,8 +2714,6 @@ bool VCXFilter::outputFileConfig(XmlOutput &xml, XmlOutput &xmlFilter, const QSt
                     << attrTag("Condition", QString("'$(Configuration)|$(Platform)'=='%1'").arg((*Config).Name))
                     << valueTag(CompilerTool.PrecompiledHeader);
             }
-
-            //xml << CompilerTool;
         }
     }
 
@@ -3023,6 +3039,14 @@ void VCXProject::outputFileConfigs(XmlOutput &xml,
 
                 xml << tag("ClCompile")
                     << attrTag("Include",Option::fixPathToLocalOS(info.file));
+            } else if(info.file.endsWith(".res")) {
+
+                    xmlFilter << tag("CustomBuild")
+                              << attrTag("Include",Option::fixPathToLocalOS(info.file))
+                              << attrTagS("Filter", filtername);
+
+                    xml << tag("CustomBuild")
+                        << attrTag("Include",Option::fixPathToLocalOS(info.file));
             } else {
 
                 xmlFilter << tag("CustomBuild")
@@ -3033,6 +3057,16 @@ void VCXProject::outputFileConfigs(XmlOutput &xml,
                     << attrTag("Include",Option::fixPathToLocalOS(info.file));
             }
 
+        } else if(filtername == "Root Files") {
+
+            if (info.file.endsWith(".rc")) {
+
+                xmlFilter << tag("ResourceCompile")
+                          << attrTag("Include",Option::fixPathToLocalOS(info.file));
+
+                xml << tag("ResourceCompile")
+                    << attrTag("Include",Option::fixPathToLocalOS(info.file));
+            }
         } else {
 
             xmlFilter << tag("None")
@@ -3329,6 +3363,7 @@ XmlOutput &operator<<(XmlOutput &xml, VCXProject &tool)
     for (int x = 0; x < tool.ExtraCompilers.count(); ++x) {
         tool.outputFilter(xml, xmlFilter, tool.ExtraCompilers.at(x));
     }
+    tool.outputFilter(xml, xmlFilter, "Root Files");
 
     xml << import("Project", "$(VCTargetsPath)\\Microsoft.Cpp.targets");
 
-- 
cgit v0.12


From e6557220bccbdbbc218dc9eab0eb426ba774435e Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 20 May 2010 11:20:21 +0300
Subject: Fix replacement functions in platform_paths.prf

Clearing epocroot_prefix at the end of the file caused it to be empty
at the time replacement functions were resolved.

Reviewed-by: Janne Koskinen
---
 mkspecs/features/symbian/platform_paths.prf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf
index f05a885..0e8770d 100644
--- a/mkspecs/features/symbian/platform_paths.prf
+++ b/mkspecs/features/symbian/platform_paths.prf
@@ -473,5 +473,3 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) {
     STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED
 
 }
-
-epocroot_prefix =
-- 
cgit v0.12


From a72c6f403435e5cc7aff501b1e1ee990dfb24969 Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Thu, 20 May 2010 11:03:12 +0200
Subject: Use QApplication::arguments() to check for command line args

Use the Qt way to look up command line args, remove 5 lines of code per
example. Also clean up badly indented code.
---
 demos/deform/main.cpp                       |  5 +----
 demos/pathstroke/main.cpp                   |  5 +----
 examples/draganddrop/fridgemagnets/main.cpp |  6 ++----
 examples/script/context2d/main.cpp          |  6 +-----
 examples/widgets/wiggly/main.cpp            | 15 ++++++---------
 5 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/demos/deform/main.cpp b/demos/deform/main.cpp
index 4539973..bef075a 100644
--- a/demos/deform/main.cpp
+++ b/demos/deform/main.cpp
@@ -50,10 +50,7 @@ int main(int argc, char **argv)
 
     QApplication app(argc, argv);
 
-    bool smallScreen = false;
-    for (int i=0; i<argc; i++)
-        if (QString(argv[i]) == "-small-screen")
-            smallScreen = true;
+    bool smallScreen = QApplication::arguments().contains("-small-screen");
 
     PathDeformWidget deformWidget(0, smallScreen);
 
diff --git a/demos/pathstroke/main.cpp b/demos/pathstroke/main.cpp
index 1465682..534b233 100644
--- a/demos/pathstroke/main.cpp
+++ b/demos/pathstroke/main.cpp
@@ -48,10 +48,7 @@ int main(int argc, char **argv)
 
     QApplication app(argc, argv);
 
-    bool smallScreen = false;
-    for (int i=0; i<argc; i++)
-        if (QString(argv[i]) == "-small-screen")
-            smallScreen = true;
+    bool smallScreen = QApplication::arguments().contains("-small-screen");
 
     PathStrokeWidget pathStrokeWidget(smallScreen);
     QStyle *arthurStyle = new ArthurStyle();
diff --git a/examples/draganddrop/fridgemagnets/main.cpp b/examples/draganddrop/fridgemagnets/main.cpp
index 3c517bd..b5a39c0 100644
--- a/examples/draganddrop/fridgemagnets/main.cpp
+++ b/examples/draganddrop/fridgemagnets/main.cpp
@@ -45,16 +45,14 @@
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(fridgemagnets);
-    bool smallScreen = false;
-    for (int i=0; i<argc; i++)
-        if (QString(argv[i]) == "-small-screen")
-            smallScreen = true;
 
     QApplication app(argc, argv);
 #ifdef QT_KEYPAD_NAVIGATION
     QApplication::setNavigationMode(Qt::NavigationModeCursorAuto);
 #endif
     DragWidget window;
+
+    bool smallScreen = QApplication::arguments().contains("-small-screen");
     if (smallScreen)
         window.showFullScreen();
     else
diff --git a/examples/script/context2d/main.cpp b/examples/script/context2d/main.cpp
index 95daf2b..8fd68db 100644
--- a/examples/script/context2d/main.cpp
+++ b/examples/script/context2d/main.cpp
@@ -46,14 +46,10 @@ int main(int argc, char **argv)
 {
     Q_INIT_RESOURCE(context2d);
 
-    bool smallScreen = false;
-    for (int i = 0; i < argc; i++)
-        if (QString(argv[i]) == "-small-screen")
-            smallScreen = true;
-
     QApplication app(argc, argv);
     Window win;
 
+    bool smallScreen = QApplication::arguments().contains("-small-screen");
     if (!smallScreen) {
         win.show();
     } else {
diff --git a/examples/widgets/wiggly/main.cpp b/examples/widgets/wiggly/main.cpp
index 4a6cd5d..8ad7696 100644
--- a/examples/widgets/wiggly/main.cpp
+++ b/examples/widgets/wiggly/main.cpp
@@ -46,16 +46,13 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    bool smallScreen = false;
-    for (int i=0; i<argc; i++)
-        if (QString(argv[i]) == "-small-screen")
-            smallScreen = true;
-    Dialog dialog(0,smallScreen);
-    if (!smallScreen){
+    bool smallScreen = QApplication::arguments().contains("-small-screen");
+
+    Dialog dialog(0, smallScreen);
+
+    if (!smallScreen)
         dialog.show();
-    }
-    else{
+    else
         dialog.showFullScreen();
-    }
     return app.exec();
 }
-- 
cgit v0.12


From a41534cbabd0aee90c38b9a1a133835863a7f54b Mon Sep 17 00:00:00 2001
From: ck <qt-info@nokia.com>
Date: Thu, 20 May 2010 11:29:20 +0200
Subject: Examples: Fix compilation with namespace.

---
 demos/spectrum/app/engine.h              | 5 ++++-
 demos/spectrum/app/mainwidget.h          | 3 +++
 demos/spectrum/app/settingsdialog.h      | 2 ++
 demos/spectrum/app/spectrograph.h        | 2 ++
 demos/spectrum/app/spectrumanalyser.h    | 3 +++
 demos/spectrum/app/tonegenerator.h       | 2 ++
 demos/spectrum/app/tonegeneratordialog.h | 2 ++
 demos/spectrum/app/utils.h               | 2 ++
 demos/spectrum/app/waveform.h            | 2 ++
 9 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/demos/spectrum/app/engine.h b/demos/spectrum/app/engine.h
index 16088b2..93733fe 100644
--- a/demos/spectrum/app/engine.h
+++ b/demos/spectrum/app/engine.h
@@ -61,10 +61,13 @@
 #include <QDir>
 #endif
 
+QT_BEGIN_NAMESPACE
 class QAudioInput;
 class QAudioOutput;
-class FrequencySpectrum;
 class QFile;
+QT_END_NAMESPACE
+
+class FrequencySpectrum;
 
 /**
  * This class interfaces with the QtMultimedia audio classes, and also with
diff --git a/demos/spectrum/app/mainwidget.h b/demos/spectrum/app/mainwidget.h
index 846b97a..c59dbd6 100644
--- a/demos/spectrum/app/mainwidget.h
+++ b/demos/spectrum/app/mainwidget.h
@@ -50,11 +50,14 @@ class Waveform;
 class LevelMeter;
 class SettingsDialog;
 class ToneGeneratorDialog;
+
+QT_BEGIN_NAMESPACE
 class QAudioFormat;
 class QLabel;
 class QPushButton;
 class QMenu;
 class QAction;
+QT_END_NAMESPACE
 
 /**
  * Main application widget, responsible for connecting the various UI
diff --git a/demos/spectrum/app/settingsdialog.h b/demos/spectrum/app/settingsdialog.h
index 7215a50..fda518b 100644
--- a/demos/spectrum/app/settingsdialog.h
+++ b/demos/spectrum/app/settingsdialog.h
@@ -42,11 +42,13 @@
 #include <QDialog>
 #include <QtMultimedia/QAudioDeviceInfo>
 
+QT_BEGIN_NAMESPACE
 class QComboBox;
 class QCheckBox;
 class QSlider;
 class QSpinBox;
 class QGridLayout;
+QT_END_NAMESPACE
 
 /**
  * Dialog used to control settings such as the audio input / output device
diff --git a/demos/spectrum/app/spectrograph.h b/demos/spectrum/app/spectrograph.h
index 6bfef33..a7790ff 100644
--- a/demos/spectrum/app/spectrograph.h
+++ b/demos/spectrum/app/spectrograph.h
@@ -41,7 +41,9 @@
 #include <QWidget>
 #include "frequencyspectrum.h"
 
+QT_BEGIN_NAMESPACE
 class QMouseEvent;
+QT_END_NAMESPACE
 
 /**
  * Widget which displays a spectrograph showing the frequency spectrum
diff --git a/demos/spectrum/app/spectrumanalyser.h b/demos/spectrum/app/spectrumanalyser.h
index caeb1c1..f10da63 100644
--- a/demos/spectrum/app/spectrumanalyser.h
+++ b/demos/spectrum/app/spectrumanalyser.h
@@ -55,8 +55,11 @@
 #include "FFTRealFixLenParam.h"
 #endif
 
+QT_BEGIN_NAMESPACE
 class QAudioFormat;
 class QThread;
+QT_END_NAMESPACE
+
 class FFTRealWrapper;
 
 class SpectrumAnalyserThreadPrivate;
diff --git a/demos/spectrum/app/tonegenerator.h b/demos/spectrum/app/tonegenerator.h
index 419f7e4..d387768 100644
--- a/demos/spectrum/app/tonegenerator.h
+++ b/demos/spectrum/app/tonegenerator.h
@@ -41,8 +41,10 @@
 #include <QtCore/qglobal.h>
 #include "spectrum.h"
 
+QT_BEGIN_NAMESPACE
 class QAudioFormat;
 class QByteArray;
+QT_END_NAMESPACE
 
 /**
  * Generate a sine wave
diff --git a/demos/spectrum/app/tonegeneratordialog.h b/demos/spectrum/app/tonegeneratordialog.h
index 35d69c2..d6fcffa 100644
--- a/demos/spectrum/app/tonegeneratordialog.h
+++ b/demos/spectrum/app/tonegeneratordialog.h
@@ -42,10 +42,12 @@
 #include <QDialog>
 #include <QtMultimedia/QAudioDeviceInfo>
 
+QT_BEGIN_NAMESPACE
 class QCheckBox;
 class QSlider;
 class QSpinBox;
 class QGridLayout;
+QT_END_NAMESPACE
 
 /**
  * Dialog which controls the parameters of the tone generator.
diff --git a/demos/spectrum/app/utils.h b/demos/spectrum/app/utils.h
index 83467cd..548f884 100644
--- a/demos/spectrum/app/utils.h
+++ b/demos/spectrum/app/utils.h
@@ -41,7 +41,9 @@
 #include <QtCore/qglobal.h>
 #include <QDebug>
 
+QT_BEGIN_NAMESPACE
 class QAudioFormat;
+QT_END_NAMESPACE
 
 //-----------------------------------------------------------------------------
 // Miscellaneous utility functions
diff --git a/demos/spectrum/app/waveform.h b/demos/spectrum/app/waveform.h
index 4de527f..909e5ee 100644
--- a/demos/spectrum/app/waveform.h
+++ b/demos/spectrum/app/waveform.h
@@ -43,7 +43,9 @@
 #include <QPixmap>
 #include <QScopedPointer>
 
+QT_BEGIN_NAMESPACE
 class QByteArray;
+QT_END_NAMESPACE
 
 /**
  * Widget which displays a section of the audio waveform.
-- 
cgit v0.12


From 98972c1b271de1292b4e46484fe689d62a8b8e62 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
Date: Thu, 20 May 2010 12:46:46 +0300
Subject: QRuntimeGraphicsSystem

QRuntimeGraphicsSystem is a proxy graphics system which
can dynamically switch underlying graphics system on runtime.
For example, switch from hardware accelerated graphics system
to raster graphics system on low GPU memory situation. This
feature is currently supported on Symbian platform.

Task-number: QT-3276
Reviewed-by: Jason Barron
---
 src/corelib/global/qglobal.h                 |   1 +
 src/gui/image/qpixmap.cpp                    |  40 ++-
 src/gui/image/qpixmap.h                      |   2 -
 src/gui/image/qpixmapcache_p.h               |   5 +-
 src/gui/image/qpixmapdata_p.h                |   5 +-
 src/gui/kernel/qapplication.cpp              |  13 +-
 src/gui/kernel/qapplication_s60.cpp          |  66 +++-
 src/gui/kernel/qt_s60_p.h                    |   1 +
 src/gui/kernel/qwidget.cpp                   |   9 +-
 src/gui/painting/painting.pri                |   2 +
 src/gui/painting/qgraphicssystem_runtime.cpp | 443 +++++++++++++++++++++++++++
 src/gui/painting/qgraphicssystem_runtime_p.h | 197 ++++++++++++
 src/gui/painting/qgraphicssystemfactory.cpp  |   7 +
 src/gui/painting/qpaintengine_raster.cpp     |  20 +-
 src/gui/painting/qwindowsurface.cpp          |   2 -
 src/gui/painting/qwindowsurface_s60.cpp      |  31 +-
 tools/configure/configureapp.cpp             |  19 +-
 17 files changed, 821 insertions(+), 42 deletions(-)
 create mode 100644 src/gui/painting/qgraphicssystem_runtime.cpp
 create mode 100644 src/gui/painting/qgraphicssystem_runtime_p.h

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 8359637..cba50a2 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2433,6 +2433,7 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
 #if defined(Q_OS_SYMBIAN)
 
 #ifdef SYMBIAN_BUILD_GCE
+#define Q_SYMBIAN_SUPPORTS_SURFACES
 //RWsPointerCursor is fixed, so don't use low performance sprites
 #define Q_SYMBIAN_FIXED_POINTER_CURSORS
 #define Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 474cd2e..21216f8 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -635,17 +635,21 @@ void QPixmap::resize_helper(const QSize &s)
     if (size() == s)
         return;
 
+    // QPixmap.data member may be QRuntimePixmapData so use pixmapData() function to get
+    // the actual underlaying runtime pixmap data.
+    QPixmapData *pd = pixmapData();
+
     // Create new pixmap
-    QPixmap pm(QSize(w, h), data ? data->type : QPixmapData::PixmapType);
+    QPixmap pm(QSize(w, h), pd ? pd->type : QPixmapData::PixmapType);
     bool uninit = false;
 #if defined(Q_WS_X11)
-    QX11PixmapData *x11Data = data && data->classId() == QPixmapData::X11Class ? static_cast<QX11PixmapData*>(data.data()) : 0;
+    QX11PixmapData *x11Data = pd && pd->classId() == QPixmapData::X11Class ? static_cast<QX11PixmapData*>(pd) : 0;
     if (x11Data) {
         pm.x11SetScreen(x11Data->xinfo.screen());
         uninit = x11Data->flags & QX11PixmapData::Uninitialized;
     }
 #elif defined(Q_WS_MAC)
-    QMacPixmapData *macData = data && data->classId() == QPixmapData::MacClass ? static_cast<QMacPixmapData*>(data.data()) : 0;
+    QMacPixmapData *macData = pd && pd->classId() == QPixmapData::MacClass ? static_cast<QMacPixmapData*>(pd) : 0;
     if (macData)
         uninit = macData->uninit;
 #endif
@@ -659,7 +663,7 @@ void QPixmap::resize_helper(const QSize &s)
 
 #if defined(Q_WS_X11)
     if (x11Data && x11Data->x11_mask) {
-        QX11PixmapData *pmData = static_cast<QX11PixmapData*>(pm.data.data());
+        QX11PixmapData *pmData = static_cast<QX11PixmapData*>(pd);
         pmData->x11_mask = (Qt::HANDLE)XCreatePixmap(X11->display,
                                                      RootWindow(x11Data->xinfo.display(),
                                                                 x11Data->xinfo.screen()),
@@ -1163,8 +1167,9 @@ QPixmap QPixmap::grabWidget(QWidget * widget, const QRect &rect)
 Qt::HANDLE QPixmap::handle() const
 {
 #if defined(Q_WS_X11)
-    if (data && data->classId() == QPixmapData::X11Class)
-        return static_cast<const QX11PixmapData*>(data.constData())->handle();
+    const QPixmapData *pd = pixmapData();
+    if (pd && pd->classId() == QPixmapData::X11Class)
+        return static_cast<const QX11PixmapData*>(pd)->handle();
 #endif
     return 0;
 }
@@ -1944,17 +1949,20 @@ void QPixmap::detach()
     if (!data)
         return;
 
-    QPixmapData::ClassId id = data->classId();
+    // QPixmap.data member may be QRuntimePixmapData so use pixmapData() function to get
+    // the actual underlaying runtime pixmap data.
+    QPixmapData *pd = pixmapData();
+    QPixmapData::ClassId id = pd->classId();
     if (id == QPixmapData::RasterClass) {
-        QRasterPixmapData *rasterData = static_cast<QRasterPixmapData*>(data.data());
+        QRasterPixmapData *rasterData = static_cast<QRasterPixmapData*>(pd);
         rasterData->image.detach();
     }
 
     if (data->is_cached && data->ref == 1)
-        QImagePixmapCleanupHooks::executePixmapDataModificationHooks(data.data());
+        QImagePixmapCleanupHooks::executePixmapDataModificationHooks(pd);
 
 #if defined(Q_WS_MAC)
-    QMacPixmapData *macData = id == QPixmapData::MacClass ? static_cast<QMacPixmapData*>(data.data()) : 0;
+    QMacPixmapData *macData = id == QPixmapData::MacClass ? static_cast<QMacPixmapData*>(pd) : 0;
     if (macData) {
         if (macData->cg_mask) {
             CGImageRelease(macData->cg_mask);
@@ -1969,8 +1977,8 @@ void QPixmap::detach()
     ++data->detach_no;
 
 #if defined(Q_WS_X11)
-    if (data->classId() == QPixmapData::X11Class) {
-        QX11PixmapData *d = static_cast<QX11PixmapData*>(data.data());
+    if (pd->classId() == QPixmapData::X11Class) {
+        QX11PixmapData *d = static_cast<QX11PixmapData*>(pd);
         d->flags &= ~QX11PixmapData::Uninitialized;
 
         // reset the cache data
@@ -2060,9 +2068,15 @@ QPixmap QPixmap::fromImage(const QImage &image, Qt::ImageConversionFlags flags)
 */
 QPixmapData* QPixmap::pixmapData() const
 {
-    return data.data();
+    if (data) {
+        QPixmapData* pm = data.data();
+        return pm->runtimeData() ? pm->runtimeData() : pm;
+    }
+
+    return 0;
 }
 
+
 /*!
     \enum QPixmap::HBitmapFormat
 
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 180af3b..82546da 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -271,9 +271,7 @@ private:
     friend class QX11PaintEngine;
     friend class QCoreGraphicsPaintEngine;
     friend class QWidgetPrivate;
-    friend class QRasterPaintEngine;
     friend class QRasterBuffer;
-    friend class QPixmapCacheEntry;
 #if !defined(QT_NO_DATASTREAM)
     friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &);
 #endif
diff --git a/src/gui/image/qpixmapcache_p.h b/src/gui/image/qpixmapcache_p.h
index 86a1b78..0ed083c 100644
--- a/src/gui/image/qpixmapcache_p.h
+++ b/src/gui/image/qpixmapcache_p.h
@@ -81,8 +81,9 @@ class QPixmapCacheEntry : public QPixmap
 public:
     QPixmapCacheEntry(const QPixmapCache::Key &key, const QPixmap &pix) : QPixmap(pix), key(key)
     {
-        if (data && data->classId() == QPixmapData::RasterClass) {
-            QRasterPixmapData *d = static_cast<QRasterPixmapData*>(data.data());
+        QPixmapData *pd = pixmapData();
+        if (pd && pd->classId() == QPixmapData::RasterClass) {
+            QRasterPixmapData *d = static_cast<QRasterPixmapData*>(pd);
             if (!d->image.isNull() && d->image.d->paintEngine
                 && !d->image.d->paintEngine->isActive())
             {
diff --git a/src/gui/image/qpixmapdata_p.h b/src/gui/image/qpixmapdata_p.h
index 827fa18..60ed26a 100644
--- a/src/gui/image/qpixmapdata_p.h
+++ b/src/gui/image/qpixmapdata_p.h
@@ -73,7 +73,7 @@ public:
     };
 #endif
     enum ClassId { RasterClass, X11Class, MacClass, DirectFBClass,
-                   OpenGLClass, OpenVGClass, CustomClass = 1024 };
+                   OpenGLClass, OpenVGClass, RuntimeClass, CustomClass = 1024 };
 
     QPixmapData(PixelType pixelType, int classId);
     virtual ~QPixmapData();
@@ -133,7 +133,10 @@ public:
 
     static QPixmapData *create(int w, int h, PixelType type);
 
+    virtual QPixmapData *runtimeData() const { return 0; }
+
 protected:
+
     void setSerialNumber(int serNo);
     int w;
     int h;
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index ec635d4..590b000 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -70,6 +70,10 @@
 #include "qmessagebox.h"
 #include <QtGui/qgraphicsproxywidget.h>
 
+#ifdef QT_GRAPHICSSYSTEM_RUNTIME
+#include "private/qgraphicssystem_runtime_p.h"
+#endif
+
 #include "qinputcontext.h"
 #include "qkeymapper_p.h"
 
@@ -1561,7 +1565,14 @@ QStyle* QApplication::setStyle(const QString& style)
 
 void QApplication::setGraphicsSystem(const QString &system)
 {
-    QApplicationPrivate::graphics_system_name = system;
+#ifdef QT_GRAPHICSSYSTEM_RUNTIME
+    if (QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+        QRuntimeGraphicsSystem *r =
+                static_cast<QRuntimeGraphicsSystem *>(QApplicationPrivate::graphics_system);
+        r->setGraphicsSystem(system);
+    } else
+#endif
+        QApplicationPrivate::graphics_system_name = system;
 }
 
 /*!
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index f4c7304..1134a9b 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -62,6 +62,10 @@
 #include "qpaintengine.h"
 #include "private/qmenubar_p.h"
 #include "private/qsoftkeymanager_p.h"
+#ifdef QT_GRAPHICSSYSTEM_RUNTIME
+#include "private/qgraphicssystem_runtime_p.h"
+#endif
+
 
 #include "apgwgnam.h" // For CApaWindowGroupName
 #include <mdaaudiotoneplayer.h>     // For CMdaAudioToneUtility
@@ -83,6 +87,10 @@
 
 QT_BEGIN_NAMESPACE
 
+// Goom Events through Window Server
+static const int KGoomMemoryLowEvent = 0x10282DBF;
+static const int KGoomMemoryGoodEvent = 0x20026790;
+
 #if defined(QT_DEBUG)
 static bool        appNoGrab        = false;        // Grabbing enabled
 #endif
@@ -855,7 +863,16 @@ void QSymbianControl::Draw(const TRect& controlRect) const
     const TRect backingStoreRect(TPoint(backingStoreBase.x(), backingStoreBase.y()), controlRect.Size());
 
     if (engine->type() == QPaintEngine::Raster) {
-        QS60WindowSurface *s60Surface = static_cast<QS60WindowSurface *>(qwidget->windowSurface());
+        QS60WindowSurface *s60Surface;
+#ifdef QT_GRAPHICSSYSTEM_RUNTIME
+        if (QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+            QRuntimeWindowSurface *rtSurface =
+                    static_cast<QRuntimeWindowSurface*>(qwidget->windowSurface());
+            s60Surface = static_cast<QS60WindowSurface *>(rtSurface->m_windowSurface);
+        } else
+#endif
+            s60Surface = static_cast<QS60WindowSurface *>(qwidget->windowSurface());
+
         CFbsBitmap *bitmap = s60Surface->symbianBitmap();
         CWindowGc &gc = SystemGc();
 
@@ -1738,6 +1755,53 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent
         }
 #endif
         break;
+    case KGoomMemoryLowEvent:
+#ifdef QT_DEBUG
+        qDebug() << "QApplicationPrivate::symbianProcessWsEvent - KGoomMemoryLowEvent";
+#endif
+        if (callSymbianEventFilters(symbianEvent))
+            return 1;
+#ifdef QT_GRAPHICSSYSTEM_RUNTIME
+        if(QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+            bool switchToSwRendering(false);
+
+            foreach (QWidget *w, QApplication::topLevelWidgets()) {
+                if(w->d_func()->topData()->backingStore) {
+                    switchToSwRendering = true;
+                    break;
+                }
+            }
+
+            if (switchToSwRendering) {
+                QRuntimeGraphicsSystem *gs =
+                   static_cast<QRuntimeGraphicsSystem*>(QApplicationPrivate::graphics_system);
+
+                uint memoryUsage = gs->memoryUsage();
+                uint memoryForFullscreen = ( S60->screenDepth / 8 )
+                                           * S60->screenWidthInPixels
+                                           * S60->screenHeightInPixels;
+
+                S60->memoryLimitForHwRendering = memoryUsage - memoryForFullscreen;
+                gs->setGraphicsSystem(QLatin1String("raster"));
+            }
+        }
+#endif
+        break;
+    case KGoomMemoryGoodEvent:
+#ifdef QT_DEBUG
+        qDebug() << "QApplicationPrivate::symbianProcessWsEvent - KGoomMemoryGoodEvent";
+#endif
+        if (callSymbianEventFilters(symbianEvent))
+            return 1;
+#ifdef QT_GRAPHICSSYSTEM_RUNTIME
+        if(QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+            QRuntimeGraphicsSystem *gs =
+                   static_cast<QRuntimeGraphicsSystem*>(QApplicationPrivate::graphics_system);
+            gs->setGraphicsSystem(QLatin1String("openvg"), S60->memoryLimitForHwRendering);
+            S60->memoryLimitForHwRendering = 0;
+        }
+#endif
+        break;
     default:
         break;
     }
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 58da302..645e969 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -123,6 +123,7 @@ public:
     int supportsPremultipliedAlpha : 1;
     int avkonComponentsSupportTransparency : 1;
     int menuBeingConstructed : 1;
+    int memoryLimitForHwRendering;
     QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type
     static inline void updateScreenSize();
     static inline RWsSession& wsSession();
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 60f38f2..064bf03 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -248,9 +248,14 @@ QWidgetPrivate::~QWidgetPrivate()
 QWindowSurface *QWidgetPrivate::createDefaultWindowSurface()
 {
     Q_Q(QWidget);
+
+    QWindowSurface *surface;
     if (QApplicationPrivate::graphicsSystem())
-        return QApplicationPrivate::graphicsSystem()->createWindowSurface(q);
-    return createDefaultWindowSurface_sys();
+        surface = QApplicationPrivate::graphicsSystem()->createWindowSurface(q);
+    else
+        surface = createDefaultWindowSurface_sys();
+
+    return surface;
 }
 
 /*!
diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri
index ed8ee76..123af1c 100644
--- a/src/gui/painting/painting.pri
+++ b/src/gui/painting/painting.pri
@@ -118,12 +118,14 @@ embedded {
 } else {
     HEADERS += \
         painting/qgraphicssystem_raster_p.h \
+        painting/qgraphicssystem_runtime_p.h \
         painting/qgraphicssystemfactory_p.h \
         painting/qgraphicssystemplugin_p.h \
         painting/qwindowsurface_raster_p.h \
 
     SOURCES += \
         painting/qgraphicssystem_raster.cpp \
+        painting/qgraphicssystem_runtime.cpp \
         painting/qgraphicssystemfactory.cpp \
         painting/qgraphicssystemplugin.cpp \
         painting/qwindowsurface_raster.cpp \
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
new file mode 100644
index 0000000..dfa9bd3
--- /dev/null
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -0,0 +1,443 @@
+#include <private/qgraphicssystem_runtime_p.h>
+#include <private/qgraphicssystem_raster_p.h>
+#include <private/qgraphicssystemfactory_p.h>
+#include <private/qapplication_p.h>
+#include <private/qwidget_p.h>
+#include <QtCore/QDebug>
+#include <QtCore/QTimer>
+#include <QtGui/QBitmap>
+
+QT_BEGIN_NAMESPACE
+
+#define READBACK(f)                                         \
+    m_graphicsSystem->decreaseMemoryUsage(memoryUsage());   \
+    f                                                       \
+    readBackInfo();                                         \
+    m_graphicsSystem->increaseMemoryUsage(memoryUsage());   \
+
+
+class QDeferredGraphicsSystemChange : public QObject
+{
+    Q_OBJECT
+
+public:
+    QDeferredGraphicsSystemChange(QRuntimeGraphicsSystem *gs, const QString& graphicsSystemName)
+    : m_graphicsSystem(gs), m_graphicsSystemName(graphicsSystemName)
+    {
+    }
+
+    void launch()
+    {
+        QTimer::singleShot(0, this, SLOT(doChange()));
+    }
+
+private slots:
+
+    void doChange()
+    {
+        m_graphicsSystem->setGraphicsSystem(m_graphicsSystemName);
+        deleteLater();
+    }
+
+private:
+
+    QRuntimeGraphicsSystem *m_graphicsSystem;
+    QString m_graphicsSystemName;
+};
+
+QRuntimePixmapData::QRuntimePixmapData(const QRuntimeGraphicsSystem *gs, PixelType type)
+        : QPixmapData(type, RuntimeClass), m_graphicsSystem(gs)
+{
+    setSerialNumber((int)this);
+}
+
+QRuntimePixmapData::~QRuntimePixmapData()
+{
+    m_graphicsSystem->removePixmapData(this);
+    delete m_data;
+}
+
+void QRuntimePixmapData::readBackInfo()
+{
+    w = m_data->width();
+    h = m_data->height();
+    d = m_data->depth();
+    is_null = m_data->isNull();
+}
+
+
+QPixmapData *QRuntimePixmapData::createCompatiblePixmapData() const
+{
+    QRuntimePixmapData *rtData = new QRuntimePixmapData(m_graphicsSystem, pixelType());
+    rtData->m_data = m_data->createCompatiblePixmapData();
+    return rtData;
+}
+
+
+void QRuntimePixmapData::resize(int width, int height)
+{
+    READBACK(
+        m_data->resize(width, height);
+    )
+}
+
+
+void QRuntimePixmapData::fromImage(const QImage &image,
+                                   Qt::ImageConversionFlags flags)
+{
+    READBACK(
+        m_data->fromImage(image, flags);
+    )
+}
+
+
+bool QRuntimePixmapData::fromFile(const QString &filename, const char *format,
+                                  Qt::ImageConversionFlags flags)
+{
+    bool success(false);
+    READBACK(
+        success = m_data->fromFile(filename, format, flags);
+    )
+    return success;
+}
+
+bool QRuntimePixmapData::fromData(const uchar *buffer, uint len, const char *format,
+                                  Qt::ImageConversionFlags flags)
+{
+    bool success(false);
+    READBACK(
+        success = m_data->fromData(buffer, len, format, flags);
+    )
+    return success;
+}
+
+
+void QRuntimePixmapData::copy(const QPixmapData *data, const QRect &rect)
+{
+    if (data->runtimeData()) {
+        READBACK(
+            m_data->copy(data->runtimeData(), rect);
+        )
+    } else {
+        READBACK(
+            m_data->copy(data, rect);
+        )
+    }
+}
+
+bool QRuntimePixmapData::scroll(int dx, int dy, const QRect &rect)
+{
+    return m_data->scroll(dx, dy, rect);
+}
+
+
+int QRuntimePixmapData::metric(QPaintDevice::PaintDeviceMetric metric) const
+{
+    return m_data->metric(metric);
+}
+
+void QRuntimePixmapData::fill(const QColor &color)
+{
+    return m_data->fill(color);
+}
+
+QBitmap QRuntimePixmapData::mask() const
+{
+    return m_data->mask();
+}
+
+void QRuntimePixmapData::setMask(const QBitmap &mask)
+{
+    READBACK(
+        m_data->setMask(mask);
+    )
+}
+
+bool QRuntimePixmapData::hasAlphaChannel() const
+{
+    return m_data->hasAlphaChannel();
+}
+
+QPixmap QRuntimePixmapData::transformed(const QTransform &matrix,
+                                        Qt::TransformationMode mode) const
+{
+    return m_data->transformed(matrix, mode);
+}
+
+void QRuntimePixmapData::setAlphaChannel(const QPixmap &alphaChannel)
+{
+    READBACK(
+        m_data->setAlphaChannel(alphaChannel);
+    )
+}
+
+QPixmap QRuntimePixmapData::alphaChannel() const
+{
+    return m_data->alphaChannel();
+}
+
+QImage QRuntimePixmapData::toImage() const
+{
+    return m_data->toImage();
+}
+
+QPaintEngine* QRuntimePixmapData::paintEngine() const
+{
+    return m_data->paintEngine();
+}
+
+QImage* QRuntimePixmapData::buffer()
+{
+    return m_data->buffer();
+}
+
+#if defined(Q_OS_SYMBIAN)
+void* QRuntimePixmapData::toNativeType(NativeType type)
+{
+    return m_data->toNativeType(type);
+}
+
+void QRuntimePixmapData::fromNativeType(void *pixmap, NativeType type)
+{
+    m_data->fromNativeType(pixmap, type);
+    readBackInfo();
+}
+#endif
+
+QPixmapData* QRuntimePixmapData::runtimeData() const
+{
+    return m_data;
+}
+
+uint QRuntimePixmapData::memoryUsage() const
+{
+    if(is_null || d == 0)
+        return 0;
+    return w * h * (d / 8);
+}
+
+
+QRuntimeWindowSurface::QRuntimeWindowSurface(const QRuntimeGraphicsSystem *gs, QWidget *window)
+    : QWindowSurface(window), m_windowSurface(0), m_pendingWindowSurface(0), m_graphicsSystem(gs)
+{
+
+}
+
+QRuntimeWindowSurface::~QRuntimeWindowSurface()
+{
+    m_graphicsSystem->removeWindowSurface(this);
+    delete m_windowSurface;
+}
+
+QPaintDevice *QRuntimeWindowSurface::paintDevice()
+{
+    return m_windowSurface->paintDevice();
+}
+
+void QRuntimeWindowSurface::flush(QWidget *widget, const QRegion &region,
+                                  const QPoint &offset)
+{
+    m_windowSurface->flush(widget, region, offset);
+
+    int destroyPolicy = m_graphicsSystem->windowSurfaceDestroyPolicy();
+    if(m_pendingWindowSurface &&
+        destroyPolicy == QRuntimeGraphicsSystem::DestroyAfterFirstFlush) {
+#ifdef QT_DEBUG
+        qDebug() << "QRuntimeWindowSurface::flush() - destroy pending window surface";
+#endif
+        delete m_pendingWindowSurface;
+        m_pendingWindowSurface = 0;
+    }
+}
+
+void QRuntimeWindowSurface::setGeometry(const QRect &rect)
+{
+    m_graphicsSystem->decreaseMemoryUsage(memoryUsage());
+    m_windowSurface->setGeometry(rect);
+    m_graphicsSystem->increaseMemoryUsage(memoryUsage());
+}
+
+bool QRuntimeWindowSurface::scroll(const QRegion &area, int dx, int dy)
+{
+    return m_windowSurface->scroll(area, dx, dy);
+}
+
+void QRuntimeWindowSurface::beginPaint(const QRegion &rgn)
+{
+    m_windowSurface->beginPaint(rgn);
+}
+
+void QRuntimeWindowSurface::endPaint(const QRegion &rgn)
+{
+    m_windowSurface->endPaint(rgn);
+}
+
+QImage* QRuntimeWindowSurface::buffer(const QWidget *widget)
+{
+    return m_windowSurface->buffer(widget);
+}
+
+QPixmap QRuntimeWindowSurface::grabWidget(const QWidget *widget, const QRect& rectangle) const
+{
+    return m_windowSurface->grabWidget(widget, rectangle);
+}
+
+QPoint QRuntimeWindowSurface::offset(const QWidget *widget) const
+{
+    return m_windowSurface->offset(widget);
+}
+
+uint QRuntimeWindowSurface::memoryUsage() const
+{
+    QPaintDevice *pdev = m_windowSurface->paintDevice();
+    if (pdev && pdev->depth() != 0)
+        return pdev->width() * pdev->height() * (pdev->depth()/8);
+
+    return 0;
+}
+
+QRuntimeGraphicsSystem::QRuntimeGraphicsSystem()
+    : m_memoryUsage(0), m_windowSurfaceDestroyPolicy(DestroyImmediately),
+	m_graphicsSystem(0), m_graphicsSystemChangeMemoryLimit(0)
+{
+    QApplicationPrivate::graphics_system_name = QLatin1String("runtime");
+
+#ifdef Q_OS_SYMBIAN
+    m_graphicsSystemName = QLatin1String("openvg");
+    m_windowSurfaceDestroyPolicy = DestroyAfterFirstFlush;
+#else
+    m_graphicsSystemName = QLatin1String("raster");
+#endif
+
+    m_graphicsSystem = QGraphicsSystemFactory::create(m_graphicsSystemName);
+}
+
+
+QPixmapData *QRuntimeGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
+{
+    Q_ASSERT(m_graphicsSystem);
+    QPixmapData *data = m_graphicsSystem->createPixmapData(type);
+
+    QRuntimePixmapData *rtData = new QRuntimePixmapData(this, type);
+    rtData->m_data = data;
+    m_pixmapDatas << rtData;
+
+    return rtData;
+}
+
+QWindowSurface *QRuntimeGraphicsSystem::createWindowSurface(QWidget *widget) const
+{
+    Q_ASSERT(m_graphicsSystem);
+    QRuntimeWindowSurface *rtSurface = new QRuntimeWindowSurface(this, widget);
+    rtSurface->m_windowSurface = m_graphicsSystem->createWindowSurface(widget);
+    widget->setWindowSurface(rtSurface);
+    m_windowSurfaces << rtSurface;
+    increaseMemoryUsage(rtSurface->memoryUsage());
+    return rtSurface;
+}
+
+/*!
+    Sets graphics system when resource memory consumption is under /a memoryUsageLimit.
+*/
+void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name, uint memoryUsageLimit)
+{
+#ifdef QT_DEBUG
+    qDebug() << "QRuntimeGraphicsSystem::setGraphicsSystem( "<< name <<", " << memoryUsageLimit << ")";
+    qDebug() << "        current approximated graphics system memory usage " << memoryUsage() << " bytes";
+#endif
+    if (memoryUsage() >= memoryUsageLimit) {
+        m_graphicsSystemChangeMemoryLimit = memoryUsageLimit;
+        m_pendingGraphicsSystemName = name;
+    } else {
+        setGraphicsSystem(name);
+    }
+}
+
+void QRuntimeGraphicsSystem::setGraphicsSystem(const QString &name)
+{
+    if (m_graphicsSystemName == name)
+        return;
+#ifdef QT_DEBUG
+    qDebug() << "QRuntimeGraphicsSystem::setGraphicsSystem( " << name << " )";
+    qDebug() << "        current approximated graphics system memory usage "<< memoryUsage() << " bytes";
+#endif
+    delete m_graphicsSystem;
+    m_graphicsSystem = QGraphicsSystemFactory::create(name);
+    m_graphicsSystemName = name;
+
+    Q_ASSERT(m_graphicsSystem);
+
+    m_graphicsSystemChangeMemoryLimit = 0;
+    m_pendingGraphicsSystemName = QString();
+
+    for (int i = 0; i < m_pixmapDatas.size(); ++i) {
+        QRuntimePixmapData *proxy = m_pixmapDatas.at(i);
+        QPixmapData *newData = m_graphicsSystem->createPixmapData(proxy->m_data->pixelType());
+        // ### TODO Optimize. Openvg and s60raster graphics systems could switch internal ARGB32_PRE QImage buffers.
+        newData->fromImage(proxy->m_data->toImage(), Qt::AutoColor | Qt::OrderedAlphaDither);
+        delete proxy->m_data;
+        proxy->m_data = newData;
+        proxy->readBackInfo();
+    }
+
+    for (int i = 0; i < m_windowSurfaces.size(); ++i) {
+        QRuntimeWindowSurface *proxy = m_windowSurfaces.at(i);
+        QWidget *widget = proxy->m_windowSurface->window();
+
+        if(m_windowSurfaceDestroyPolicy == DestroyImmediately) {
+            delete proxy->m_windowSurface;
+            proxy->m_pendingWindowSurface = 0;
+        } else {
+            proxy->m_pendingWindowSurface = proxy->m_windowSurface;
+        }
+
+        proxy->m_windowSurface = m_graphicsSystem->createWindowSurface(widget);
+        qt_widget_private(widget)->invalidateBuffer(widget->rect());
+    }
+}
+
+void QRuntimeGraphicsSystem::removePixmapData(QRuntimePixmapData *pixmapData) const
+{
+    int index = m_pixmapDatas.lastIndexOf(pixmapData);
+    m_pixmapDatas.removeAt(index);
+    decreaseMemoryUsage(pixmapData->memoryUsage(), true);
+}
+
+void QRuntimeGraphicsSystem::removeWindowSurface(QRuntimeWindowSurface *windowSurface) const
+{
+    int index = m_windowSurfaces.lastIndexOf(windowSurface);
+    m_windowSurfaces.removeAt(index);
+    decreaseMemoryUsage(windowSurface->memoryUsage(), true);
+}
+
+void QRuntimeGraphicsSystem::increaseMemoryUsage(uint amount) const
+{
+    m_memoryUsage += amount;
+
+    if (m_graphicsSystemChangeMemoryLimit &&
+        m_memoryUsage < m_graphicsSystemChangeMemoryLimit) {
+
+        QRuntimeGraphicsSystem *gs = const_cast<QRuntimeGraphicsSystem*>(this);
+        QDeferredGraphicsSystemChange *deferredChange =
+                    new QDeferredGraphicsSystemChange(gs, m_pendingGraphicsSystemName);
+        deferredChange->launch();
+    }
+}
+
+void QRuntimeGraphicsSystem::decreaseMemoryUsage(uint amount, bool persistent) const
+{
+    m_memoryUsage -= amount;
+
+    if (persistent && m_graphicsSystemChangeMemoryLimit &&
+        m_memoryUsage < m_graphicsSystemChangeMemoryLimit) {
+
+        QRuntimeGraphicsSystem *gs = const_cast<QRuntimeGraphicsSystem*>(this);
+        QDeferredGraphicsSystemChange *deferredChange =
+                    new QDeferredGraphicsSystemChange(gs, m_pendingGraphicsSystemName);
+        deferredChange->launch();
+    }
+}
+
+#include "qgraphicssystem_runtime.moc"
+
+QT_END_NAMESPACE
diff --git a/src/gui/painting/qgraphicssystem_runtime_p.h b/src/gui/painting/qgraphicssystem_runtime_p.h
new file mode 100644
index 0000000..445f83d
--- /dev/null
+++ b/src/gui/painting/qgraphicssystem_runtime_p.h
@@ -0,0 +1,197 @@
+/****************************************************************************
+**
+** 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$
+**
+****************************************************************************/
+
+#ifndef QGRAPHICSSYSTEM_RUNTIME_P_H
+#define QGRAPHICSSYSTEM_RUNTIME_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of other Qt classes.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qgraphicssystem_p.h"
+
+#include <private/qpixmapdata_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QRuntimeGraphicsSystem;
+
+class QRuntimePixmapData : public QPixmapData {
+public:
+    QRuntimePixmapData(const QRuntimeGraphicsSystem *gs, PixelType type);
+    ~QRuntimePixmapData();
+
+    virtual QPixmapData *createCompatiblePixmapData() const;
+    virtual void resize(int width, int height);
+    virtual void fromImage(const QImage &image,
+                           Qt::ImageConversionFlags flags);
+
+    virtual bool fromFile(const QString &filename, const char *format,
+                          Qt::ImageConversionFlags flags);
+    virtual bool fromData(const uchar *buffer, uint len, const char *format,
+                          Qt::ImageConversionFlags flags);
+
+    virtual void copy(const QPixmapData *data, const QRect &rect);
+    virtual bool scroll(int dx, int dy, const QRect &rect);
+
+    virtual int metric(QPaintDevice::PaintDeviceMetric metric) const;
+    virtual void fill(const QColor &color);
+    virtual QBitmap mask() const;
+    virtual void setMask(const QBitmap &mask);
+    virtual bool hasAlphaChannel() const;
+    virtual QPixmap transformed(const QTransform &matrix,
+                                Qt::TransformationMode mode) const;
+    virtual void setAlphaChannel(const QPixmap &alphaChannel);
+    virtual QPixmap alphaChannel() const;
+    virtual QImage toImage() const;
+    virtual QPaintEngine *paintEngine() const;
+
+    virtual QImage *buffer();
+
+    void readBackInfo();
+
+    QPixmapData *m_data;
+
+#if defined(Q_OS_SYMBIAN)
+    void* toNativeType(NativeType type);
+    void fromNativeType(void* pixmap, NativeType type);
+#endif
+
+    virtual QPixmapData *runtimeData() const;
+
+    virtual uint memoryUsage() const;
+
+private:
+    const QRuntimeGraphicsSystem *m_graphicsSystem;
+
+};
+
+class QRuntimeWindowSurface : public QWindowSurface {
+public:
+    QRuntimeWindowSurface(const QRuntimeGraphicsSystem *gs, QWidget *window);
+    ~QRuntimeWindowSurface();
+
+    virtual QPaintDevice *paintDevice();
+    virtual void flush(QWidget *widget, const QRegion &region,
+                       const QPoint &offset);
+    virtual void setGeometry(const QRect &rect);
+
+    virtual bool scroll(const QRegion &area, int dx, int dy);
+
+    virtual void beginPaint(const QRegion &);
+    virtual void endPaint(const QRegion &);
+
+    virtual QImage* buffer(const QWidget *widget);
+    virtual QPixmap grabWidget(const QWidget *widget, const QRect& rectangle = QRect()) const;
+
+    virtual QPoint offset(const QWidget *widget) const;
+
+    virtual uint memoryUsage() const;
+
+    QWindowSurface *m_windowSurface;
+    QWindowSurface *m_pendingWindowSurface;
+
+private:
+    const QRuntimeGraphicsSystem *m_graphicsSystem;
+};
+
+class QRuntimeGraphicsSystem : public QGraphicsSystem
+{
+public:
+
+    enum WindowSurfaceDestroyPolicy
+    {
+        DestroyImmediately,
+        DestroyAfterFirstFlush
+    };
+
+public:
+    QRuntimeGraphicsSystem();
+
+    QPixmapData *createPixmapData(QPixmapData::PixelType type) const;
+    QWindowSurface *createWindowSurface(QWidget *widget) const;
+
+    void removePixmapData(QRuntimePixmapData *pixmapData) const;
+    void removeWindowSurface(QRuntimeWindowSurface *windowSurface) const;
+
+    void setGraphicsSystem(const QString &name, uint memoryUsageLimit);
+    void setGraphicsSystem(const QString &name);
+    QString graphicsSystemName() const { return m_graphicsSystemName; }
+
+    void setWindowSurfaceDestroyPolicy(WindowSurfaceDestroyPolicy policy)
+    {
+        m_windowSurfaceDestroyPolicy = policy;
+    }
+
+    int windowSurfaceDestroyPolicy() const { return m_windowSurfaceDestroyPolicy; }
+
+    int memoryUsage() const { return m_memoryUsage; }
+
+private:
+
+    void increaseMemoryUsage(uint amount) const;
+    void decreaseMemoryUsage(uint amount, bool persistent = false) const;
+
+private:
+    mutable uint m_memoryUsage;
+    int m_windowSurfaceDestroyPolicy;
+    QGraphicsSystem *m_graphicsSystem;
+    mutable QList<QRuntimePixmapData *> m_pixmapDatas;
+    mutable QList<QRuntimeWindowSurface *> m_windowSurfaces;
+    QString m_graphicsSystemName;
+
+    uint m_graphicsSystemChangeMemoryLimit;
+    QString m_pendingGraphicsSystemName;
+
+    friend class QRuntimePixmapData;
+    friend class QRuntimeWindowSurface;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp
index 3c09894..ee6fbd8 100644
--- a/src/gui/painting/qgraphicssystemfactory.cpp
+++ b/src/gui/painting/qgraphicssystemfactory.cpp
@@ -46,6 +46,7 @@
 
 #include "qapplication.h"
 #include "qgraphicssystem_raster_p.h"
+#include "qgraphicssystem_runtime_p.h"
 #include "qdebug.h"
 
 QT_BEGIN_NAMESPACE
@@ -68,6 +69,10 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key)
     if (system.isEmpty()) {
         system = QLatin1String("openvg");
     }
+#elif defined (QT_GRAPHICSSYSTEM_RUNTIME)
+    if (system.isEmpty()) {
+        system = QLatin1String("runtime");
+    }
 #elif defined (QT_GRAPHICSSYSTEM_RASTER) && !defined(Q_WS_WIN) && !defined(Q_OS_SYMBIAN)
     if (system.isEmpty()) {
         system = QLatin1String("raster");
@@ -76,6 +81,8 @@ QGraphicsSystem *QGraphicsSystemFactory::create(const QString& key)
 
     if (system == QLatin1String("raster"))
         return new QRasterGraphicsSystem;
+    else if (system == QLatin1String("runtime"))
+        return new QRuntimeGraphicsSystem;
     else if (system.isEmpty() || system == QLatin1String("native"))
         return 0;
 
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 6f395f6..48974e8 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -441,8 +441,9 @@ bool QRasterPaintEngine::begin(QPaintDevice *device)
 
     if (device->devType() == QInternal::Pixmap) {
         QPixmap *pixmap = static_cast<QPixmap *>(device);
-        if (pixmap->data->classId() == QPixmapData::RasterClass)
-            d->device = pixmap->data->buffer();
+        QPixmapData *pd = pixmap->pixmapData();
+        if (pd->classId() == QPixmapData::RasterClass)
+            d->device = pd->buffer();
     } else {
         d->device = device;
     }
@@ -2358,8 +2359,9 @@ void QRasterPaintEngine::drawPixmap(const QPointF &pos, const QPixmap &pixmap)
     qDebug() << " - QRasterPaintEngine::drawPixmap(), pos=" << pos << " pixmap=" << pixmap.size() << "depth=" << pixmap.depth();
 #endif
 
-    if (pixmap.data->classId() == QPixmapData::RasterClass) {
-        const QImage &image = static_cast<QRasterPixmapData *>(pixmap.data.data())->image;
+    QPixmapData *pd = pixmap.pixmapData();
+    if (pd->classId() == QPixmapData::RasterClass) {
+        const QImage &image = static_cast<QRasterPixmapData *>(pd)->image;
         if (image.depth() == 1) {
             Q_D(QRasterPaintEngine);
             QRasterPaintEngineState *s = state();
@@ -2398,8 +2400,9 @@ void QRasterPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap, cons
     qDebug() << " - QRasterPaintEngine::drawPixmap(), r=" << r << " sr=" << sr << " pixmap=" << pixmap.size() << "depth=" << pixmap.depth();
 #endif
 
-    if (pixmap.data->classId() == QPixmapData::RasterClass) {
-        const QImage &image = static_cast<QRasterPixmapData *>(pixmap.data.data())->image;
+    QPixmapData* pd = pixmap.pixmapData();
+    if (pd->classId() == QPixmapData::RasterClass) {
+        const QImage &image = static_cast<QRasterPixmapData *>(pd)->image;
         if (image.depth() == 1) {
             Q_D(QRasterPaintEngine);
             QRasterPaintEngineState *s = state();
@@ -2703,8 +2706,9 @@ void QRasterPaintEngine::drawTiledPixmap(const QRectF &r, const QPixmap &pixmap,
 
     QImage image;
 
-    if (pixmap.data->classId() == QPixmapData::RasterClass) {
-        image = static_cast<QRasterPixmapData *>(pixmap.data.data())->image;
+    QPixmapData *pd = pixmap.pixmapData();
+    if (pd->classId() == QPixmapData::RasterClass) {
+        image = static_cast<QRasterPixmapData *>(pd)->image;
     } else {
         image = pixmap.toImage();
     }
diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp
index e18ea3f..2fe9036 100644
--- a/src/gui/painting/qwindowsurface.cpp
+++ b/src/gui/painting/qwindowsurface.cpp
@@ -116,8 +116,6 @@ public:
 QWindowSurface::QWindowSurface(QWidget *window)
     : d_ptr(new QWindowSurfacePrivate(window))
 {
-    if (window)
-        window->setWindowSurface(this);
 }
 
 /*!
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index b25dce5..93d4d18 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -43,10 +43,15 @@
 
 #include <QtGui/qpaintdevice.h>
 #include <private/qwidget_p.h>
-#include "qwindowsurface_s60_p.h"
+#include <private/qwindowsurface_s60_p.h>
 #include <private/qpixmap_s60_p.h>
 #include <private/qt_s60_p.h>
-#include "private/qdrawhelper_p.h"
+#include <private/qapplication_p.h>
+#include <private/qdrawhelper_p.h>
+
+#ifdef QT_GRAPHICSSYSTEM_RUNTIME
+#include <private/qgraphicssystem_runtime_p.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -79,13 +84,35 @@ QS60WindowSurface::QS60WindowSurface(QWidget* widget)
 
     setStaticContentsSupport(true);
 }
+
 QS60WindowSurface::~QS60WindowSurface()
 {
+#if defined(QT_GRAPHICSSYSTEM_RUNTIME) && defined(Q_SYMBIAN_SUPPORTS_SURFACES)
+    if(QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+        QRuntimeGraphicsSystem *runtimeGraphicsSystem =
+                static_cast<QRuntimeGraphicsSystem*>(QApplicationPrivate::graphics_system);
+        if(runtimeGraphicsSystem->graphicsSystemName() == QLatin1String("openvg")) {
+
+            // Graphics system has been switched from raster to openvg.
+            // Issue empty redraw to clear the UI surface
+
+            QWidget *w = window();
+            RWindow *const window = static_cast<RWindow *>(w->winId()->DrawableWindow());
+            window->BeginRedraw();
+            window->EndRedraw();
+        }
+    }
+#endif
+
     delete d_ptr;
 }
 
 void QS60WindowSurface::beginPaint(const QRegion &rgn)
 {
+#ifdef Q_SYMBIAN_SUPPORTS_SURFACES
+    S60->wsSession().Finish();
+#endif
+
     if (!qt_widget_private(window())->isOpaque) {
         QS60PixmapData *pixmapData = static_cast<QS60PixmapData *>(d_ptr->device.data_ptr().data());
         pixmapData->beginDataAccess();
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index bfa7445..ea89734 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1135,7 +1135,8 @@ void Configure::parseCmdLine()
             QString system = configCmdLine.at(i);
             if (system == QLatin1String("raster")
                 || system == QLatin1String("opengl")
-                || system == QLatin1String("openvg"))
+                || system == QLatin1String("openvg")
+                || system == QLatin1String("runtime"))
                 dictionary["GRAPHICS_SYSTEM"] = configCmdLine.at(i);
         }
 
@@ -1605,7 +1606,7 @@ bool Configure::displayHelp()
                     "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n"
                     "[-no-mediaservices] [-mediaservices] [-no-media-backend] [-media-backend]\n"
                     "[-no-script] [-script] [-no-scripttools] [-scripttools]\n"
-                    "[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg]\n\n", 0, 7);
+                    "[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg|runtime]\n\n", 0, 7);
 
         desc("Installation options:\n\n");
 
@@ -1708,9 +1709,10 @@ bool Configure::displayHelp()
 #endif
         desc(                   "-graphicssystem <sys>",   "Specify which graphicssystem should be used.\n"
                                 "Available values for <sys>:");
-        desc("GRAPHICS_SYSTEM", "raster", "", "  raster - Software rasterizer", ' ');
-        desc("GRAPHICS_SYSTEM", "opengl", "", "  opengl - Using OpenGL acceleration, experimental!", ' ');
-        desc("GRAPHICS_SYSTEM", "openvg", "", "  openvg - Using OpenVG acceleration, experimental!", ' ');
+        desc("GRAPHICS_SYSTEM", "raster", "",  "  raster - Software rasterizer", ' ');
+        desc("GRAPHICS_SYSTEM", "opengl", "",  "  opengl - Using OpenGL acceleration, experimental!", ' ');
+        desc("GRAPHICS_SYSTEM", "openvg", "",  "  openvg - Using OpenVG acceleration, experimental!", ' ');
+        desc("GRAPHICS_SYSTEM", "runtime", "", "  runtime - Runtime switching of graphics sytems", ' ');
 
 
         desc(                   "-help, -h, -?",        "Display this information.\n");
@@ -3075,9 +3077,10 @@ void Configure::generateConfigfiles()
         if(dictionary["SQL_SQLITE2"] == "yes")      qconfigList += "QT_SQL_SQLITE2";
         if(dictionary["SQL_IBASE"] == "yes")        qconfigList += "QT_SQL_IBASE";
 
-        if (dictionary["GRAPHICS_SYSTEM"] == "openvg") qconfigList += "QT_GRAPHICSSYSTEM_OPENVG";
-        if (dictionary["GRAPHICS_SYSTEM"] == "opengl") qconfigList += "QT_GRAPHICSSYSTEM_OPENGL";
-        if (dictionary["GRAPHICS_SYSTEM"] == "raster") qconfigList += "QT_GRAPHICSSYSTEM_RASTER";
+        if (dictionary["GRAPHICS_SYSTEM"] == "openvg")  qconfigList += "QT_GRAPHICSSYSTEM_OPENVG";
+        if (dictionary["GRAPHICS_SYSTEM"] == "opengl")  qconfigList += "QT_GRAPHICSSYSTEM_OPENGL";
+        if (dictionary["GRAPHICS_SYSTEM"] == "raster")  qconfigList += "QT_GRAPHICSSYSTEM_RASTER";
+        if (dictionary["GRAPHICS_SYSTEM"] == "runtime") qconfigList += "QT_GRAPHICSSYSTEM_RUNTIME";
 
         if (dictionary.contains("XQMAKESPEC") && dictionary["XQMAKESPEC"].startsWith("symbian")) {
             // These features are not ported to Symbian (yet)
-- 
cgit v0.12


From 16f44ee07db46ad362a464afc2c6e6567c933870 Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Thu, 20 May 2010 10:52:16 +0200
Subject: QApplication::closeAllWindows() should ignore windows being closed

It is very common to display a dialog in response to a close event.
Closing the window again will result in QWidget::close() returning true.
This confuses QApplication::closeAllWindows(), since the window is still
visible even though it was closed (or is closing). Solve this by
ignoring windows that have the is_closing flag set in their widget data.

Task-number: QTBUG-7635
Reviewed-by: Denis Dzyubenko
---
 src/gui/kernel/qapplication.cpp              |  8 +--
 tests/auto/qapplication/tst_qapplication.cpp | 78 ++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 3 deletions(-)

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 7b62de1..b805a72 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -2218,15 +2218,17 @@ void QApplication::closeAllWindows()
 {
     bool did_close = true;
     QWidget *w;
-    while((w = activeModalWidget()) && did_close) {
-        if(!w->isVisible())
+    while ((w = activeModalWidget()) && did_close) {
+        if (!w->isVisible() || w->data->is_closing)
             break;
         did_close = w->close();
     }
     QWidgetList list = QApplication::topLevelWidgets();
     for (int i = 0; did_close && i < list.size(); ++i) {
         w = list.at(i);
-        if (w->isVisible() && w->windowType() != Qt::Desktop) {
+        if (w->isVisible()
+            && w->windowType() != Qt::Desktop
+            && !w->data->is_closing) {
             did_close = w->close();
             list = QApplication::topLevelWidgets();
             i = -1;
diff --git a/tests/auto/qapplication/tst_qapplication.cpp b/tests/auto/qapplication/tst_qapplication.cpp
index 459ac2b..43fbba1 100644
--- a/tests/auto/qapplication/tst_qapplication.cpp
+++ b/tests/auto/qapplication/tst_qapplication.cpp
@@ -106,6 +106,7 @@ private slots:
 
     void lastWindowClosed();
     void quitOnLastWindowClosed();
+    void closeAllWindows();
     void testDeleteLater();
     void testDeleteLaterProcessEvents();
 
@@ -745,6 +746,83 @@ void tst_QApplication::quitOnLastWindowClosed()
     }
 }
 
+class PromptOnCloseWidget : public QWidget
+{
+public:
+    void closeEvent(QCloseEvent *event)
+    {
+        QMessageBox *messageBox = new QMessageBox(this);
+        messageBox->setWindowTitle("Unsaved data");
+        messageBox->setText("Would you like to save or discard your current data?");
+        messageBox->setStandardButtons(QMessageBox::Save|QMessageBox::Discard|QMessageBox::Cancel);
+        messageBox->setDefaultButton(QMessageBox::Save);
+
+        messageBox->show();
+        QTest::qWaitForWindowShown(messageBox);
+
+        // verify that all windows are visible
+        foreach (QWidget *w, qApp->topLevelWidgets())
+            QVERIFY(w->isVisible());
+        // flush event queue
+        qApp->processEvents();
+        // close all windows
+        qApp->closeAllWindows();
+
+        if (messageBox->standardButton(messageBox->clickedButton()) == QMessageBox::Cancel)
+            event->ignore();
+        else
+            event->accept();
+
+        delete messageBox;
+    }
+};
+
+void tst_QApplication::closeAllWindows()
+{
+    int argc = 0;
+    QApplication app(argc, 0, QApplication::GuiServer);
+
+    // create some windows
+    new QWidget;
+    new QWidget;
+    new QWidget;
+
+    // show all windows
+    foreach (QWidget *w, app.topLevelWidgets()) {
+        w->show();
+        QTest::qWaitForWindowShown(w);
+    }
+    // verify that they are visible
+    foreach (QWidget *w, app.topLevelWidgets())
+        QVERIFY(w->isVisible());
+    // empty event queue
+    app.processEvents();
+    // close all windows
+    app.closeAllWindows();
+    // all windows should no longer be visible
+    foreach (QWidget *w, app.topLevelWidgets())
+        QVERIFY(!w->isVisible());
+
+    // add a window that prompts the user when closed
+    PromptOnCloseWidget *promptOnCloseWidget = new PromptOnCloseWidget;
+    // show all windows
+    foreach (QWidget *w, app.topLevelWidgets()) {
+        w->show();
+        QTest::qWaitForWindowShown(w);
+    }
+    // close the last window to open the prompt (eventloop recurses)
+    promptOnCloseWidget->close();
+    // all windows should not be visible, except the one that opened the prompt
+    foreach (QWidget *w, app.topLevelWidgets()) {
+        if (w == promptOnCloseWidget)
+            QVERIFY(w->isVisible());
+        else
+            QVERIFY(!w->isVisible());
+    }
+
+    qDeleteAll(app.topLevelWidgets());
+}
+
 bool isPathListIncluded(const QStringList &l, const QStringList &r)
 {
     int size = r.count();
-- 
cgit v0.12


From 65a673f7ab1955e277246e4c88bec46493265cf3 Mon Sep 17 00:00:00 2001
From: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
Date: Thu, 20 May 2010 12:17:58 +0200
Subject: QPushButton's click area exceeds the button area by far on Mac OS X

The problem is the "rounding" of buttons in OSX. To achieve this we
add some padding to the buttons, therefore creating an inner rect for
the widget. The common hitButton(...) method found in QAbstractButton
just checks the normal rect of the widget. What this patch does is to
reimplement hitButton(...) in QPushButton, but only for the Mac case.
In this reimplemented method I calculate the inner rect and check if
the hit point is inside that rect or not.

Task-number: QTBUG-10401
Reviewed-by: Richard Moe Gustavsen
---
 src/gui/styles/qmacstyle_mac.h  | 11 +++++++++++
 src/gui/styles/qmacstyle_mac.mm | 33 +++++++++++++++++----------------
 src/gui/widgets/qpushbutton.cpp | 34 ++++++++++++++++++++++++++++++++++
 src/gui/widgets/qpushbutton.h   |  3 +++
 src/gui/widgets/qpushbutton_p.h |  3 +++
 5 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/src/gui/styles/qmacstyle_mac.h b/src/gui/styles/qmacstyle_mac.h
index bcebb1d..e594793 100644
--- a/src/gui/styles/qmacstyle_mac.h
+++ b/src/gui/styles/qmacstyle_mac.h
@@ -120,6 +120,17 @@ public:
 
     bool event(QEvent *e);
 
+    // Ideally these wouldn't exist, but since they already exist we need some accessors.
+    static const int PushButtonLeftOffset;
+    static const int PushButtonTopOffset;
+    static const int PushButtonRightOffset;
+    static const int PushButtonBottomOffset;
+    static const int MiniButtonH;
+    static const int SmallButtonH;
+    static const int BevelButtonW;
+    static const int BevelButtonH;
+    static const int PushButtonContentPadding;
+
 protected Q_SLOTS:
     QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
                                      const QWidget *widget = 0) const;
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index e065bcc..0f01bd5 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -108,15 +108,15 @@ extern QRegion qt_mac_convert_mac_region(RgnHandle); //qregion_mac.cpp
 
 // The following constants are used for adjusting the size
 // of push buttons so that they are drawn inside their bounds.
-static const int PushButtonLeftOffset = 6;
-static const int PushButtonTopOffset = 4;
-static const int PushButtonRightOffset = 12;
-static const int PushButtonBottomOffset = 12;
-static const int MiniButtonH = 26;
-static const int SmallButtonH = 30;
-static const int BevelButtonW = 50;
-static const int BevelButtonH = 22;
-static const int PushButtonContentPadding = 6;
+const int QMacStyle::PushButtonLeftOffset = 6;
+const int QMacStyle::PushButtonTopOffset = 4;
+const int QMacStyle::PushButtonRightOffset = 12;
+const int QMacStyle::PushButtonBottomOffset = 12;
+const int QMacStyle::MiniButtonH = 26;
+const int QMacStyle::SmallButtonH = 30;
+const int QMacStyle::BevelButtonW = 50;
+const int QMacStyle::BevelButtonH = 22;
+const int QMacStyle::PushButtonContentPadding = 6;
 
 // These colors specify the titlebar gradient colors on
 // Leopard. Ideally we should get them from the system.
@@ -1055,10 +1055,10 @@ HIRect QMacStylePrivate::pushButtonContentBounds(const QStyleOptionButton *btn,
     // Adjust the bounds to correct for
     // carbon not calculating the content bounds fully correct
     if (bdi->kind == kThemePushButton || bdi->kind == kThemePushButtonSmall){
-        outerBounds.origin.y += PushButtonTopOffset;
-        outerBounds.size.height -= PushButtonBottomOffset;
+        outerBounds.origin.y += QMacStyle::PushButtonTopOffset;
+        outerBounds.size.height -= QMacStyle::PushButtonBottomOffset;
     } else if (bdi->kind == kThemePushButtonMini) {
-        outerBounds.origin.y += PushButtonTopOffset;
+        outerBounds.origin.y += QMacStyle::PushButtonTopOffset;
     }
 
     HIRect contentBounds;
@@ -1074,7 +1074,7 @@ QSize QMacStylePrivate::pushButtonSizeFromContents(const QStyleOptionButton *btn
 {
     QSize csz(0, 0);
     QSize iconSize = btn->icon.isNull() ? QSize(0, 0)
-                : (btn->iconSize + QSize(PushButtonContentPadding, 0));
+                : (btn->iconSize + QSize(QMacStyle::PushButtonContentPadding, 0));
     QRect textRect = btn->text.isEmpty() ? QRect(0, 0, 1, 1)
                 : btn->fontMetrics.boundingRect(QRect(), Qt::AlignCenter, btn->text);
     csz.setWidth(iconSize.width() + textRect.width()
@@ -1149,12 +1149,12 @@ void QMacStylePrivate::initHIThemePushButton(const QStyleOptionButton *btn,
             // Choose the button kind that closest match the button rect, but at the
             // same time displays the button contents without clipping.
             bdi->kind = kThemeBevelButton;
-            if (btn->rect.width() >= BevelButtonW && btn->rect.height() >= BevelButtonH){
+            if (btn->rect.width() >= QMacStyle::BevelButtonW && btn->rect.height() >= QMacStyle::BevelButtonH){
                 if (widget && widget->testAttribute(Qt::WA_MacVariableSize)) {
-                    if (btn->rect.height() <= MiniButtonH){
+                    if (btn->rect.height() <= QMacStyle::MiniButtonH){
                         if (contentFitsInPushButton(btn, bdi, kThemePushButtonMini))
                             bdi->kind = kThemePushButtonMini;
-                    } else if (btn->rect.height() <= SmallButtonH){
+                    } else if (btn->rect.height() <= QMacStyle::SmallButtonH){
                         if (contentFitsInPushButton(btn, bdi, kThemePushButtonSmall))
                             bdi->kind = kThemePushButtonSmall;
                     } else if (contentFitsInPushButton(btn, bdi, kThemePushButton)) {
@@ -3470,6 +3470,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
         QCommonStyle::drawControl(ce, opt, p, w);
         break;
     case CE_PushButtonBevel:
+        qDebug() << "here";
         if (const QStyleOptionButton *btn = ::qstyleoption_cast<const QStyleOptionButton *>(opt)) {
             if (!(btn->state & (State_Raised | State_Sunken | State_On)))
                 break;
diff --git a/src/gui/widgets/qpushbutton.cpp b/src/gui/widgets/qpushbutton.cpp
index 1a9adcc..7b8c0db 100644
--- a/src/gui/widgets/qpushbutton.cpp
+++ b/src/gui/widgets/qpushbutton.cpp
@@ -58,6 +58,9 @@
 #include "qdebug.h"
 #include "qlayoutitem.h"
 #include "qdialogbuttonbox.h"
+#ifdef Q_WS_MAC
+#include "qmacstyle_mac.h"
+#endif // Q_WS_MAC
 
 #ifndef QT_NO_ACCESSIBILITY
 #include "qaccessible.h"
@@ -679,6 +682,37 @@ bool QPushButton::event(QEvent *e)
     return QAbstractButton::event(e);
 }
 
+#ifdef Q_WS_MAC
+/*! \reimp */
+bool QPushButton::hitButton(const QPoint &pos) const
+{
+    // This is only required if we are using the native style, so check that first.
+        QMacStyle *macStyle = qobject_cast<QMacStyle *>(style());
+    // If this is a flat button we just bail out.
+    if(isFlat() || (0 == macStyle))
+        return QAbstractButton::hitButton(pos);
+    // Now that we know we are using the native style, let's proceed.
+    Q_D(const QPushButton);
+    QPushButtonPrivate *nonConst = const_cast<QPushButtonPrivate *>(d);
+    // In OSX buttons are round, which causes the hit method to be special.
+    // We cannot simply relay on detecting if something is inside the rect or not,
+    // we need to check if it is inside the "rounded area" or not. A point might
+    // be inside the rect but not inside the rounded area.
+    // Notice this method is only reimplemented for OSX.
+    return nonConst->hitButton(pos);
+}
+
+bool QPushButtonPrivate::hitButton(const QPoint &pos)
+{
+    Q_Q(QPushButton);
+    QRect roundedRect(q->rect().left() + QMacStyle::PushButtonLeftOffset,
+                      q->rect().top() + QMacStyle::PushButtonContentPadding,
+                      q->rect().width() - QMacStyle::PushButtonRightOffset,
+                      q->rect().height() - QMacStyle::PushButtonBottomOffset);
+    return roundedRect.contains(pos);
+}
+#endif // Q_WS_MAC
+
 #ifdef QT3_SUPPORT
 /*!
     Use one of the constructors that doesn't take the \a name
diff --git a/src/gui/widgets/qpushbutton.h b/src/gui/widgets/qpushbutton.h
index 2a4823d..cf28753 100644
--- a/src/gui/widgets/qpushbutton.h
+++ b/src/gui/widgets/qpushbutton.h
@@ -91,6 +91,9 @@ public Q_SLOTS:
 
 protected:
     bool event(QEvent *e);
+#ifdef Q_WS_MAC
+    bool hitButton(const QPoint &pos) const;
+#endif // Q_WS_MAC
     void paintEvent(QPaintEvent *);
     void keyPressEvent(QKeyEvent *);
     void focusInEvent(QFocusEvent *);
diff --git a/src/gui/widgets/qpushbutton_p.h b/src/gui/widgets/qpushbutton_p.h
index f2ee09d..6feb726 100644
--- a/src/gui/widgets/qpushbutton_p.h
+++ b/src/gui/widgets/qpushbutton_p.h
@@ -69,6 +69,9 @@ public:
 
     inline void init() { resetLayoutItemMargins(); }
     static QPushButtonPrivate* get(QPushButton *b) { return b->d_func(); }
+#ifdef Q_WS_MAC
+    bool hitButton(const QPoint &pos);
+#endif
 #ifndef QT_NO_MENU
     QPoint adjustedMenuPosition();
 #endif
-- 
cgit v0.12


From d88905544477283a17580b210e46c93635cf9920 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Thu, 20 May 2010 12:22:29 +0200
Subject: update 4.7.0 changes

Mistakenly added something that was fixed for 4.6.3 (it's been moved
to changes-4.6.3 in a different branch).
---
 dist/changes-4.7.0 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index a57575e..d6209f4 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -54,8 +54,6 @@ QtCore
     * Significantly improved performance of the type() function
  - QState
     * [QTBUG-7741] Added a function to get the out-going transitions
- - QStateMachine
-    * [QTBUG-8842] Reset history states when (re)starting machine
  - QXmlStreamReader
     * [QTBUG-9196] fixed crash when parsing
  - QTimer
-- 
cgit v0.12


From 1dc2235ac930c5444aa83a25432d1bf8b78b18db Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Thu, 20 May 2010 13:49:18 +0200
Subject: doc: Fixed many broken links.

---
 doc/src/declarative/advtutorial.qdoc          |  2 +-
 doc/src/declarative/integrating.qdoc          |  2 +-
 doc/src/examples/diagramscene.qdoc            | 12 ++++++------
 doc/src/examples/undoframework.qdoc           |  2 +-
 doc/src/frameworks-technologies/activeqt.qdoc |  6 +++---
 doc/src/getting-started/installation.qdoc     | 12 ++++++------
 doc/src/getting-started/known-issues.qdoc     |  2 +-
 doc/src/porting/porting4.qdoc                 |  4 ++--
 doc/src/widgets-and-layouts/focus.qdoc        |  2 +-
 doc/src/widgets-and-layouts/styles.qdoc       |  2 +-
 src/gui/graphicsview/qgraphicsview.cpp        |  2 +-
 src/gui/image/qimage.cpp                      |  4 ++--
 src/gui/image/qpixmap.cpp                     |  4 ++--
 src/gui/itemviews/qlistwidget.cpp             |  4 ++--
 src/gui/itemviews/qstandarditemmodel.cpp      |  4 ++--
 src/gui/itemviews/qtablewidget.cpp            |  4 ++--
 src/gui/itemviews/qtreewidget.cpp             |  4 ++--
 src/gui/kernel/qwidget.cpp                    |  4 ++--
 src/gui/math3d/qgenericmatrix.cpp             |  4 ++--
 src/gui/math3d/qmatrix4x4.cpp                 |  4 ++--
 src/gui/math3d/qquaternion.cpp                |  4 ++--
 src/gui/math3d/qvector2d.cpp                  |  4 ++--
 src/gui/math3d/qvector3d.cpp                  |  4 ++--
 src/gui/math3d/qvector4d.cpp                  |  4 ++--
 src/gui/painting/qbrush.cpp                   |  8 ++++----
 src/gui/painting/qpaintdevice.qdoc            |  3 +--
 src/gui/painting/qpaintengine.cpp             |  2 +-
 src/gui/painting/qpen.cpp                     |  6 +++---
 src/gui/painting/qtransform.cpp               | 10 +++++-----
 src/gui/styles/qstyle.cpp                     |  2 +-
 30 files changed, 65 insertions(+), 66 deletions(-)

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 47504ae..62536c6 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -468,6 +468,6 @@ By following this tutorial you've seen how you can write a fully functional appl
 \endlist
 
 There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
-demos and examples and the \l {Declarative UI Using QML}{documentation} to find out all the things you can do with QML!
+demos and examples and the \l {Qt Quick} documentation to see all the things you can do with QML!
 
 */
diff --git a/doc/src/declarative/integrating.qdoc b/doc/src/declarative/integrating.qdoc
index c6f754b..728eb13 100644
--- a/doc/src/declarative/integrating.qdoc
+++ b/doc/src/declarative/integrating.qdoc
@@ -81,7 +81,7 @@ of simple and dynamic elements.
 
 \section2 Adding QML widgets to a QGraphicsScene
 
-If you have an existing UI based on the \l{The Graphics View Framework}{Graphics View Framework},
+If you have an existing UI based on the \l{Graphics View Framework},
 you can integrate QML widgets directly into your QGraphicsScene. Use
 QDeclarativeComponent to create a QGraphicsObject from a QML file, and
 place the graphics object into your scene using \l{QGraphicsScene::addItem()}, or 
diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc
index 87c973a..a39f89a7 100644
--- a/doc/src/examples/diagramscene.qdoc
+++ b/doc/src/examples/diagramscene.qdoc
@@ -54,13 +54,13 @@
     colors, and it is possible to change the font, style, and
     underline of the text.
 
-    The Qt graphics view framework is designed to manage and
-    display custom 2D graphics items. The main classes of the
-    framework are QGraphicsItem, QGraphicsScene and QGraphicsView. The
-    graphics scene manages the items and provides a surface for them.
+    The Qt graphics view framework is designed to manage and display
+    custom 2D graphics items. The main classes of the framework are
+    QGraphicsItem, QGraphicsScene and QGraphicsView. The graphics
+    scene manages the items and provides a surface for them.
     QGraphicsView is a widget that is used to render a scene on the
-    screen. See the \l{The Graphics View Framework}{overview document}
-    for a more detailed description of the framework. 
+    screen. See the \l{Graphics View Framework} for a more detailed
+    description of the framework.
 
     In this example we show how to create such custom graphics
     scenes and items by implementing classes that inherit
diff --git a/doc/src/examples/undoframework.qdoc b/doc/src/examples/undoframework.qdoc
index adb38b6..aab25fa 100644
--- a/doc/src/examples/undoframework.qdoc
+++ b/doc/src/examples/undoframework.qdoc
@@ -67,7 +67,7 @@
     available through the edit menu. The user can also select a command
     from the undo view.
 
-    We use the \l{The Graphics View Framework}{graphics view
+    We use the \l{Graphics View Framework}{graphics view
     framework} to implement the diagram. We only treat the related
     code briefly as the framework has examples of its own (e.g., the
     \l{Diagram Scene Example}).
diff --git a/doc/src/frameworks-technologies/activeqt.qdoc b/doc/src/frameworks-technologies/activeqt.qdoc
index 979d885..5a3b23e 100644
--- a/doc/src/frameworks-technologies/activeqt.qdoc
+++ b/doc/src/frameworks-technologies/activeqt.qdoc
@@ -71,16 +71,16 @@
     \endlist
 
     For more information about using ActiveX with Qt, see
-    \l{Building ActiveX servers and controls with Qt}.
+    \l{Building ActiveX servers in Qt}.
 
     The ActiveQt framework consists of two modules:
 
     \list
-    \o The \l{Using ActiveX controls and COM objects in Qt}{QAxContainer}
+    \o The \l{Using ActiveX controls and COM in Qt}{QAxContainer}
        module is a static library implementing QObject and QWidget subclasses,
        QAxObject and QAxWidget, that act as containers for COM objects and
        ActiveX controls.
-    \o The \l{Building ActiveX servers and controls with Qt}{QAxServer}
+    \o The \l{Building ActiveX servers in Qt}{QAxServer}
        module is a static library that implements
        functionality for in-process and executable COM servers. This
        module provides the QAxAggregated, QAxBindable and QAxFactory
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 36abc10..4a96a39 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -959,7 +959,7 @@ applications using Qt for Symbian can start right away.}
         \l{http://www.microsoft.com/downloads/details.aspx?FamilyID=0baf2b35-c656-4969-ace8-e4c0c0716adb&amp;DisplayLang=en}{here}.
     \endlist
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */
 
 /*!
@@ -969,7 +969,7 @@ applications using Qt for Symbian can start right away.}
     \brief Setting up the Mac OS X environment for Qt.
     \previouspage General Qt Requirements
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */
 
 /*!
@@ -1108,7 +1108,7 @@ applications using Qt for Symbian can start right away.}
     distributions; try searching for \c gstreamer or \c libgstreamer in your
     distribution's package repository to find suitable packages.
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */
 
 /*!
@@ -1162,7 +1162,7 @@ applications using Qt for Symbian can start right away.}
     information on Windows CE Customization can be found
     \l{Windows CE - Working with Custom SDKs}{here}.
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */
 
 /*!
@@ -1172,7 +1172,7 @@ applications using Qt for Symbian can start right away.}
     \brief Setting up the Embedded Linux environment for Qt.
     \previouspage General Qt Requirements
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 
     \section1 Building Qt for Embedded Linux with uclibc
 
@@ -1272,5 +1272,5 @@ applications using Qt for Symbian can start right away.}
     We recommend you to take a look at \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start}
     to get more information about how to setup the development environment.
 
-    \sa {Known Issues in %VERSION%}
+    \sa {Known Issues}
 */
diff --git a/doc/src/getting-started/known-issues.qdoc b/doc/src/getting-started/known-issues.qdoc
index cedebf9..5b6b2fc 100644
--- a/doc/src/getting-started/known-issues.qdoc
+++ b/doc/src/getting-started/known-issues.qdoc
@@ -41,7 +41,7 @@
 
 /*!
     \page known-issues.html
-    \title Known Issues in this Qt Version
+    \title Known Issues
     \ingroup platform-specific
     \brief A summary of known issues in this Qt version at the time of release.
 
diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc
index 1b6eeb7..75fe844 100644
--- a/doc/src/porting/porting4.qdoc
+++ b/doc/src/porting/porting4.qdoc
@@ -1000,8 +1000,8 @@
     \row \o \c QCanvasView \o Q3CanvasView
     \endtable
 
-    \l{The Graphics View Framework} replaces QCanvas. For more on porting to
-    Graphics View, see \l{Porting to Graphics View}.
+    The \l{Graphics View Framework} replaces QCanvas. For more on
+    porting to Graphics View, see \l{Porting to Graphics View}.
 
     \section1 QColor
 
diff --git a/doc/src/widgets-and-layouts/focus.qdoc b/doc/src/widgets-and-layouts/focus.qdoc
index 71f41d5..5ccfb63 100644
--- a/doc/src/widgets-and-layouts/focus.qdoc
+++ b/doc/src/widgets-and-layouts/focus.qdoc
@@ -82,7 +82,7 @@
     Pressing \key Tab is by far the most common way to move focus
     using the keyboard. (Sometimes in data-entry applications Enter
     does the same as \key{Tab}; this can easily be achieved in Qt by
-    implementing an \l{Events and Event Filters}{event filter}.)
+    implementing an \l{The Event System}{event filter}.)
 
     Pressing \key Tab, in all window systems in common use today,
     moves the keyboard focus to the next widget in a circular
diff --git a/doc/src/widgets-and-layouts/styles.qdoc b/doc/src/widgets-and-layouts/styles.qdoc
index 31dfe40..b031dec 100644
--- a/doc/src/widgets-and-layouts/styles.qdoc
+++ b/doc/src/widgets-and-layouts/styles.qdoc
@@ -47,7 +47,7 @@
 
 /*!
     \page style-reference.html
-    \title Styles and Style Aware Widgets
+    \title Styles &amp Style Aware Widgets
     \ingroup qt-gui-concepts
     \brief Styles and the styling of widgets.
 
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index 9dfcd2c..a83b528 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -53,7 +53,7 @@ static const int QGRAPHICSVIEW_PREALLOC_STYLE_OPTIONS = 503; // largest prime <
 
     QGraphicsView visualizes the contents of a QGraphicsScene in a scrollable
     viewport. To create a scene with geometrical items, see QGraphicsScene's
-    documentation. QGraphicsView is part of \l{The Graphics View Framework}.
+    documentation. QGraphicsView is part of the \l{Graphics View Framework}.
 
     To visualize a scene, you start by constructing a QGraphicsView object,
     passing the address of the scene you want to visualize to QGraphicsView's
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 85be5b1..98f235e 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -4812,7 +4812,7 @@ bool QImageData::doImageIO(const QImage *image, QImageWriter *writer, int qualit
     or as a BMP image if the stream's version is 1. Note that writing
     the stream to a file will not produce a valid image file.
 
-    \sa QImage::save(), {Format of the QDataStream Operators}
+    \sa QImage::save(), {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &s, const QImage &image)
@@ -4838,7 +4838,7 @@ QDataStream &operator<<(QDataStream &s, const QImage &image)
     Reads an image from the given \a stream and stores it in the given
     \a image.
 
-    \sa QImage::load(), {Format of the QDataStream Operators}
+    \sa QImage::load(), {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &s, QImage &image)
diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp
index 474cd2e..48c5d3f 100644
--- a/src/gui/image/qpixmap.cpp
+++ b/src/gui/image/qpixmap.cpp
@@ -1281,7 +1281,7 @@ bool QPixmap::convertFromImage(const QImage &image, ColorMode mode)
     image. Note that writing the stream to a file will not produce a
     valid image file.
 
-    \sa QPixmap::save(), {Format of the QDataStream Operators}
+    \sa QPixmap::save(), {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &stream, const QPixmap &pixmap)
@@ -1294,7 +1294,7 @@ QDataStream &operator<<(QDataStream &stream, const QPixmap &pixmap)
 
     Reads an image from the given \a stream into the given \a pixmap.
 
-    \sa QPixmap::load(), {Format of the QDataStream Operators}
+    \sa QPixmap::load(), {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &stream, QPixmap &pixmap)
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp
index 125f0c4..da1d5db 100644
--- a/src/gui/itemviews/qlistwidget.cpp
+++ b/src/gui/itemviews/qlistwidget.cpp
@@ -791,7 +791,7 @@ QListWidgetItem &QListWidgetItem::operator=(const QListWidgetItem &other)
 
     This operator uses QListWidgetItem::write().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator<<(QDataStream &out, const QListWidgetItem &item)
 {
@@ -806,7 +806,7 @@ QDataStream &operator<<(QDataStream &out, const QListWidgetItem &item)
 
     This operator uses QListWidgetItem::read().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator>>(QDataStream &in, QListWidgetItem &item)
 {
diff --git a/src/gui/itemviews/qstandarditemmodel.cpp b/src/gui/itemviews/qstandarditemmodel.cpp
index 9d52c78..767b5a9 100644
--- a/src/gui/itemviews/qstandarditemmodel.cpp
+++ b/src/gui/itemviews/qstandarditemmodel.cpp
@@ -1921,7 +1921,7 @@ void QStandardItem::write(QDataStream &out) const
 
     This operator uses QStandardItem::read().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator>>(QDataStream &in, QStandardItem &item)
 {
@@ -1937,7 +1937,7 @@ QDataStream &operator>>(QDataStream &in, QStandardItem &item)
 
     This operator uses QStandardItem::write().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator<<(QDataStream &out, const QStandardItem &item)
 {
diff --git a/src/gui/itemviews/qtablewidget.cpp b/src/gui/itemviews/qtablewidget.cpp
index f653a41..5bb242e 100644
--- a/src/gui/itemviews/qtablewidget.cpp
+++ b/src/gui/itemviews/qtablewidget.cpp
@@ -1428,7 +1428,7 @@ void QTableWidgetItem::write(QDataStream &out) const
 
     This operator uses QTableWidgetItem::read().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator>>(QDataStream &in, QTableWidgetItem &item)
 {
@@ -1443,7 +1443,7 @@ QDataStream &operator>>(QDataStream &in, QTableWidgetItem &item)
 
     This operator uses QTableWidgetItem::write().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator<<(QDataStream &out, const QTableWidgetItem &item)
 {
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index 4c80325..0e06f34 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -2199,7 +2199,7 @@ void QTreeWidgetItem::executePendingSort() const
 
     This operator uses QTreeWidgetItem::write().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item)
 {
@@ -2214,7 +2214,7 @@ QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item)
 
     This operator uses QTreeWidgetItem::read().
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream &operator>>(QDataStream &in, QTreeWidgetItem &item)
 {
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 1f2cd8c..1c7f6ac 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -670,8 +670,8 @@ void QWidget::setAutoFillBackground(bool enabled)
     (to move the keyboard focus), and passes on most of the other events to
     one of the more specialized handlers above.
 
-    Events and the mechanism used to deliver them are covered in the
-    \l{Events and Event Filters} document.
+    Events and the mechanism used to deliver them are covered in 
+    \l{The Event System}.
 
     \section1 Groups of Functions and Properties
 
diff --git a/src/gui/math3d/qgenericmatrix.cpp b/src/gui/math3d/qgenericmatrix.cpp
index 96405a8b..be30cb6 100644
--- a/src/gui/math3d/qgenericmatrix.cpp
+++ b/src/gui/math3d/qgenericmatrix.cpp
@@ -252,7 +252,7 @@ QT_BEGIN_NAMESPACE
     Writes the given \a matrix to the given \a stream and returns a
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 /*!
@@ -262,7 +262,7 @@ QT_BEGIN_NAMESPACE
     Reads a NxM matrix from the given \a stream into the given \a matrix
     and returns a reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 #endif
diff --git a/src/gui/math3d/qmatrix4x4.cpp b/src/gui/math3d/qmatrix4x4.cpp
index 62d740c..16c7f97 100644
--- a/src/gui/math3d/qmatrix4x4.cpp
+++ b/src/gui/math3d/qmatrix4x4.cpp
@@ -1878,7 +1878,7 @@ QDebug operator<<(QDebug dbg, const QMatrix4x4 &m)
     Writes the given \a matrix to the given \a stream and returns a
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &stream, const QMatrix4x4 &matrix)
@@ -1896,7 +1896,7 @@ QDataStream &operator<<(QDataStream &stream, const QMatrix4x4 &matrix)
     Reads a 4x4 matrix from the given \a stream into the given \a matrix
     and returns a reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &stream, QMatrix4x4 &matrix)
diff --git a/src/gui/math3d/qquaternion.cpp b/src/gui/math3d/qquaternion.cpp
index ad71836..2fd66eb 100644
--- a/src/gui/math3d/qquaternion.cpp
+++ b/src/gui/math3d/qquaternion.cpp
@@ -595,7 +595,7 @@ QDebug operator<<(QDebug dbg, const QQuaternion &q)
     Writes the given \a quaternion to the given \a stream and returns a
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &stream, const QQuaternion &quaternion)
@@ -612,7 +612,7 @@ QDataStream &operator<<(QDataStream &stream, const QQuaternion &quaternion)
     Reads a quaternion from the given \a stream into the given \a quaternion
     and returns a reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &stream, QQuaternion &quaternion)
diff --git a/src/gui/math3d/qvector2d.cpp b/src/gui/math3d/qvector2d.cpp
index b67e8a1..6a5cfc8 100644
--- a/src/gui/math3d/qvector2d.cpp
+++ b/src/gui/math3d/qvector2d.cpp
@@ -434,7 +434,7 @@ QDebug operator<<(QDebug dbg, const QVector2D &vector)
     Writes the given \a vector to the given \a stream and returns a
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &stream, const QVector2D &vector)
@@ -450,7 +450,7 @@ QDataStream &operator<<(QDataStream &stream, const QVector2D &vector)
     Reads a 2D vector from the given \a stream into the given \a vector
     and returns a reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &stream, QVector2D &vector)
diff --git a/src/gui/math3d/qvector3d.cpp b/src/gui/math3d/qvector3d.cpp
index 6a592b2..dfcce0e 100644
--- a/src/gui/math3d/qvector3d.cpp
+++ b/src/gui/math3d/qvector3d.cpp
@@ -585,7 +585,7 @@ QDebug operator<<(QDebug dbg, const QVector3D &vector)
     Writes the given \a vector to the given \a stream and returns a
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &stream, const QVector3D &vector)
@@ -602,7 +602,7 @@ QDataStream &operator<<(QDataStream &stream, const QVector3D &vector)
     Reads a 3D vector from the given \a stream into the given \a vector
     and returns a reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &stream, QVector3D &vector)
diff --git a/src/gui/math3d/qvector4d.cpp b/src/gui/math3d/qvector4d.cpp
index f2f3cc6..abff1ba 100644
--- a/src/gui/math3d/qvector4d.cpp
+++ b/src/gui/math3d/qvector4d.cpp
@@ -538,7 +538,7 @@ QDebug operator<<(QDebug dbg, const QVector4D &vector)
     Writes the given \a vector to the given \a stream and returns a
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &stream, const QVector4D &vector)
@@ -555,7 +555,7 @@ QDataStream &operator<<(QDataStream &stream, const QVector4D &vector)
     Reads a 4D vector from the given \a stream into the given \a vector
     and returns a reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &stream, QVector4D &vector)
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 96d547b..b468b11 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -329,8 +329,8 @@ struct QBrushDataPointerDeleter
 
     \endtable
 
-    For more information about painting in general, see \l{The Paint
-    System} documentation.
+    For more information about painting in general, see the \l{Paint
+    System}.
 
     \sa Qt::BrushStyle, QPainter, QColor
 */
@@ -1013,7 +1013,7 @@ QDebug operator<<(QDebug dbg, const QBrush &b)
     Writes the given \a brush to the given \a stream and returns a
     reference to the \a stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &s, const QBrush &b)
@@ -1081,7 +1081,7 @@ QDataStream &operator<<(QDataStream &s, const QBrush &b)
     Reads the given \a brush from the given \a stream and returns a
     reference to the \a stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &s, QBrush &b)
diff --git a/src/gui/painting/qpaintdevice.qdoc b/src/gui/painting/qpaintdevice.qdoc
index 8c73cc0..340db39 100644
--- a/src/gui/painting/qpaintdevice.qdoc
+++ b/src/gui/painting/qpaintdevice.qdoc
@@ -87,8 +87,7 @@
     function returns the number of different colors available for the
     paint device.
 
-    \sa QPaintEngine, QPainter, {The Coordinate System}, {The Paint
-    System}
+    \sa QPaintEngine, QPainter, {Coordinate System}, {Paint System}
 */
 
 /*!
diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp
index 6aabde8..a2d0337 100644
--- a/src/gui/painting/qpaintengine.cpp
+++ b/src/gui/painting/qpaintengine.cpp
@@ -172,7 +172,7 @@ QFont QTextItem::font() const
   possible to adapt to multiple technologies on each platform and take
   advantage of each to the fullest.
 
-  \sa QPainter, QPaintDevice::paintEngine(), {The Paint System}
+  \sa QPainter, QPaintDevice::paintEngine(), {Paint System}
 */
 
 /*!
diff --git a/src/gui/painting/qpen.cpp b/src/gui/painting/qpen.cpp
index e290cbe..2e43984 100644
--- a/src/gui/painting/qpen.cpp
+++ b/src/gui/painting/qpen.cpp
@@ -92,7 +92,7 @@ typedef QPenPrivate QPenData;
     convenience functions to extract and set the color of the pen's
     brush, respectively. Pens may also be compared and streamed.
 
-    For more information about painting in general, see \l{The Paint
+    For more information about painting in general, see the \l{Paint
     System} documentation.
 
     \tableofcontents
@@ -872,7 +872,7 @@ bool QPen::isDetached()
     Writes the given \a pen to the given \a stream and returns a reference to
     the \a stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator<<(QDataStream &s, const QPen &p)
@@ -918,7 +918,7 @@ QDataStream &operator<<(QDataStream &s, const QPen &p)
     Reads a pen from the given \a stream into the given \a pen and
     returns a reference to the \a stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 
 QDataStream &operator>>(QDataStream &s, QPen &p)
diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp
index aaa241f..423cce9 100644
--- a/src/gui/painting/qtransform.cpp
+++ b/src/gui/painting/qtransform.cpp
@@ -148,8 +148,8 @@ QT_BEGIN_NAMESPACE
     coordinate system.  The standard coordinate system of a
     QPaintDevice has its origin located at the top-left position. The
     \e x values increase to the right; \e y values increase
-    downward. For a complete description, see the \l {The Coordinate
-    System}{coordinate system} documentation.
+    downward. For a complete description, see the \l {Coordinate
+    System} {coordinate system} documentation.
 
     QPainter has functions to translate, scale, shear and rotate the
     coordinate system without using a QTransform. For example:
@@ -223,7 +223,7 @@ QT_BEGIN_NAMESPACE
     \snippet doc/src/snippets/transform/main.cpp 2
     \endtable
 
-    \sa QPainter, {The Coordinate System}, {demos/affine}{Affine
+    \sa QPainter, {Coordinate System}, {demos/affine}{Affine
     Transformations Demo}, {Transformations Example}
 */
 
@@ -1028,7 +1028,7 @@ void QTransform::reset()
     Writes the given \a matrix to the given \a stream and returns a
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream & operator<<(QDataStream &s, const QTransform &m)
 {
@@ -1052,7 +1052,7 @@ QDataStream & operator<<(QDataStream &s, const QTransform &m)
     Reads the given \a matrix from the given \a stream and returns a
     reference to the stream.
 
-    \sa {Format of the QDataStream Operators}
+    \sa {Serializing Qt Data Types}
 */
 QDataStream & operator>>(QDataStream &s, QTransform &t)
 {
diff --git a/src/gui/styles/qstyle.cpp b/src/gui/styles/qstyle.cpp
index 429dafe..4cfa93f 100644
--- a/src/gui/styles/qstyle.cpp
+++ b/src/gui/styles/qstyle.cpp
@@ -325,7 +325,7 @@ static int unpackControlTypes(QSizePolicy::ControlTypes controls, QSizePolicy::C
     control over size of header items and row and column sizes.
 
     \sa QStyleOption, QStylePainter, {Styles Example},
-        {Implementing Styles and Style Aware Widgets}, QStyledItemDelegate
+        {Styles &amp Style Aware Widgets}, QStyledItemDelegate
 */
 
 /*!
-- 
cgit v0.12


From a20f6367824dec6c8e48200cc86f9eb7903b6bcb Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Thu, 20 May 2010 15:44:29 +0300
Subject: Fix build error on S60 3.1 environments

Fixed build error in Symbian environments where
SNAP_FUNCTIONALITY_AVAILABLE is not defined.

Reviewed-by: Janne Koskinen
---
 src/plugins/bearer/symbian/qnetworksession_impl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.h b/src/plugins/bearer/symbian/qnetworksession_impl.h
index 9767293..1d30dd5 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.h
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.h
@@ -73,9 +73,9 @@ QT_BEGIN_NAMESPACE
 class ConnectionProgressNotifier;
 class SymbianEngine;
 
-class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate, public CActive,
+class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate, public CActive
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
-                                   public MMobilityProtocolResp
+                                   , public MMobilityProtocolResp
 #endif
 {
     Q_OBJECT
-- 
cgit v0.12


From d987e048f542a4c85c640b36d116bb408dd029fd Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Thu, 20 May 2010 15:05:08 +0200
Subject: doc: Fixed many broken links.

---
 doc/src/demos/boxes.qdoc                          |  2 +-
 doc/src/examples/drilldown.qdoc                   | 12 ++++++------
 doc/src/examples/mandelbrot.qdoc                  |  2 +-
 doc/src/examples/transformations.qdoc             |  4 ++--
 doc/src/frameworks-technologies/dnd.qdoc          |  6 +++---
 doc/src/frameworks-technologies/graphicsview.qdoc | 18 ++++++++++--------
 doc/src/getting-started/demos.qdoc                | 19 +++++++++----------
 doc/src/getting-started/how-to-learn-qt.qdoc      | 10 +++++-----
 doc/src/objectmodel/object.qdoc                   |  6 +++---
 doc/src/painting-and-printing/paintsystem.qdoc    | 12 ++++++------
 doc/src/porting/porting4-canvas.qdoc              |  2 +-
 doc/src/scripting/scripting.qdoc                  |  8 ++++----
 doc/src/sql-programming/qsqldatatype-table.qdoc   |  2 +-
 doc/src/sql-programming/sql-programming.qdoc      |  7 ++++---
 doc/src/widgets-and-layouts/widgets.qdoc          | 14 ++++++--------
 doc/src/windows-and-dialogs/mainwindow.qdoc       |  3 +--
 16 files changed, 63 insertions(+), 64 deletions(-)

diff --git a/doc/src/demos/boxes.qdoc b/doc/src/demos/boxes.qdoc
index aeb2513..367eb52 100644
--- a/doc/src/demos/boxes.qdoc
+++ b/doc/src/demos/boxes.qdoc
@@ -44,7 +44,7 @@
     \title Boxes
 
     This demo shows Qt's ability to combine advanced OpenGL rendering with the
-    the \l{The Graphics View Framework}{Graphics View} framework.
+    the \l{Graphics View Framework}.
 
     \image boxes-demo.png
 
diff --git a/doc/src/examples/drilldown.qdoc b/doc/src/examples/drilldown.qdoc
index ca994e8..2b87840 100644
--- a/doc/src/examples/drilldown.qdoc
+++ b/doc/src/examples/drilldown.qdoc
@@ -292,7 +292,7 @@
     \codeline
     \snippet examples/sql/drilldown/view.h 1
 
-    The QGraphicsView class is part of the \l {The Graphics View
+    The QGraphicsView class is part of the \l {Graphics View
     Framework} which we will use to display the images of Nokia's
     Qt offices. To be able to respond to user interaction;
     i.e., showing the
@@ -388,8 +388,8 @@
     reason we must create a custom item class is that we want to catch
     the item's hover events, animating the item when the mouse cursor
     is hovering over the image (by default, no items accept hover
-    events). Please see the \l{The Graphics View Framework}
-    documentation and the \l{Graphics View Examples} for more details.
+    events). Please see the \l{Graphics View Framework} documentation
+    and the \l{Graphics View Examples} for more details.
 
     \snippet examples/sql/drilldown/view.cpp 5
 
@@ -399,7 +399,7 @@
     function calls the private \c showInformation() function to pop up
     the associated information window.
 
-    \l {The Graphics View Framework} provides the qgraphicsitem_cast()
+    The \l {Graphics View Framework} provides the qgraphicsitem_cast()
     function to determine whether the given QGraphicsItem instance is
     of a given type. Note that if the event is not related to any of
     our image items, we pass it on to the base class implementation.
@@ -456,7 +456,7 @@
     borders.
 
     Finally, we store the location ID that this particular record is
-    associated with as well as a z-value. In the \l {The Graphics View
+    associated with as well as a z-value. In the \l {Graphics View
     Framework}, an item's z-value determines its position in the item
     stack. An item of high Z-value will be drawn on top of an item
     with a lower z-value if they share the same parent item. We also
@@ -477,7 +477,7 @@
     there is no current mouse grabber item. They are sent when the
     mouse cursor enters an item, when it moves around inside the item,
     and when the cursor leaves an item. As we mentioned earlier, none
-    of the \l {The Graphics View Framework}'s items accept hover
+    of the \l {Graphics View Framework}'s items accept hover
     event's by default.
 
     The QTimeLine class provides a timeline for controlling
diff --git a/doc/src/examples/mandelbrot.qdoc b/doc/src/examples/mandelbrot.qdoc
index 7a3c1cd..11173a8 100644
--- a/doc/src/examples/mandelbrot.qdoc
+++ b/doc/src/examples/mandelbrot.qdoc
@@ -285,7 +285,7 @@
     \snippet examples/threads/mandelbrot/mandelbrotwidget.cpp 8
 
     If the pixmap has the right scale factor, we draw the pixmap directly onto
-    the widget. Otherwise, we scale and translate the \l{The Coordinate
+    the widget. Otherwise, we scale and translate the \l{Coordinate
     System}{coordinate system} before we draw the pixmap. By reverse mapping
     the widget's rectangle using the scaled painter matrix, we also make sure
     that only the exposed areas of the pixmap are drawn. The calls to
diff --git a/doc/src/examples/transformations.qdoc b/doc/src/examples/transformations.qdoc
index 0d8de1d..0c246cb 100644
--- a/doc/src/examples/transformations.qdoc
+++ b/doc/src/examples/transformations.qdoc
@@ -87,7 +87,7 @@
     tranformation matrix that you can retrieve using the
     QPainter::worldTransform() function. A matrix transforms a point in the
     plane to another point. For more information about the
-    transformation matrix, see the \l {The Coordinate System} and
+    transformation matrix, see the \l {Coordinate System} and
     QTransform documentation.
 
     \snippet examples/painting/transformations/renderarea.h 0
@@ -374,7 +374,7 @@
 
     All the tranformation operations operate on QPainter's
     tranformation matrix. For more information about the
-    transformation matrix, see the \l {The Coordinate System} and
+    transformation matrix, see the \l {Coordinate System} and
     QTransform documentation.
 
     The Qt reference documentation provides several painting
diff --git a/doc/src/frameworks-technologies/dnd.qdoc b/doc/src/frameworks-technologies/dnd.qdoc
index 0e952ad..f728972 100644
--- a/doc/src/frameworks-technologies/dnd.qdoc
+++ b/doc/src/frameworks-technologies/dnd.qdoc
@@ -58,9 +58,9 @@
     This document describes the basic drag and drop mechanism and
     outlines the approach used to enable it in custom widgets. Drag
     and drop operations are also supported by Qt's item views and by
-    the graphics view framework; more information is available in the
-    \l{Using Drag and Drop with Item Views} and \l{The Graphics View
-    Framework} documents.
+    the graphics view framework. More information is available in
+    \l{Using Drag and Drop with Item Views} and \l{Graphics View
+    Framework}.
 
     \section1 Drag and Drop Classes
 
diff --git a/doc/src/frameworks-technologies/graphicsview.qdoc b/doc/src/frameworks-technologies/graphicsview.qdoc
index 681568e..b13f98e 100644
--- a/doc/src/frameworks-technologies/graphicsview.qdoc
+++ b/doc/src/frameworks-technologies/graphicsview.qdoc
@@ -220,9 +220,10 @@
       allow you to map between the three coordinate systems.
 
       When rendering, Graphics View's scene coordinates correspond to
-      QPainter's \e logical coordinates, and view coordinates are the same as
-      \e device coordinates.  In \l{The Coordinate System}, you can read about
-      the relationship between logical coordinates and device coordinates.
+      QPainter's \e logical coordinates, and view coordinates are the
+      same as \e device coordinates.  In the \l{Coordinate System}
+      documentation, you can read about the relationship between
+      logical coordinates and device coordinates.
 
       \img graphicsview-parentchild.png
 
@@ -435,11 +436,12 @@
 
       \section2 Animation
 
-        Graphics View supports animation at several levels. You can easily
-        assemble animation by using the Animation Framework. For that you'll
-		need your items to inherit from QGraphicsObject and associate 
-		QPropertyAnimation with them. QPropertyAnimation allows to animate any 
-		QObject property.
+        Graphics View supports animation at several levels. You can
+        easily assemble animation by using the Animation Framework.
+        For that you'll need your items to inherit from
+        QGraphicsObject and associate QPropertyAnimation with
+        them. QPropertyAnimation allows to animate any QObject
+        property.
 
         Another option is to create a custom item that inherits from QObject
         and QGraphicsItem. The item can the set up its own timers, and control
diff --git a/doc/src/getting-started/demos.qdoc b/doc/src/getting-started/demos.qdoc
index f8c70fe..9d39e08 100644
--- a/doc/src/getting-started/demos.qdoc
+++ b/doc/src/getting-started/demos.qdoc
@@ -126,16 +126,15 @@
     \section1 Graphics View
 
     \list
-    \o \l{demos/chip}{40000 Chips} uses the
-       \l{The Graphics View Framework}{Graphics View} framework to efficiently
-       display a large number of individual graphical items on a scrolling canvas,
-       highlighting features such as rotation, zooming, level of detail control,
-       and item selection.
-    \o \l{demos/embeddeddialogs}{Embedded Dialogs} showcases Qt 4.4's \e{Widgets on
-       the Canvas} feature by embedding a multitude of fully-working dialogs into a
-       scene.
+    \o \l{demos/chip}{40000 Chips} uses the \l{Graphics View Framework} to 
+       efficiently display a large number of individual graphical items on 
+       a scrolling canvas and highlighting features including rotation, 
+       zooming, level of detail control, and item selection.
+    \o \l{demos/embeddeddialogs}{Embedded Dialogs} showcases Qt 4.4's 
+       \e{Widgets on the Canvas} feature by embedding several 
+       fully-functional dialogs in a scene.
     \o \l{demos/boxes}{Boxes} showcases Qt's OpenGL support and the
-       integration with the Graphics View framework.
+       integration with the \l{Graphics View Framework}.
     \endlist
 
     \section1 Tools
@@ -185,7 +184,7 @@
     \o \l{demos/embedded/fluidlauncher}{Fluid Launcher} demo application launcher for embedded screens
     \o \l{demos/embedded/lightmaps}{Light Maps} demonstrates OpenStreetMap integration with WebKit.
     \o \l{demos/embedded/raycasting}{Ray Casting} demonstrates the use of ray casting with the
-       \l{The Graphics View Framework}{Graphics View} framework.
+       \l{Graphics View Framework}.
     \o \l{demos/embedded/styledemo}{Embedded Styles} demonstrates the use of styles.
     \o \l{demos/embedded/weatherinfo}{Weather Info} fetches weather information from the Web.
     \endlist
diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index ce8f521..642421b 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -59,11 +59,11 @@
     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}.
+    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: The Qt \l{Object
+    Model} and \l{Signals and Slots}.
 
     \beginfloatleft
     \inlineimage qtdemo-small.png
diff --git a/doc/src/objectmodel/object.qdoc b/doc/src/objectmodel/object.qdoc
index f81577d..8ae91ec 100644
--- a/doc/src/objectmodel/object.qdoc
+++ b/doc/src/objectmodel/object.qdoc
@@ -59,11 +59,11 @@
        communication called \l{signals and slots}
     \o queryable and designable \l{Qt's Property System}{object
        properties}
-    \o powerful \l{events and event filters}
+    \o powerful \l{The Event System}{events and event filters}
     \o contextual \l{i18n}{string translation for internationalization}
     \o sophisticated interval driven \l timers that make it possible
        to elegantly integrate many tasks in an event-driven GUI
-    \o hierarchical and queryable \l{Object Trees and Object Ownership}{object
+    \o hierarchical and queryable \l{Object Trees & Ownership}{object
        trees} that organize object ownership in a natural way
     \o guarded pointers (QPointer) that are automatically
        set to 0 when the referenced object is destroyed, unlike normal C++
@@ -113,7 +113,7 @@
     \o might have a unique \l{QObject::objectName()}.  If we copy a Qt
     Object, what name should we give the copy?
 
-    \o has a location in an \l{Object Trees and Object Ownership}
+    \o has a location in an \l{Object Trees & Ownership}
     {object hierarchy}. If we copy a Qt Object, where should the copy
     be located?
 
diff --git a/doc/src/painting-and-printing/paintsystem.qdoc b/doc/src/painting-and-printing/paintsystem.qdoc
index 44c84a2..c106f35 100644
--- a/doc/src/painting-and-printing/paintsystem.qdoc
+++ b/doc/src/painting-and-printing/paintsystem.qdoc
@@ -89,7 +89,7 @@
         \o \l{Classes for Painting}
         \o \l{Paint Devices and Backends}
         \o \l{Drawing and Filling}
-        \o \l{The Coordinate System}
+        \o \l{Coordinate System}
         \o \l{Reading and Writing Image Files}
         \o \l{Styling}
         \o \l{Printing with Qt}
@@ -339,10 +339,10 @@
 
     Normally, QPainter draws in a "natural" coordinate system, but it
     is able to perform view and world transformations using the
-    QTransform class. For more information, see \l {The Coordinate
-    System} documentation which also describes the rendering process,
-    i.e. the relation between the logical representation and the
-    rendered pixels, and the benefits of anti-aliased painting.
+    QTransform class. For more information, see \l {Coordinate
+    System}, which also describes the rendering process, i.e. the
+    relation between the logical representation and the rendered
+    pixels, and the benefits of anti-aliased painting.
 
     \table 100%
     \row \o
@@ -568,5 +568,5 @@
     \endtable
     
     For more information about widget styling and appearance, see the
-    documentation about \l{Implementing Styles and Style Aware Widgets}.
+    \l{Styles &amp Style Aware Widgets}.
 */
diff --git a/doc/src/porting/porting4-canvas.qdoc b/doc/src/porting/porting4-canvas.qdoc
index b69f53b..592f430 100644
--- a/doc/src/porting/porting4-canvas.qdoc
+++ b/doc/src/porting/porting4-canvas.qdoc
@@ -56,7 +56,7 @@
     number of custom-made 2D graphical items, and a view widget for
     visualizing the items, with support for zooming and rotation. Graphics
     View was introduced in Qt 4.2, replacing its predecessor, QCanvas. For
-    more on Graphics View, see \l{The Graphics View Framework}.
+    more on Graphics View, see \l{Graphics View Framework}.
 
     This document walks through the steps needed, class by class and function
     by function, to port a QCanvas application to Graphics View.
diff --git a/doc/src/scripting/scripting.qdoc b/doc/src/scripting/scripting.qdoc
index 2c22989..1f203a6 100644
--- a/doc/src/scripting/scripting.qdoc
+++ b/doc/src/scripting/scripting.qdoc
@@ -362,7 +362,7 @@
   By default, the script engine does not take ownership of the
   QObject that is passed to QScriptEngine::newQObject(); the object
   is managed according to Qt's object ownership (see
-  \l{Object Trees and Object Ownership}). This mode is appropriate
+  \l{Object Trees & Ownership}). This mode is appropriate
   when, for example, you are wrapping C++ objects that are part of
   your application's core; that is, they should persist regardless of
   what happens in the scripting environment. Another way of stating
@@ -627,9 +627,9 @@
 
   To completely understand how to make C++ objects available to Qt
   Script, some basic knowledge of the Qt meta-object system is very
-  helpful. We recommend that you read the \l{Qt Object Model}. The
-  information in this document and the documents it links to are very
-  useful for understanding how to implement application objects.
+  helpful. We recommend that you read about the Qt \l{Object Model}
+  and \l{The Meta-Object System}, which are useful for understanding
+  how to implement application objects.
 
   However, this knowledge is not essential in the simplest cases.
   To make an object available in QtScript, it must derive from
diff --git a/doc/src/sql-programming/qsqldatatype-table.qdoc b/doc/src/sql-programming/qsqldatatype-table.qdoc
index fb5fb49..329222b 100644
--- a/doc/src/sql-programming/qsqldatatype-table.qdoc
+++ b/doc/src/sql-programming/qsqldatatype-table.qdoc
@@ -46,7 +46,7 @@
   
   \ingroup qt-sql
 
-  \section1 Data Types for Qt Supported Database Systems
+  \section1 Recommended Data Types for Qt-Supported Database Systems
 
   This table shows the recommended data types for extracting data from
   the databases supported in Qt. Note that types used in Qt are not
diff --git a/doc/src/sql-programming/sql-programming.qdoc b/doc/src/sql-programming/sql-programming.qdoc
index b34810c..936e555 100644
--- a/doc/src/sql-programming/sql-programming.qdoc
+++ b/doc/src/sql-programming/sql-programming.qdoc
@@ -73,7 +73,7 @@
         \endlist
     \o \l{Executing SQL Statements}
         \list
-        \o \l{Recommended Use of Data Types in Databases}
+        \o \l{Data Types for Qt-supported Database Systems}
         \endlist
     \o \l{Using the SQL Model Classes}
     \o \l{Presenting Data in a Table View}
@@ -240,8 +240,9 @@
     QVariant::toString() and QVariant::toInt() to convert
     variants to QString and \c int.
 
-    For an overview of the recommended types used with Qt supported
-    Databases, please refer to \l{Recommended Use of Data Types in Databases}{this table}.
+    For an overview of the recommended types for use with Qt-supported
+    Databases, please refer to \l{Data Types for Qt-supported Database
+    Systems} {this table}.
 
     You can iterate back and forth using QSqlQuery::next(),
     QSqlQuery::previous(), QSqlQuery::first(), QSqlQuery::last(), and
diff --git a/doc/src/widgets-and-layouts/widgets.qdoc b/doc/src/widgets-and-layouts/widgets.qdoc
index 9fe2d69..c93a380 100644
--- a/doc/src/widgets-and-layouts/widgets.qdoc
+++ b/doc/src/widgets-and-layouts/widgets.qdoc
@@ -48,11 +48,10 @@
   \section1 Widgets
 
   Widgets are the primary elements for creating user interfaces in Qt.
-  \l{Widget Classes}{Widgets} can display data and status information,
+  \l{The Widget Classes}{Widgets} can display data and status information,
   receive user input, and provide a container for other widgets that
   should be grouped together. A widget that is not embedded in a
-  parent widget is called a \l{Application Windows and
-  Dialogs}{window}.
+  parent widget is called a \l{Window and Dialog Widgets} {window}.
 
   \image parent-child-widgets.png A parent widget containing various child widgets.
 
@@ -82,11 +81,10 @@
 
   \section1 Widget Styles
 
-  \l{Implementing Styles and Style Aware Widgets}{Styles} draw on
-  behalf of widgets and encapsulate the look and feel of a GUI. Qt's
-  built-in widgets use the QStyle class to perform nearly all of their
-  drawing, ensuring that they look exactly like the equivalent native
-  widgets.
+  \l{Styles &amp Style Aware Widgets}{Styles} draw on behalf of
+  widgets and encapsulate the look and feel of a GUI. Qt's built-in
+  widgets use the QStyle class to perform nearly all of their drawing,
+  ensuring that they look exactly like the equivalent native widgets.
     
   \table
   \row
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc
index c1e66d9..db9a636 100644
--- a/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -49,7 +49,6 @@
     \title Window and Dialog Widgets
     \brief Windows and Dialogs in Qt.
     \ingroup qt-gui-concepts
-    \ingroup frameworks-technologies
 
     A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window.
     Usually, windows have a frame and a title bar, although it is also possible to create
@@ -81,7 +80,7 @@
 
     \section1 Main Windows and Dialogs
 
-    \l{The Application Main Window} provides the framework for building the
+    The \l{Application Main Window} provides the framework for building the
     application's main user interface, and are created by subclassing QMainWindow.
     QMainWindow has its own layout to which you can add a \l{QMenuBar}{menu bar},
     \l{QToolBar}{tool bars}, \l{QDockWidget}{dockable widgets} and a
-- 
cgit v0.12


From 8846348738a3cab1a4b59b27f81e27bc17da02ff Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Thu, 20 May 2010 16:45:53 +0200
Subject: Improve look and feel of itemviews on mac

These fixes are neccessary and requested by Qt Creator and
should go into 4.7.0. The fixes involved is:

 - positioning of disclosure arrow in treeviews
 - spacing between icon and text label
 - added 2 pixel spacing between item view items

Note that native cocoa views tend to use 3 pixel spacing.
We considered this and decided on leaving it at 2 which is what
you see in finder list views, XCode among other places.
It also makes the change a bit less radical.

Reviewed-by:cduclos
Task-number:QTBUG-10190
---
 src/gui/styles/qmacstyle_mac.mm | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 0f01bd5..e82e638 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -132,6 +132,8 @@ static const QColor titlebarSeparatorLineInactive(131, 131, 131);
 static const QColor mainWindowGradientBegin(240, 240, 240);
 static const QColor mainWindowGradientEnd(200, 200, 200);
 
+static const int DisclosureOffset = 4;
+
 #if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5)
 enum {
     kThemePushButtonTextured = 31,
@@ -3100,7 +3102,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
         else
             bi.value = opt->direction == Qt::LeftToRight ? kThemeDisclosureRight : kThemeDisclosureLeft;
         bi.adornment = kThemeAdornmentNone;
-        HIRect hirect = qt_hirectForQRect(opt->rect);
+        HIRect hirect = qt_hirectForQRect(opt->rect.adjusted(DisclosureOffset,0,-DisclosureOffset,0));
         HIThemeDrawButton(&hirect, &bi, cg, kHIThemeOrientationNormal, 0);
         break; }
 
@@ -4353,6 +4355,15 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt,
     int controlSize = getControlSize(opt, widget);
 
     switch (sr) {
+    case SE_ItemViewItemText:
+        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+            int fw = proxy()->pixelMetric(PM_FocusFrameHMargin, opt, widget);
+            // We add the focusframeargin between icon and text in commonstyle
+            rect = QCommonStyle::subElementRect(sr, opt, widget);
+            if (vopt->features & QStyleOptionViewItemV2::HasDecoration)
+                rect.adjust(-fw, 0, 0, 0);
+        }
+        break;
     case SE_ToolBoxTabContents:
         rect = QCommonStyle::subElementRect(sr, opt, widget);
         break;
@@ -4370,9 +4381,9 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt,
     case SE_HeaderLabel:
         if (qstyleoption_cast<const QStyleOptionHeader *>(opt)) {
             rect = QWindowsStyle::subElementRect(sr, opt, widget);
-            if (widget && widget->height() <= qt_mac_aqua_get_metric(kThemeMetricListHeaderHeight)){
-                // We need to allow the text a bit more space when the header is as
-                // small as kThemeMetricListHeaderHeight, otherwise it gets clipped:
+            if (widget && widget->height() <= 22){
+                // We need to allow the text a bit more space when the header is
+                // small, otherwise it gets clipped:
                 rect.setY(0);
                 rect.setHeight(widget->height());
             }
@@ -4399,8 +4410,9 @@ QRect QMacStyle::subElementRect(SubElement sr, const QStyleOption *opt,
         HIRect outRect;
         HIThemeGetButtonShape(&inRect, &bdi, &shape);
         ptrHIShapeGetBounds(shape, &outRect);
-        rect = QRect(int(outRect.origin.x), int(outRect.origin.y),
-                  int(contentRect.origin.x - outRect.origin.x), int(outRect.size.height));
+        rect = QRect(int(outRect.origin.x + DisclosureOffset), int(outRect.origin.y),
+                  int(contentRect.origin.x - outRect.origin.x + DisclosureOffset),
+                  int(outRect.size.height));
         break;
     }
     case SE_TabWidgetLeftCorner:
@@ -5789,6 +5801,13 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
                 sz = sz.expandedTo(QSize(sz.width(), minimumSize));
         }
         break;
+    case CT_ItemViewItem:
+        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+            sz = QCommonStyle::sizeFromContents(ct, vopt, csz, widget);
+            sz.setHeight(sz.height() + 2);
+        }
+        break;
+
     default:
         sz = QWindowsStyle::sizeFromContents(ct, opt, csz, widget);
     }
-- 
cgit v0.12


From 83245ed872b6265d872a8ab0235c9dbd1f2daf4b Mon Sep 17 00:00:00 2001
From: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
Date: Thu, 20 May 2010 17:32:12 +0200
Subject: Removed a change from the 4.7.0 change log.

The change belongs in the 4.6.3 change log.
---
 dist/changes-4.7.0 | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index d6209f4..34d002c 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -164,12 +164,6 @@ QtNetwork
   * [QTBUG-2515] Do not make OpenSSL prompt for a password
   * [QTBUG-6504, QTBUG-8924, QTBUG-5645] Fix memleak
 
-QtOpenGL
---------
- - QGLWidget
-  * [QTBUG-7865] Fixed bug where GL widgets were not fully updated on
-    Windows Vista/7 with Aero disabled.
-
 QtScript
 --------
  - Updated src/3rdparty/javascriptcore to a more recent version
-- 
cgit v0.12


From be9d25dc7f06ce8d7a9bb7524bb9b11609c9ec90 Mon Sep 17 00:00:00 2001
From: David Boddie <dboddie@trolltech.com>
Date: Thu, 20 May 2010 18:46:39 +0200
Subject: qdoc: Propagate the language information into the XML as before.

Reviewed-by: Trust Me
---
 tools/qdoc3/htmlgenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index e352364..2774833 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1781,7 +1781,7 @@ void HtmlGenerator::generateHeader(const QString& title,
 {
     out() << QString("<?xml version=\"1.0\" encoding=\"%1\"?>\n").arg(outputEncoding);
     out() << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n";
-    out() << "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n";
+    out() << QString("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"%1\" lang=\"%1\">\n").arg(naturalLanguage);
     out() << "<head>\n";
     out() << "  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
     QString shortVersion;
-- 
cgit v0.12


From bb0048d2e8536f1db5144ee99d122e2b3b102e04 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 6 May 2010 21:54:07 +0200
Subject: simplify arcane conditional, once again

Reviewed-by: joerg
---
 qmake/generators/metamakefile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index 9c64544..ad8750b 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -476,7 +476,7 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO)
             mkfile = new NmakeMakefileGenerator;
     } else if(gen == "MSBUILD") {
         // Visual Studio >= v11.0
-        if(proj->first("TEMPLATE").indexOf(QRegExp("^vc.*")) != -1 || proj->first("TEMPLATE").indexOf(QRegExp("^ce.*")) != -1)
+        if (proj->first("TEMPLATE").startsWith("vc"))
             mkfile = new VcxprojGenerator;
         else
             mkfile = new NmakeMakefileGenerator;
-- 
cgit v0.12


From 3201b70f0364911382cf3657141be95e34f1d61c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 6 May 2010 15:15:13 +0200
Subject: unify QMAKE_QMAKE path separator fixing

the value of the variable in Option is only ever accessed via the
project variable, so there is no point in early fixing.

as it happens, this fixes mingw+sh generating makefiles with the wrong
separator, as the fixing is delayed to a point where QMAKE_DIR_SEP was
read back into Option.

Reviewed-by: joerg
---
 qmake/option.cpp  |  1 -
 qmake/project.cpp | 13 ++++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/qmake/option.cpp b/qmake/option.cpp
index 13e855c..d63158c 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -558,7 +558,6 @@ void Option::applyHostMode()
        Option::dir_sep = "/";
        Option::obj_ext = ".o";
    }
-   Option::qmake_abslocation = Option::fixPathToTargetOS(Option::qmake_abslocation);
 }
 
 bool Option::postProcessProject(QMakeProject *project)
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 998d173..c3595fe 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -3099,13 +3099,12 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList
             place[var] = QStringList(Option::obj_ext);
         }
     } else if (var == QLatin1String("QMAKE_QMAKE")) {
-        if (place[var].isEmpty()) {
-            if (!Option::qmake_abslocation.isNull())
-                place[var] = QStringList(Option::qmake_abslocation);
-            else
-                place[var] = QStringList(Option::fixPathToTargetOS(
-                        QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmake", false));
-        }
+        if (place[var].isEmpty())
+            place[var] = QStringList(Option::fixPathToTargetOS(
+                !Option::qmake_abslocation.isEmpty()
+                    ? Option::qmake_abslocation
+                    : QLibraryInfo::location(QLibraryInfo::BinariesPath) + "/qmake",
+                false));
     } else if (var == QLatin1String("EPOCROOT")) {
         if (place[var].isEmpty())
             place[var] = QStringList(epocRoot());
-- 
cgit v0.12


From a8350d70e75462770e6ccb7a29c1c383c103687a Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 20 May 2010 11:52:59 +0200
Subject: use qtPrepareTool for qdoc

Reviewed-by: joerg
---
 tools/qdoc3/qdoc3.pro | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index e394799..81ff93a 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -115,20 +115,7 @@ SOURCES += apigenerator.cpp \
 
 ### Documentation for qdoc3 ###
 
-win32:!win32-g++ {
-    unixstyle = false
-} else :win32-g++:isEmpty(QMAKE_SH) {
-    unixstyle = false
-} else {
-    unixstyle = true
-}
-
-$$unixstyle {
-    QDOC = cd $$PWD/doc && $$[QT_INSTALL_BINS]/qdoc3
-} else {
-    QDOC = cd $$PWD/doc && $$[QT_INSTALL_BINS]/qdoc3.exe
-    QDOC = $$replace(QDOC, "/", "\\")
-}
+qtPrepareTool(QDOC, qdoc3)
 
 docs.commands = $$QDOC qdoc-manual.qdocconf
 
-- 
cgit v0.12


From 79893e1f90b04317fde14069684534ba29d74f5b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 14 May 2010 20:04:45 +0200
Subject: deprecate undocumented -E option

Reviewed-by: joerg
---
 qmake/option.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/qmake/option.cpp b/qmake/option.cpp
index d63158c..8db3797 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -304,6 +304,7 @@ Option::parseCommandLine(int argc, char **argv, int skip)
                     } else if(opt == "nodependheuristics") {
                         Option::mkfile::do_dep_heuristics = false;
                     } else if(opt == "E") {
+                        fprintf(stderr, "-E is deprecated. Use -d instead.\n");
                         Option::mkfile::do_preprocess = true;
                     } else if(opt == "cache") {
                         Option::mkfile::cachefile = argv[++x];
-- 
cgit v0.12


From f8efbfb774679aa81648974e049605981532ec17 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 14 May 2010 20:06:30 +0200
Subject: close scope while inside assignment only if the last char is a
 closing brace

the code assumed it anyway and would make a mess if it was wrong

Reviewed-by: joerg
---
 qmake/project.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/project.cpp b/qmake/project.cpp
index c3595fe..214b013 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1046,7 +1046,7 @@ QMakeProject::parse(const QString &t, QMap<QString, QStringList> &place, int num
     SKIP_WS(d, d_off, s.length());
     QString vals = s.mid(d_off); // vals now contains the space separated list of values
     int rbraces = vals.count('}'), lbraces = vals.count('{');
-    if(scope_blocks.count() > 1 && rbraces - lbraces == 1) {
+    if(scope_blocks.count() > 1 && rbraces - lbraces == 1 && vals.endsWith('}')) {
         debug_msg(1, "Project Parser: %s:%d : Leaving block %d", parser.file.toLatin1().constData(),
                   parser.line_no, scope_blocks.count());
         ScopeBlock sb = scope_blocks.pop();
-- 
cgit v0.12


From 044eb6966ade14a7367bb687cfac976007ad820c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 14 May 2010 20:07:05 +0200
Subject: clarify wording of warning message

Reviewed-by: joerg
---
 qmake/project.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 214b013..2be68be 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1073,7 +1073,7 @@ QMakeProject::parse(const QString &t, QMap<QString, QStringList> &place, int num
     }
 
     if(vals.contains('=') && numLines > 1)
-        warn_msg(WarnParser, "Detected possible line continuation: {%s} %s:%d",
+        warn_msg(WarnParser, "Possible accidental line continuation: {%s} at %s:%d",
                  var.toLatin1().constData(), parser.file.toLatin1().constData(), parser.line_no);
 
     QStringList &varlist = place[var]; // varlist is the list in the symbol table
-- 
cgit v0.12


From d56e75982111a2c1caf0271eafd4d41ba9f9aefd Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Tue, 18 May 2010 12:21:06 +0200
Subject: fix irix build

Task-number: QTBUG-10611
Reviewed-by: joerg
---
 src/corelib/corelib.pro | 1 +
 src/gui/gui.pro         | 1 +
 src/opengl/opengl.pro   | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 83fa044..e39d326 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -3,6 +3,7 @@ QPRO_PWD   = $$PWD
 QT         =
 DEFINES   += QT_BUILD_CORE_LIB QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000
+irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
 
 include(../qbase.pri)
 include(animation/animation.pri)
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index a6370b2..7f1cb78 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -3,6 +3,7 @@ QPRO_PWD   = $$PWD
 QT = core
 DEFINES   += QT_BUILD_GUI_LIB QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x65000000
+irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
 
 !win32:!embedded:!mac:!symbian:CONFIG      += x11
 
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 15795d2..d6011cf 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -5,6 +5,7 @@ DEFINES   += QT_BUILD_OPENGL_LIB
 DEFINES   += QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000
 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
+irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused
 
 unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
 
-- 
cgit v0.12


From af2df9e88705eeda2df5cdd46c5f7ec195facb8a Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Fri, 21 May 2010 08:34:00 +1000
Subject: Fix formating of license header.

---
 doc/src/declarative/qml-intro.qdoc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/doc/src/declarative/qml-intro.qdoc b/doc/src/declarative/qml-intro.qdoc
index 457efa8..64a4949 100644
--- a/doc/src/declarative/qml-intro.qdoc
+++ b/doc/src/declarative/qml-intro.qdoc
@@ -1,5 +1,4 @@
-/**************************************************************************
-**
+/****************************************************************************
 **
 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
@@ -38,8 +37,7 @@
 **
 ** $QT_END_LICENSE$
 **
-***************************************************************************
-*/
+****************************************************************************/
 
 
 
-- 
cgit v0.12


From 4ada24963ccd8a5a1d57a90739b627f6684693e9 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@nokia.com>
Date: Fri, 21 May 2010 14:20:55 +1000
Subject: add bytes and activeTime to corelwan.

Task-number: QTBUG-10875
---
 src/plugins/bearer/corewlan/qcorewlanengine.h  |   6 ++
 src/plugins/bearer/corewlan/qcorewlanengine.mm | 104 +++++++++++++++++++++++--
 2 files changed, 102 insertions(+), 8 deletions(-)

diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.h b/src/plugins/bearer/corewlan/qcorewlanengine.h
index 3c24c54..4d90648 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.h
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.h
@@ -78,6 +78,10 @@ public:
 
     QNetworkSession::State sessionStateForId(const QString &id);
 
+    quint64 bytesWritten(const QString &id);
+    quint64 bytesReceived(const QString &id);
+    quint64 startTime(const QString &id);
+
     QNetworkConfigurationManager::Capabilities capabilities() const;
 
     QNetworkSessionPrivate *createSessionBackend();
@@ -100,6 +104,8 @@ private:
     bool scanning;
     QScanThread *scanThread;
 
+    quint64 getBytes(const QString &interfaceName,bool b);
+
 protected:
     void startNetworkChangeLoop();
 
diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 3206833..90d093a 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -67,6 +67,9 @@
 #include <private/qt_cocoa_helpers_mac_p.h>
 #include "private/qcore_mac_p.h"
 
+#include <net/if.h>
+#include <ifaddrs.h>
+
 @interface QNSListener : NSObject
 {
     NSNotificationCenter *center;
@@ -157,7 +160,7 @@ void QScanThread::quit()
 
 void QScanThread::run()
 {
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    QMacCocoaAutoReleasePool pool;
     QStringList found;
     mutex.lock();
     CWInterface *currentInterface = [CWInterface interfaceWithName:qt_mac_QStringToNSString(interfaceName)];
@@ -167,6 +170,7 @@ void QScanThread::run()
         NSError *err = nil;
         NSDictionary *parametersDict =  [NSDictionary dictionaryWithObjectsAndKeys:
                                    [NSNumber numberWithBool:YES], kCWScanKeyMerge,
+                                   [NSNumber numberWithInt:kCWScanTypeFast], kCWScanKeyScanType,
                                    [NSNumber numberWithInteger:100], kCWScanKeyRestTime, nil];
 
         NSArray* apArray = [currentInterface scanForNetworksWithParameters:parametersDict error:&err];
@@ -204,11 +208,9 @@ void QScanThread::run()
 
                 found.append(foundNetwork(id, networkSsid, state, interfaceName, purpose));
 
-            } //end row
-//            [parametersDict release];
-
-        } //end error
-    } // endwifi power
+            }
+        }
+    }
     // add known configurations that are not around.
     QMapIterator<QString, QMap<QString,QString> > i(userProfiles);
     while (i.hasNext()) {
@@ -248,7 +250,6 @@ void QScanThread::run()
         }
     }
     emit networksChanged();
-    [pool release];
 }
 
 QStringList QScanThread::foundNetwork(const QString &id, const QString &name, const QNetworkConfiguration::StateFlags state, const QString &interfaceName, const QNetworkConfiguration::Purpose purpose)
@@ -426,6 +427,7 @@ QCoreWlanEngine::~QCoreWlanEngine()
 void QCoreWlanEngine::initialize()
 {
     QMutexLocker locker(&mutex);
+    QMacCocoaAutoReleasePool pool;
 
     if([[CWInterface supportedInterfaces] count] > 0 && !listener) {
         listener = [[QNSListener alloc] init];
@@ -659,7 +661,6 @@ bool QCoreWlanEngine::isWifiReady(const QString &wifiDeviceName)
 QNetworkSession::State QCoreWlanEngine::sessionStateForId(const QString &id)
 {
     QMutexLocker locker(&mutex);
-
     QNetworkConfigurationPrivatePointer ptr = accessPointConfigurations.value(id);
 
     if (!ptr)
@@ -823,5 +824,92 @@ void QCoreWlanEngine::networksChanged()
 
 }
 
+quint64 QCoreWlanEngine::bytesWritten(const QString &id)
+{
+    QMutexLocker locker(&mutex);
+    const QString interfaceStr = getInterfaceFromId(id);
+    return getBytes(interfaceStr,false);
+    return Q_UINT64_C(0);
+}
+
+quint64 QCoreWlanEngine::bytesReceived(const QString &id)
+{
+    QMutexLocker locker(&mutex);
+    const QString interfaceStr = getInterfaceFromId(id);
+    return getBytes(interfaceStr,true);
+    return Q_UINT64_C(0);
+}
+
+quint64 QCoreWlanEngine::startTime(const QString &id)
+{
+    QMutexLocker locker(&mutex);
+    QMacCocoaAutoReleasePool pool;
+    quint64 timestamp = 0;
+
+    NSString *filePath = @"/Library/Preferences/SystemConfiguration/com.apple.airport.preferences.plist";
+    NSDictionary* plistDict = [[[NSDictionary alloc] initWithContentsOfFile:filePath] autorelease];
+    NSString *input = @"KnownNetworks";
+    NSString *timeStampStr = @"_timeStamp";
+
+    NSString *ssidStr = @"SSID_STR";
+
+    for (id key in plistDict) {
+        if ([input isEqualToString:key]) {
+
+            NSDictionary *knownNetworksDict = [plistDict objectForKey:key];
+            for (id networkKey in knownNetworksDict) {
+                bool isFound = false;
+                NSDictionary *itemDict = [knownNetworksDict objectForKey:networkKey];
+                NSInteger dictSize = [itemDict count];
+                id objects[dictSize];
+                id keys[dictSize];
+
+                [itemDict getObjects:objects andKeys:keys];
+                bool ok = false;
+                for(int i = 0; i < dictSize; i++) {
+                    if([ssidStr isEqualToString:keys[i]]) {
+                        const QString ident = QString::number(qHash(QLatin1String("corewlan:") + qt_mac_NSStringToQString(objects[i])));
+                        if(ident == id) {
+                            ok = true;
+                        }
+                    }
+                    if(ok && [timeStampStr isEqualToString:keys[i]]) {
+                        timestamp = (quint64)[objects[i] timeIntervalSince1970];
+                        isFound = true;
+                        break;
+                    }
+                }
+                if(isFound)
+                    break;
+            }
+        }
+    }
+    return timestamp;
+}
+
+quint64 QCoreWlanEngine::getBytes(const QString &interfaceName, bool b)
+{
+    struct ifaddrs *ifAddressList, *ifAddress;
+    struct if_data *if_data;
+
+    quint64 bytes = 0;
+    ifAddressList = nil;
+    if(getifaddrs(&ifAddressList) == 0) {
+        for(ifAddress = ifAddressList; ifAddress; ifAddress = ifAddress->ifa_next) {
+            if(interfaceName == ifAddress->ifa_name) {
+                if_data = (struct if_data*)ifAddress->ifa_data;
+                if(b) {
+                    bytes = if_data->ifi_ibytes;
+                    break;
+                } else {
+                    bytes = if_data->ifi_obytes;
+                    break;
+                }
+            }
+        }
+        freeifaddrs(ifAddressList);
+    }
+    return bytes;
+}
 
 QT_END_NAMESPACE
-- 
cgit v0.12


From 7fc31eb7c73968c4bafda3dba143c9b1e369ab69 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@nokia.com>
Date: Fri, 21 May 2010 14:24:51 +1000
Subject: remove dead code that will never get called.

---
 src/plugins/bearer/corewlan/qcorewlanengine.mm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/plugins/bearer/corewlan/qcorewlanengine.mm b/src/plugins/bearer/corewlan/qcorewlanengine.mm
index 90d093a..a9cb65b 100644
--- a/src/plugins/bearer/corewlan/qcorewlanengine.mm
+++ b/src/plugins/bearer/corewlan/qcorewlanengine.mm
@@ -829,7 +829,6 @@ quint64 QCoreWlanEngine::bytesWritten(const QString &id)
     QMutexLocker locker(&mutex);
     const QString interfaceStr = getInterfaceFromId(id);
     return getBytes(interfaceStr,false);
-    return Q_UINT64_C(0);
 }
 
 quint64 QCoreWlanEngine::bytesReceived(const QString &id)
@@ -837,7 +836,6 @@ quint64 QCoreWlanEngine::bytesReceived(const QString &id)
     QMutexLocker locker(&mutex);
     const QString interfaceStr = getInterfaceFromId(id);
     return getBytes(interfaceStr,true);
-    return Q_UINT64_C(0);
 }
 
 quint64 QCoreWlanEngine::startTime(const QString &id)
-- 
cgit v0.12


From 1f1ff85bb9841d1b040b25af9a5c99a5c1f87e58 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 21 May 2010 17:54:17 +1000
Subject: Add missing license header.

Reviewed-by: Trust Me
---
 src/gui/painting/qgraphicssystem_runtime.cpp | 41 ++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index dfa9bd3..ceb16ed 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -1,3 +1,44 @@
+/****************************************************************************
+**
+** 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 QtGui module 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 <private/qgraphicssystem_runtime_p.h>
 #include <private/qgraphicssystem_raster_p.h>
 #include <private/qgraphicssystemfactory_p.h>
-- 
cgit v0.12


From d53b25d397e54551aff15b79e3807e7ce4612886 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Fri, 21 May 2010 09:55:14 +0200
Subject: Doc: Changes to the HTMLGenerator, style and js Replacing tables with
 lists in the HTML generator Adding img to search box Moving JS from template
 to script files

---
 doc/src/template/scripts/functions.js         | 17 ++++++++---------
 doc/src/template/style/style.css              | 17 +++++++++++++----
 tools/qdoc3/htmlgenerator.cpp                 | 20 ++++++++++----------
 tools/qdoc3/test/assistant.qdocconf           |  1 +
 tools/qdoc3/test/designer.qdocconf            |  1 +
 tools/qdoc3/test/linguist.qdocconf            |  1 +
 tools/qdoc3/test/qdeclarative.qdocconf        |  1 +
 tools/qdoc3/test/qmake.qdocconf               |  1 +
 tools/qdoc3/test/qt-build-docs.qdocconf       |  1 +
 tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf |  1 +
 tools/qdoc3/test/qt-defines.qdocconf          |  1 +
 tools/qdoc3/test/qt-html-templates.qdocconf   |  1 -
 tools/qdoc3/test/qt.qdocconf                  |  1 +
 tools/qdoc3/test/qt_zh_CN.qdocconf            |  1 +
 14 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index afd1ec3..7ae2421 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -54,8 +54,6 @@ var exampleCount = 0;
 var qturl = ""; // change from "http://doc.qt.nokia.com/4.6/" to 0 so we can have relative links
 
 function processNokiaData(response){
-$('.sidebar .search form input').addClass('loading');
-	// debug $('.content').prepend('<li>handling search results</li>'); // debuging
 	var propertyTags = response.getElementsByTagName('page');
 	
  	for (var i=0; i< propertyTags.length; i++) {
@@ -64,7 +62,6 @@ $('.sidebar .search form input').addClass('loading');
 		
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage'){
 			lookupCount++;
-			//$('.live001').css('display','block');
 
 			
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -79,7 +76,6 @@ $('.sidebar .search form input').addClass('loading');
 	 
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article'){
 			articleCount++;
-	 		//$('.live002').css('display','block');
 
 				 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -93,7 +89,6 @@ $('.sidebar .search form input').addClass('loading');
 		}
 		if(propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example'){
 			exampleCount++;
-	 		//$('.live003').css('display','block');
 
 
 			for (var j=0; j< propertyTags[i].getElementsByTagName('pageWords').length; j++){
@@ -105,10 +100,11 @@ $('.sidebar .search form input').addClass('loading');
 
 	   		}
 		} 
+		if(i==propertyTags.length){$('#pageType').removeClass('loading');}
+
 	}	
 	 
-	if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');
-}
+	if(lookupCount == 0){$('#ul001').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul001 li').css('display','block');$('.sidebar .search form input').removeClass('loading');}
     if(articleCount == 0){$('#ul002').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul002 li').css('display','block');}
 	if(exampleCount == 0){$('#ul003').prepend('<li class=\"liveResult noMatch\">Found no result</li>');$('#ul003 li').css('display','block');}
 	// reset count variables;
@@ -117,7 +113,6 @@ $('.sidebar .search form input').addClass('loading');
      exampleCount = 0;
 	
 }
-
 //build regular expression object to find empty string or any number of blank
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
@@ -147,7 +142,7 @@ else
 	$(document).ready(function () {
 	var pageUrl = window.location.href;
 	//alert(pageUrl);
-	$('#pageUrl').attr('foo',pageUrl);
+	//$('#pageUrl').attr('foo',pageUrl);
 	var pageTitle = $('title').html();
 		$('#feedform').append('<input id="page" name="pageVal" value="'+pageTitle+'" style="display:none;">');
           var currentString = $('#pageType').val() ;
@@ -159,6 +154,7 @@ else
         $('#pageType').keyup(function () {
           var searchString = $('#pageType').val() ;
           if ((searchString == null) || (searchString.length < 3)) {
+				$('#pageType').removeClass('loading');
 				 $('.liveResult').remove(); // replaces removeResults();
       	   		CheckEmptyAndLoadList();
 				$('.report').remove();
@@ -167,6 +163,7 @@ else
 		   }
             if (this.timer) clearTimeout(this.timer);
             this.timer = setTimeout(function () {
+				$('#pageType').addClass('loading');
 				// debug$('.content').prepend('<li>new search started </li>');// debug
 				// debug$('.content').prepend('<p class=\"report\">Search string ' +searchString +'</p>'); // debug
 
@@ -179,6 +176,8 @@ else
                 success: function (response, textStatus) {
 
 				$('.liveResult').remove(); // replaces removeResults();
+								$('#pageType').removeClass('loading');
+
                 processNokiaData(response);
 
  }     
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 3f35642..82acd3e 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -998,17 +998,17 @@
 	
 	.rightAlign
 	{
-	text-align:right;	
+	/*text-align:right;	*/
 	}
 
 	
 	.leftAlign
 	{
-	text-align:left;	
+	/*text-align:left;	*/
 	}
 
 	.topAlign{
-	vertical-align:top
+	/*vertical-align:top*/
 	}
 	
 	.functionIndex a{
@@ -1140,7 +1140,16 @@
 
     /* end of screen media */
 
-	
+.flowList{
+display:inline-block;
+width:260px;
+}	
+.flowList dl{
+padding:0px;
+}
+.wrap .content .flowList p{
+padding:0px;
+}
 }
 /* end of screen media */
 
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 6394b6e..0e8d021 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2479,19 +2479,19 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         out() << "</b></p>\n";
     }
 
-    out() << "<table class=\"generic\">\n";
+    out() << "<div class=\"flowListDiv\">\n";
     for (k = 0; k < numRows; k++) {
         if (++numTableRows % 2 == 1)
-            out() << "<tr class=\"odd topAlign\">";
+            out() << "<dl class=\"flowList odd\"";
         else
-            out() << "<tr class=\"even topAlign\">";
+            out() << "<dl class=\"flowList even\">";
         //break;
 
 //	out() << "<tr>\n";
         for (i = 0; i < NumColumns; i++) {
             if (currentOffset[i] >= firstOffset[i + 1]) {
                 // this column is finished
-                out() << "<td>\n</td>\n"; // check why?
+                out() << "<dd>\n</dd>\n"; // check why?
             }
             else {
                 while ((currentParagraphNo[i] < NumParagraphs) &&
@@ -2506,7 +2506,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                     currentParagraphNo[i] = NumParagraphs - 1;
                 }
 #endif
-                out() << "<th  class=\"rightAlign alphaChar\"><p>";
+                out() << "<dt  class=\"alphaChar\"><p>";
                 if (currentOffsetInParagraph[i] == 0) {
                     // start a new paragraph
                     if (includeAlphabet) {
@@ -2517,9 +2517,9 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                           << paragraphName[currentParagraphNo[i]]
                           << "</b>";
                 }
-                out() << "</p></th>\n";
+                out() << "</p></dt>\n";
 
-                out() << "<td><p>";
+                out() << "<dd><p>";
                 if ((currentParagraphNo[i] < NumParagraphs) &&
                     !paragraphName[currentParagraphNo[i]].isEmpty()) {
                     NodeMap::Iterator it;
@@ -2545,15 +2545,15 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                         out() << ")";
                     }
                 }
-                out() << "</p></td>\n";
+                out() << "</p></dd>\n";
 
                 currentOffset[i]++;
                 currentOffsetInParagraph[i]++;
             }
         }
-        out() << "</tr>\n";
+        out() << "</dl>\n";
     }
-    out() << "</table>\n";
+    out() << "</div>\n";
 }
 
 void HtmlGenerator::generateFunctionIndex(const Node *relative,
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 3711ec4..167bb19 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -30,6 +30,7 @@ qhp.Assistant.extraFiles          = 									images/bg_l.png \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
+									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 39da68b..48e3ea1 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -30,6 +30,7 @@ qhp.Designer.extraFiles          = images/bg_l.png \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
+									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index dba4fb5..8974bd7 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -30,6 +30,7 @@ qhp.Linguist.extraFiles          = images/bg_l.png \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
+									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index f744879..0f2e381 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -41,6 +41,7 @@ qhp.Qml.extraFiles            = images/bg_l.png \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
+									images/spinner.png \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index b7f4115..ea58059 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -30,6 +30,7 @@ qhp.qmake.extraFiles          = images/bg_l.png \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
+									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index d3c855f..bd363a6 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -36,6 +36,7 @@ qhp.Qt.extraFiles          = index.html \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
+									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
diff --git a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
index e9bc00c..caf5f73 100644
--- a/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
@@ -44,6 +44,7 @@ qhp.Qt.extraFiles          = index.html \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
+									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index f3291df..3e71d07 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -34,6 +34,7 @@ extraimages.HTML        = qt-logo \
 			  page.png \
 			  page_bg.png \
 			  sprites-combined.png \
+			  spinner.gif \
                           taskmenuextension-example.png \
                           coloreditorfactoryimage.png \
                           dynamiclayouts-example.png \
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 50bf0c3..09f0c96 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -130,7 +130,6 @@ HTML.footer             = "        <!-- /div -->\n" \
 			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
 			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
 			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \
-			  "      <input id=\"pageUrl\" name=\"pageUrl\" value=\"window.location.href;\" style=\"display:none;\">\n" \
 			  "      <input id=\"pageVal\" name=\"pageVal\" value=\"\$(\'title\').html();\" style=\"display:none;\">\n" \
 			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
 			  "    </form>\n" \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 83a35a9..267d536 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -40,6 +40,7 @@ qhp.Qt.extraFiles          = index.html \
 			     images/page.png \
 			     images/page_bg.png \
 			     images/sprites-combined.png \
+			     images/spinner.gif \
 			     images/stylesheet-coffee-plastique.png \
 			     images/taskmenuextension-example.png \
 			     images/coloreditorfactoryimage.png \
diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf
index 9275b5c..db02478 100644
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt_zh_CN.qdocconf
@@ -46,6 +46,7 @@ qhp.Qt.extraFiles          = index.html \
 									images/page.png \
 									images/page_bg.png \
 									images/sprites-combined.png \
+									images/spinner.gif \
                              	    images/stylesheet-coffee-plastique.png \
                              	    images/taskmenuextension-example.png \
                              	   images/coloreditorfactoryimage.png \
-- 
cgit v0.12


From 24b811e53b30546279346ab7b16799be119ab8c4 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Thu, 20 May 2010 11:25:47 +0200
Subject: Enable QTouchEvent for S60 5.0

Symbian OS doesn't support advanced pointer events before Symbian^3
Advanced pointer events are required for multitouch, and are used to
generate QTouchEvents.
This change enables sending of a single touch point QTouchEvent on
touchscreen phones based on earlier Symbian OS versions.
i.e. S60 5th edition

On devices without advanced pointers, or where the hardware does not
support pressure detection, the pressure is set to 1.0 in the touch
event. This is consistent with the Mac port.

Task-number: QTBUG-5668
Reviewed-by: Bradley T. Hughes
---
 src/gui/kernel/qapplication_p.h     |  3 ++-
 src/gui/kernel/qapplication_s60.cpp | 53 +++++++++++++++++++++++++++++--------
 src/gui/kernel/qt_s60_p.h           |  1 +
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 01abe54..e30b6be 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -581,7 +581,8 @@ public:
     void _q_readRX71MultiTouchEvents();
 #endif
 
-#if defined(Q_WS_S60)
+#if defined(Q_OS_SYMBIAN)
+    int pressureSupported;
     int maxTouchPressure;
     QList<QTouchEvent::TouchPoint> appAllTouchPoints;
 #endif
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 803241e..7e270aa 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -416,25 +416,44 @@ void QSymbianControl::HandleLongTapEventL( const TPoint& aPenEventLocation, cons
 void QSymbianControl::translateAdvancedPointerEvent(const TAdvancedPointerEvent *event)
 {
     QApplicationPrivate *d = QApplicationPrivate::instance();
+    QPointF screenPos = qwidget->mapToGlobal(QPoint(event->iPosition.iX, event->iPosition.iY));
+    qreal pressure;
+    if(d->pressureSupported
+        && event->Pressure() > 0) //workaround for misconfigured HAL
+        pressure = event->Pressure() / qreal(d->maxTouchPressure);
+    else
+        pressure = qreal(1.0);
+    processTouchEvent(event->PointerNumber(), event->iType, screenPos, pressure);
+}
+#endif
 
+void QSymbianControl::processTouchEvent(int pointerNumber, TPointerEvent::TType type, QPointF screenPos, qreal pressure)
+{
     QRect screenGeometry = qApp->desktop()->screenGeometry(qwidget);
 
-    while (d->appAllTouchPoints.count() <= event->PointerNumber())
-        d->appAllTouchPoints.append(QTouchEvent::TouchPoint(d->appAllTouchPoints.count()));
+    QApplicationPrivate *d = QApplicationPrivate::instance();
+
+    QList<QTouchEvent::TouchPoint> points = d->appAllTouchPoints;
+    while (points.count() <= pointerNumber)
+        points.append(QTouchEvent::TouchPoint(points.count()));
 
     Qt::TouchPointStates allStates = 0;
-    for (int i = 0; i < d->appAllTouchPoints.count(); ++i) {
-        QTouchEvent::TouchPoint &touchPoint = d->appAllTouchPoints[i];
+    for (int i = 0; i < points.count(); ++i) {
+        QTouchEvent::TouchPoint &touchPoint = points[i];
 
-        if (touchPoint.id() == event->PointerNumber()) {
+        if (touchPoint.id() == pointerNumber) {
             Qt::TouchPointStates state;
-            switch (event->iType) {
+            switch (type) {
             case TPointerEvent::EButton1Down:
+#ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
             case TPointerEvent::EEnterHighPressure:
+#endif
                 state = Qt::TouchPointPressed;
                 break;
             case TPointerEvent::EButton1Up:
+#ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
             case TPointerEvent::EExitCloseProximity:
+#endif
                 state = Qt::TouchPointReleased;
                 break;
             case TPointerEvent::EDrag:
@@ -445,16 +464,15 @@ void QSymbianControl::translateAdvancedPointerEvent(const TAdvancedPointerEvent
                 state = Qt::TouchPointStationary;
                 break;
             }
-            if (event->PointerNumber() == 0)
+            if (pointerNumber == 0)
                 state |= Qt::TouchPointPrimary;
             touchPoint.setState(state);
 
-            QPointF screenPos = qwidget->mapToGlobal(QPoint(event->iPosition.iX, event->iPosition.iY));
             touchPoint.setScreenPos(screenPos);
             touchPoint.setNormalizedPos(QPointF(screenPos.x() / screenGeometry.width(),
                                                 screenPos.y() / screenGeometry.height()));
 
-            touchPoint.setPressure(event->Pressure() / qreal(d->maxTouchPressure));
+            touchPoint.setPressure(pressure);
         } else if (touchPoint.state() != Qt::TouchPointReleased) {
             // all other active touch points should be marked as stationary
             touchPoint.setState(Qt::TouchPointStationary);
@@ -466,13 +484,14 @@ void QSymbianControl::translateAdvancedPointerEvent(const TAdvancedPointerEvent
     if ((allStates & Qt::TouchPointStateMask) == Qt::TouchPointReleased) {
         // all touch points released
         d->appAllTouchPoints.clear();
+    } else {
+        d->appAllTouchPoints = points;
     }
 
     QApplicationPrivate::translateRawTouchEvent(qwidget,
                                                 QTouchEvent::TouchScreen,
-                                                d->appAllTouchPoints);
+                                                points);
 }
-#endif
 
 void QSymbianControl::HandlePointerEventL(const TPointerEvent& pEvent)
 {
@@ -546,6 +565,13 @@ void QSymbianControl::HandlePointerEvent(const TPointerEvent& pEvent)
         qt_symbian_move_cursor_sprite();
 #endif
 
+//Generate single touch event for S60 5.0 (has touchscreen, does not have advanced pointers)
+#ifndef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
+    if (S60->hasTouchscreen) {
+        processTouchEvent(0, pEvent.iType, QPointF(globalPos), 1.0);
+    }
+#endif
+
     sendMouseEvent(receiver, type, globalPos, button, modifiers);
 }
 
@@ -2047,8 +2073,13 @@ TUint QApplicationPrivate::resolveS60ScanCode(TInt scanCode, TUint keysym)
 void QApplicationPrivate::initializeMultitouch_sys()
 {
 #ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
+    if (HAL::Get(HALData::EPointer3DPressureSupported, pressureSupported) != KErrNone)
+        pressureSupported = 0;
     if (HAL::Get(HALData::EPointer3DMaxPressure, maxTouchPressure) != KErrNone)
         maxTouchPressure = KMaxTInt;
+#else
+    pressureSupported = 0;
+    maxTouchPressure = KMaxTInt;
 #endif
 }
 
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 232e9b3..fe3fa57 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -217,6 +217,7 @@ private:
             const QPoint &globalPos,
             Qt::MouseButton button,
             Qt::KeyboardModifiers modifiers);
+    void processTouchEvent(int pointerNumber, TPointerEvent::TType type, QPointF screenPos, qreal pressure);
     void HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& aPenEventScreenLocation );
 #ifdef QT_SYMBIAN_SUPPORTS_ADVANCED_POINTER
     void translateAdvancedPointerEvent(const TAdvancedPointerEvent *event);
-- 
cgit v0.12


From 9ad82755f62b7fb5e303bf5f8ee2bb8e4afb7f8d Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Fri, 21 May 2010 10:34:42 +0200
Subject: qdoc: Changed number of columns to 1. Oila!

---
 tools/qdoc3/htmlgenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 0e8d021..1872d87 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2332,7 +2332,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                                         QString commonPrefix)
 {
     const int NumParagraphs = 37; // '0' to '9', 'A' to 'Z', '_'
-    const int NumColumns = 3; // number of columns in the result
+    const int NumColumns = 1; // number of columns in the result
 
     if (classMap.isEmpty())
         return;
-- 
cgit v0.12


From 04ad0950378fb4255064c10d5a4d64c1074035ed Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Fri, 21 May 2010 10:53:55 +0200
Subject: qdoc: Fixed html error, but the problem is still there.

---
 tools/qdoc3/htmlgenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 1872d87..cf8ea7c 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2482,7 +2482,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
     out() << "<div class=\"flowListDiv\">\n";
     for (k = 0; k < numRows; k++) {
         if (++numTableRows % 2 == 1)
-            out() << "<dl class=\"flowList odd\"";
+            out() << "<dl class=\"flowList odd\">";
         else
             out() << "<dl class=\"flowList even\">";
         //break;
-- 
cgit v0.12


From 6b52b41c71300ea3424385986391485058fc1fa5 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Fri, 21 May 2010 13:29:58 +0200
Subject: Doc: design changes Fixing menus and js

---
 doc/src/template/scripts/functions.js       |  9 +++++++--
 doc/src/template/style/style.css            | 13 +++++++++----
 tools/qdoc3/test/qt-html-templates.qdocconf |  7 -------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 7ae2421..58a0248 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -117,7 +117,14 @@ function processNokiaData(response){
 var blankRE=/^\s*$/;
 function CheckEmptyAndLoadList()
 {
+	var pageUrl = window.location.href;
+	var pageVal = $('title').html();
+	$('#feedUrl').remove();
+	$('#pageVal').remove();
+	$('#feedform').append('<input id="feedUrl" name="feedUrl" value="'+pageUrl+'" style="display:none;">');
+	$('#feedform').append('<input id="pageVal" name="pageVal" value="'+pageVal+'" style="display:none;">');
 	$('.liveResult').remove();
+    $('.defaultLink').css('display','block');
 	var value = document.getElementById('pageType').value; 
 	if((blankRE.test(value)) || (value.length < 3))
 	{
@@ -140,11 +147,9 @@ else
 	*/
 // Loads on doc ready
 	$(document).ready(function () {
-	var pageUrl = window.location.href;
 	//alert(pageUrl);
 	//$('#pageUrl').attr('foo',pageUrl);
 	var pageTitle = $('title').html();
-		$('#feedform').append('<input id="page" name="pageVal" value="'+pageTitle+'" style="display:none;">');
           var currentString = $('#pageType').val() ;
 		  if(currentString.length < 1){
 			$('.defaultLink').css('display','block');
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 82acd3e..ebc1607 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -844,7 +844,7 @@
         background-color: #e6e7e8;
         z-index: 4;
     }
-    #feedcloseX a
+    #feedcloseX 
     {
         display: inline;
         padding: 5px 5px 0 0;
@@ -998,17 +998,17 @@
 	
 	.rightAlign
 	{
-	/*text-align:right;	*/
+	text-align:right;	
 	}
 
 	
 	.leftAlign
 	{
-	/*text-align:left;	*/
+	text-align:left;	
 	}
 
 	.topAlign{
-	/*vertical-align:top*/
+	vertical-align:top
 	}
 	
 	.functionIndex a{
@@ -1150,6 +1150,11 @@ padding:0px;
 .wrap .content .flowList p{
 padding:0px;
 }
+pre.highlightedCode {
+	display: block;
+	overflow:hidden;
+}
+
 }
 /* end of screen media */
 
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 09f0c96..b72a1eb 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -54,8 +54,6 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
 			  "            </ul> \n" \
 			  "          </div>\n" \
-			  "          <div  id=\"live001\" class=\"live\">\n" \
-			  "          </div>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
 			  "          <h2><span></span>\n" \
@@ -68,8 +66,6 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
 			  "            </ul>  \n" \
 			  "          </div>\n" \
-			  "          <div  id=\"live002\" class=\"live\">\n" \
-			  "          </div>\n" \
 			  "        </div>\n" \
 			  "        <div class=\"box\" id=\"examples\">\n" \
 			  "          <h2><span></span>\n" \
@@ -83,8 +79,6 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
 			  "            </ul> \n" \
 			  "          </div>\n" \
-			  "          <div id=\"live003\" class=\"live\">\n" \
-			  "          </div>\n" \
 			  "        </div>\n" \
 			  "      </div>\n" \
 			  "      <div class=\"wrap\">\n" \
@@ -130,7 +124,6 @@ HTML.footer             = "        <!-- /div -->\n" \
 			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
 			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
 			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit you feedback...</textarea></p>\n" \
-			  "      <input id=\"pageVal\" name=\"pageVal\" value=\"\$(\'title\').html();\" style=\"display:none;\">\n" \
 			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
 			  "    </form>\n" \
 			  "  </div>\n" \
-- 
cgit v0.12


From 49a6f4a7d87def3816cebf0115ddadf43e9c4d01 Mon Sep 17 00:00:00 2001
From: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
Date: Fri, 21 May 2010 14:23:22 +0200
Subject: Removal erroneous inclusion of new Public API in qmacstyle.

When fixing qtbug-10401 I introduced some extra symbols in the public
API. This commit fixes that and moves those symbols to QMacStylePrivate
instead.

Reviewed-by: jbache
---
 src/gui/styles/qmacstyle_mac_p.h | 255 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 255 insertions(+)
 create mode 100644 src/gui/styles/qmacstyle_mac_p.h

diff --git a/src/gui/styles/qmacstyle_mac_p.h b/src/gui/styles/qmacstyle_mac_p.h
new file mode 100644
index 0000000..7f8994e
--- /dev/null
+++ b/src/gui/styles/qmacstyle_mac_p.h
@@ -0,0 +1,255 @@
+/****************************************************************************
+**
+** 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 QtGui module 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$
+**
+****************************************************************************/
+
+
+#ifndef QMACSTYLE_MAC_P_H
+#define QMACSTYLE_MAC_P_H
+
+#include <qmacstyle_mac.h>
+#include <private/qapplication_p.h>
+#include <private/qcombobox_p.h>
+#include <private/qmacstylepixmaps_mac_p.h>
+#include <private/qpaintengine_mac_p.h>
+#include <private/qpainter_p.h>
+#include <private/qprintengine_mac_p.h>
+#include <private/qstylehelper_p.h>
+#include <qapplication.h>
+#include <qbitmap.h>
+#include <qcheckbox.h>
+#include <qcombobox.h>
+#include <qdialogbuttonbox.h>
+#include <qdockwidget.h>
+#include <qevent.h>
+#include <qfocusframe.h>
+#include <qformlayout.h>
+#include <qgroupbox.h>
+#include <qhash.h>
+#include <qheaderview.h>
+#include <qlayout.h>
+#include <qlineedit.h>
+#include <qlistview.h>
+#include <qmainwindow.h>
+#include <qmap.h>
+#include <qmenubar.h>
+#include <qpaintdevice.h>
+#include <qpainter.h>
+#include <qpixmapcache.h>
+#include <qpointer.h>
+#include <qprogressbar.h>
+#include <qpushbutton.h>
+#include <qradiobutton.h>
+#include <qrubberband.h>
+#include <qsizegrip.h>
+#include <qspinbox.h>
+#include <qsplitter.h>
+#include <qstyleoption.h>
+#include <qtextedit.h>
+#include <qtextstream.h>
+#include <qtoolbar.h>
+#include <qtoolbutton.h>
+#include <qtreeview.h>
+#include <qtableview.h>
+#include <qwizard.h>
+#include <qdebug.h>
+#include <qlibrary.h>
+#include <qdatetimeedit.h>
+#include <qmath.h>
+#include <QtGui/qgraphicsproxywidget.h>
+#include <QtGui/qgraphicsview.h>
+#include <private/qt_cocoa_helpers_mac_p.h>
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+// These colors specify the titlebar gradient colors on
+// Leopard. Ideally we should get them from the system.
+static const QColor titlebarGradientActiveBegin(220, 220, 220);
+static const QColor titlebarGradientActiveEnd(151, 151, 151);
+static const QColor titlebarSeparatorLineActive(111, 111, 111);
+static const QColor titlebarGradientInactiveBegin(241, 241, 241);
+static const QColor titlebarGradientInactiveEnd(207, 207, 207);
+static const QColor titlebarSeparatorLineInactive(131, 131, 131);
+
+// Gradient colors used for the dock widget title bar and
+// non-unifed tool bar bacground.
+static const QColor mainWindowGradientBegin(240, 240, 240);
+static const QColor mainWindowGradientEnd(200, 200, 200);
+
+#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5)
+enum {
+    kThemePushButtonTextured = 31,
+    kThemePushButtonTexturedSmall = 32,
+    kThemePushButtonTexturedMini = 33
+};
+
+/* Search fields */
+enum {
+    kHIThemeFrameTextFieldRound = 1000,
+    kHIThemeFrameTextFieldRoundSmall = 1001,
+    kHIThemeFrameTextFieldRoundMini = 1002
+};
+#endif
+
+// Resolve these at run-time, since the functions was moved in Leopard.
+typedef HIRect * (*PtrHIShapeGetBounds)(HIShapeRef, HIRect *);
+static PtrHIShapeGetBounds ptrHIShapeGetBounds = 0;
+
+static int closeButtonSize = 12;
+
+/*
+    AHIG:
+        Apple Human Interface Guidelines
+        http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/
+
+    Builder:
+        Apple Interface Builder v. 3.1.1
+*/
+
+// this works as long as we have at most 16 different control types
+#define CT1(c) CT2(c, c)
+#define CT2(c1, c2) ((uint(c1) << 16) | uint(c2))
+
+enum QAquaWidgetSize { QAquaSizeLarge = 0, QAquaSizeSmall = 1, QAquaSizeMini = 2,
+                       QAquaSizeUnknown = -1 };
+
+#define SIZE(large, small, mini) \
+    (controlSize == QAquaSizeLarge ? (large) : controlSize == QAquaSizeSmall ? (small) : (mini))
+
+// same as return SIZE(...) but optimized
+#define return_SIZE(large, small, mini) \
+    do { \
+        static const int sizes[] = { (large), (small), (mini) }; \
+        return sizes[controlSize]; \
+    } while (0)
+
+class QMacStylePrivate : public QObject
+{
+    Q_OBJECT
+
+public:
+    QMacStylePrivate(QMacStyle *style);
+
+    // Ideally these wouldn't exist, but since they already exist we need some accessors.
+    static const int PushButtonLeftOffset;
+    static const int PushButtonTopOffset;
+    static const int PushButtonRightOffset;
+    static const int PushButtonBottomOffset;
+    static const int MiniButtonH;
+    static const int SmallButtonH;
+    static const int BevelButtonW;
+    static const int BevelButtonH;
+    static const int PushButtonContentPadding;
+
+
+    // Stuff from QAquaAnimate:
+    bool addWidget(QWidget *);
+    void removeWidget(QWidget *);
+
+    enum Animates { AquaPushButton, AquaProgressBar, AquaListViewItemOpen };
+    bool animatable(Animates, const QWidget *) const;
+    void stopAnimate(Animates, QWidget *);
+    void startAnimate(Animates, QWidget *);
+    static ThemeDrawState getDrawState(QStyle::State flags);
+    QAquaWidgetSize aquaSizeConstrain(const QStyleOption *option, const QWidget *widg,
+                             QStyle::ContentsType ct = QStyle::CT_CustomBase,
+                             QSize szHint=QSize(-1, -1), QSize *insz = 0) const;
+    void getSliderInfo(QStyle::ComplexControl cc, const QStyleOptionSlider *slider,
+                          HIThemeTrackDrawInfo *tdi, const QWidget *needToRemoveMe);
+    bool doAnimate(Animates);
+    inline int animateSpeed(Animates) const { return 33; }
+
+    // Utility functions
+    void drawColorlessButton(const HIRect &macRect, HIThemeButtonDrawInfo *bdi,
+                             QPainter *p, const QStyleOption *opt) const;
+
+    QSize pushButtonSizeFromContents(const QStyleOptionButton *btn) const;
+
+    HIRect pushButtonContentBounds(const QStyleOptionButton *btn,
+                                   const HIThemeButtonDrawInfo *bdi) const;
+
+    void initComboboxBdi(const QStyleOptionComboBox *combo, HIThemeButtonDrawInfo *bdi,
+                        const QWidget *widget, const ThemeDrawState &tds);
+
+    static HIRect comboboxInnerBounds(const HIRect &outerBounds, int buttonKind);
+
+    static QRect comboboxEditBounds(const QRect &outerBounds, const HIThemeButtonDrawInfo &bdi);
+
+    static void drawCombobox(const HIRect &outerBounds, const HIThemeButtonDrawInfo &bdi, QPainter *p);
+    static void drawTableHeader(const HIRect &outerBounds, bool drawTopBorder, bool drawLeftBorder,
+                                     const HIThemeButtonDrawInfo &bdi, QPainter *p);
+    bool contentFitsInPushButton(const QStyleOptionButton *btn, HIThemeButtonDrawInfo *bdi,
+                                 ThemeButtonKind buttonKindToCheck) const;
+    void initHIThemePushButton(const QStyleOptionButton *btn, const QWidget *widget,
+                               const ThemeDrawState tds,
+                               HIThemeButtonDrawInfo *bdi) const;
+    QPixmap generateBackgroundPattern() const;
+protected:
+    bool eventFilter(QObject *, QEvent *);
+    void timerEvent(QTimerEvent *);
+
+private slots:
+    void startAnimationTimer();
+
+public:
+    QPointer<QPushButton> defaultButton; //default push buttons
+    int timerID;
+    QList<QPointer<QWidget> > progressBars; //existing progress bars that need animation
+
+    struct ButtonState {
+        int frame;
+        enum { ButtonDark, ButtonLight } dir;
+    } buttonState;
+    UInt8 progressFrame;
+    QPointer<QFocusFrame> focusWidget;
+    CFAbsoluteTime defaultButtonStart;
+    QMacStyle *q;
+    bool mouseDown;
+};
+
+#endif // QMACSTYLE_MAC_P_H
-- 
cgit v0.12


From 4377e247e135967eb7b4c89906415abecb283bd3 Mon Sep 17 00:00:00 2001
From: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
Date: Fri, 21 May 2010 14:32:05 +0200
Subject: Fixing incorrect addition of public API symbols.

This commit is related to 49a6f4a7d87def3816cebf0115ddadf43e9c4d01 and
contains all the files that were modified. The previous commit contained
only the newly added file.

Reviewed-by: jbache
---
 src/gui/kernel/qt_cocoa_helpers_mac_p.h |   5 +
 src/gui/styles/qmacstyle_mac.h          |  11 --
 src/gui/styles/qmacstyle_mac.mm         | 181 ++++++--------------------------
 src/gui/styles/qmacstyle_mac_p.h        |  22 +---
 src/gui/styles/qmacstylepixmaps_mac_p.h |   5 +
 src/gui/styles/styles.pri               |   3 +-
 src/gui/widgets/qpushbutton.cpp         |   9 +-
 7 files changed, 55 insertions(+), 181 deletions(-)

diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
index 5db121a..44fb4f0 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h
+++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h
@@ -73,6 +73,9 @@
 **
 ****************************************************************************/
 
+#ifndef QT_COCOA_HELPERS_MAC_P_H
+#define QT_COCOA_HELPERS_MAC_P_H
+
 //
 //  W A R N I N G
 //  -------------
@@ -216,3 +219,5 @@ bool qt_cocoaPostMessage(id target, SEL selector);
 void qt_mac_post_retranslateAppMenu();
 
 QT_END_NAMESPACE
+
+#endif // QT_COCOA_HELPERS_MAC_P_H
diff --git a/src/gui/styles/qmacstyle_mac.h b/src/gui/styles/qmacstyle_mac.h
index e594793..bcebb1d 100644
--- a/src/gui/styles/qmacstyle_mac.h
+++ b/src/gui/styles/qmacstyle_mac.h
@@ -120,17 +120,6 @@ public:
 
     bool event(QEvent *e);
 
-    // Ideally these wouldn't exist, but since they already exist we need some accessors.
-    static const int PushButtonLeftOffset;
-    static const int PushButtonTopOffset;
-    static const int PushButtonRightOffset;
-    static const int PushButtonBottomOffset;
-    static const int MiniButtonH;
-    static const int SmallButtonH;
-    static const int BevelButtonW;
-    static const int BevelButtonH;
-    static const int PushButtonContentPadding;
-
 protected Q_SLOTS:
     QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0,
                                      const QWidget *widget = 0) const;
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index e82e638..9cffc1e 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -101,22 +101,21 @@
 #include <QtGui/qgraphicsproxywidget.h>
 #include <QtGui/qgraphicsview.h>
 #include <private/qt_cocoa_helpers_mac_p.h>
+#include "qmacstyle_mac_p.h"
 
 QT_BEGIN_NAMESPACE
 
-extern QRegion qt_mac_convert_mac_region(RgnHandle); //qregion_mac.cpp
-
 // The following constants are used for adjusting the size
 // of push buttons so that they are drawn inside their bounds.
-const int QMacStyle::PushButtonLeftOffset = 6;
-const int QMacStyle::PushButtonTopOffset = 4;
-const int QMacStyle::PushButtonRightOffset = 12;
-const int QMacStyle::PushButtonBottomOffset = 12;
-const int QMacStyle::MiniButtonH = 26;
-const int QMacStyle::SmallButtonH = 30;
-const int QMacStyle::BevelButtonW = 50;
-const int QMacStyle::BevelButtonH = 22;
-const int QMacStyle::PushButtonContentPadding = 6;
+const int QMacStylePrivate::PushButtonLeftOffset = 6;
+const int QMacStylePrivate::PushButtonTopOffset = 4;
+const int QMacStylePrivate::PushButtonRightOffset = 12;
+const int QMacStylePrivate::PushButtonBottomOffset = 12;
+const int QMacStylePrivate::MiniButtonH = 26;
+const int QMacStylePrivate::SmallButtonH = 30;
+const int QMacStylePrivate::BevelButtonW = 50;
+const int QMacStylePrivate::BevelButtonH = 22;
+const int QMacStylePrivate::PushButtonContentPadding = 6;
 
 // These colors specify the titlebar gradient colors on
 // Leopard. Ideally we should get them from the system.
@@ -134,25 +133,14 @@ static const QColor mainWindowGradientEnd(200, 200, 200);
 
 static const int DisclosureOffset = 4;
 
-#if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5)
-enum {
-    kThemePushButtonTextured = 31,
-    kThemePushButtonTexturedSmall = 32,
-    kThemePushButtonTexturedMini = 33
-};
-
-/* Search fields */
-enum {
-    kHIThemeFrameTextFieldRound = 1000,
-    kHIThemeFrameTextFieldRoundSmall = 1001,
-    kHIThemeFrameTextFieldRoundMini = 1002
-};
-#endif
-
 // Resolve these at run-time, since the functions was moved in Leopard.
 typedef HIRect * (*PtrHIShapeGetBounds)(HIShapeRef, HIRect *);
 static PtrHIShapeGetBounds ptrHIShapeGetBounds = 0;
 
+static int closeButtonSize = 12;
+
+extern QRegion qt_mac_convert_mac_region(RgnHandle); //qregion_mac.cpp
+
 static bool isVerticalTabs(const QTabBar::Shape shape) {
     return (shape == QTabBar::RoundedEast
                 || shape == QTabBar::TriangularEast
@@ -160,8 +148,6 @@ static bool isVerticalTabs(const QTabBar::Shape shape) {
                 || shape == QTabBar::TriangularWest);
 }
 
-static int closeButtonSize = 12;
-
 void drawTabCloseButton(QPainter *p, bool hover, bool active, bool selected)
 {
     // draw background circle
@@ -380,32 +366,6 @@ void drawTabBase(QPainter *p, const QStyleOptionTabBarBaseV2 *tbb, const QWidget
     p->drawLine(tabRect.x(), height - 1, width, height - 1);
 }
 
-/*
-    AHIG:
-        Apple Human Interface Guidelines
-        http://developer.apple.com/documentation/UserExperience/Conceptual/OSXHIGuidelines/
-
-    Builder:
-        Apple Interface Builder v. 3.1.1
-*/
-
-// this works as long as we have at most 16 different control types
-#define CT1(c) CT2(c, c)
-#define CT2(c1, c2) ((uint(c1) << 16) | uint(c2))
-
-enum QAquaWidgetSize { QAquaSizeLarge = 0, QAquaSizeSmall = 1, QAquaSizeMini = 2,
-                       QAquaSizeUnknown = -1 };
-
-#define SIZE(large, small, mini) \
-    (controlSize == QAquaSizeLarge ? (large) : controlSize == QAquaSizeSmall ? (small) : (mini))
-
-// same as return SIZE(...) but optimized
-#define return_SIZE(large, small, mini) \
-    do { \
-        static const int sizes[] = { (large), (small), (mini) }; \
-        return sizes[controlSize]; \
-    } while (0)
-
 static int getControlSize(const QStyleOption *option, const QWidget *widget)
 {
     if (option) {
@@ -483,80 +443,9 @@ static inline ThemeTabDirection getTabDirection(QTabBar::Shape shape)
     return ttd;
 }
 
-class QMacStylePrivate : public QObject
-{
-    Q_OBJECT
-
-public:
-    QMacStylePrivate(QMacStyle *style);
-
-    // Stuff from QAquaAnimate:
-    bool addWidget(QWidget *);
-    void removeWidget(QWidget *);
-
-    enum Animates { AquaPushButton, AquaProgressBar, AquaListViewItemOpen };
-    bool animatable(Animates, const QWidget *) const;
-    void stopAnimate(Animates, QWidget *);
-    void startAnimate(Animates, QWidget *);
-    static ThemeDrawState getDrawState(QStyle::State flags);
-    QAquaWidgetSize aquaSizeConstrain(const QStyleOption *option, const QWidget *widg,
-                             QStyle::ContentsType ct = QStyle::CT_CustomBase,
-                             QSize szHint=QSize(-1, -1), QSize *insz = 0) const;
-    void getSliderInfo(QStyle::ComplexControl cc, const QStyleOptionSlider *slider,
-                          HIThemeTrackDrawInfo *tdi, const QWidget *needToRemoveMe);
-    bool doAnimate(Animates);
-    inline int animateSpeed(Animates) const { return 33; }
-
-    // Utility functions
-    void drawColorlessButton(const HIRect &macRect, HIThemeButtonDrawInfo *bdi,
-                             QPainter *p, const QStyleOption *opt) const;
-
-    QSize pushButtonSizeFromContents(const QStyleOptionButton *btn) const;
-
-    HIRect pushButtonContentBounds(const QStyleOptionButton *btn,
-                                   const HIThemeButtonDrawInfo *bdi) const;
-
-    void initComboboxBdi(const QStyleOptionComboBox *combo, HIThemeButtonDrawInfo *bdi,
-                        const QWidget *widget, const ThemeDrawState &tds);
-
-    static HIRect comboboxInnerBounds(const HIRect &outerBounds, int buttonKind);
-
-    static QRect comboboxEditBounds(const QRect &outerBounds, const HIThemeButtonDrawInfo &bdi);
-
-    static void drawCombobox(const HIRect &outerBounds, const HIThemeButtonDrawInfo &bdi, QPainter *p);
-    static void drawTableHeader(const HIRect &outerBounds, bool drawTopBorder, bool drawLeftBorder,
-                                     const HIThemeButtonDrawInfo &bdi, QPainter *p);
-    bool contentFitsInPushButton(const QStyleOptionButton *btn, HIThemeButtonDrawInfo *bdi,
-                                 ThemeButtonKind buttonKindToCheck) const;
-    void initHIThemePushButton(const QStyleOptionButton *btn, const QWidget *widget,
-                               const ThemeDrawState tds,
-                               HIThemeButtonDrawInfo *bdi) const;
-    QPixmap generateBackgroundPattern() const;
-protected:
-    bool eventFilter(QObject *, QEvent *);
-    void timerEvent(QTimerEvent *);
-
-private slots:
-    void startAnimationTimer();
-
-public:
-    QPointer<QPushButton> defaultButton; //default push buttons
-    int timerID;
-    QList<QPointer<QWidget> > progressBars; //existing progress bars that need animation
-
-    struct ButtonState {
-        int frame;
-        enum { ButtonDark, ButtonLight } dir;
-    } buttonState;
-    UInt8 progressFrame;
-    QPointer<QFocusFrame> focusWidget;
-    CFAbsoluteTime defaultButtonStart;
-    QMacStyle *q;
-    bool mouseDown;
-};
-
 QT_BEGIN_INCLUDE_NAMESPACE
-#include "qmacstyle_mac.moc"
+#include "moc_qmacstyle_mac.cpp"
+#include "moc_qmacstyle_mac_p.cpp"
 QT_END_INCLUDE_NAMESPACE
 
 /*****************************************************************************
@@ -1057,10 +946,10 @@ HIRect QMacStylePrivate::pushButtonContentBounds(const QStyleOptionButton *btn,
     // Adjust the bounds to correct for
     // carbon not calculating the content bounds fully correct
     if (bdi->kind == kThemePushButton || bdi->kind == kThemePushButtonSmall){
-        outerBounds.origin.y += QMacStyle::PushButtonTopOffset;
-        outerBounds.size.height -= QMacStyle::PushButtonBottomOffset;
+        outerBounds.origin.y += QMacStylePrivate::PushButtonTopOffset;
+        outerBounds.size.height -= QMacStylePrivate::PushButtonBottomOffset;
     } else if (bdi->kind == kThemePushButtonMini) {
-        outerBounds.origin.y += QMacStyle::PushButtonTopOffset;
+        outerBounds.origin.y += QMacStylePrivate::PushButtonTopOffset;
     }
 
     HIRect contentBounds;
@@ -1076,7 +965,7 @@ QSize QMacStylePrivate::pushButtonSizeFromContents(const QStyleOptionButton *btn
 {
     QSize csz(0, 0);
     QSize iconSize = btn->icon.isNull() ? QSize(0, 0)
-                : (btn->iconSize + QSize(QMacStyle::PushButtonContentPadding, 0));
+                : (btn->iconSize + QSize(QMacStylePrivate::PushButtonContentPadding, 0));
     QRect textRect = btn->text.isEmpty() ? QRect(0, 0, 1, 1)
                 : btn->fontMetrics.boundingRect(QRect(), Qt::AlignCenter, btn->text);
     csz.setWidth(iconSize.width() + textRect.width()
@@ -1151,12 +1040,12 @@ void QMacStylePrivate::initHIThemePushButton(const QStyleOptionButton *btn,
             // Choose the button kind that closest match the button rect, but at the
             // same time displays the button contents without clipping.
             bdi->kind = kThemeBevelButton;
-            if (btn->rect.width() >= QMacStyle::BevelButtonW && btn->rect.height() >= QMacStyle::BevelButtonH){
+            if (btn->rect.width() >= QMacStylePrivate::BevelButtonW && btn->rect.height() >= QMacStylePrivate::BevelButtonH){
                 if (widget && widget->testAttribute(Qt::WA_MacVariableSize)) {
-                    if (btn->rect.height() <= QMacStyle::MiniButtonH){
+                    if (btn->rect.height() <= QMacStylePrivate::MiniButtonH){
                         if (contentFitsInPushButton(btn, bdi, kThemePushButtonMini))
                             bdi->kind = kThemePushButtonMini;
-                    } else if (btn->rect.height() <= QMacStyle::SmallButtonH){
+                    } else if (btn->rect.height() <= QMacStylePrivate::SmallButtonH){
                         if (contentFitsInPushButton(btn, bdi, kThemePushButtonSmall))
                             bdi->kind = kThemePushButtonSmall;
                     } else if (contentFitsInPushButton(btn, bdi, kThemePushButton)) {
@@ -3497,21 +3386,21 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
             // the focus 'shadow' will be inside.
             HIRect newRect = qt_hirectForQRect(btn->rect);
             if (bdi.kind == kThemePushButton || bdi.kind == kThemePushButtonSmall) {
-                newRect.origin.x += PushButtonLeftOffset;
-                newRect.origin.y += PushButtonTopOffset;
-                newRect.size.width -= PushButtonRightOffset;
-                newRect.size.height -= PushButtonBottomOffset;
+                newRect.origin.x += QMacStylePrivate::PushButtonLeftOffset;
+                newRect.origin.y += QMacStylePrivate::PushButtonTopOffset;
+                newRect.size.width -= QMacStylePrivate::PushButtonRightOffset;
+                newRect.size.height -= QMacStylePrivate::PushButtonBottomOffset;
             } else if (bdi.kind == kThemePushButtonMini) {
-                newRect.origin.x += PushButtonLeftOffset - 2;
-                newRect.origin.y += PushButtonTopOffset;
-                newRect.size.width -= PushButtonRightOffset - 4;
+                newRect.origin.x += QMacStylePrivate::PushButtonLeftOffset - 2;
+                newRect.origin.y += QMacStylePrivate::PushButtonTopOffset;
+                newRect.size.width -= QMacStylePrivate::PushButtonRightOffset - 4;
             }
             HIThemeDrawButton(&newRect, &bdi, cg, kHIThemeOrientationNormal, 0);
 
             if (btn->features & QStyleOptionButton::HasMenu) {
                 int mbi = proxy()->pixelMetric(QStyle::PM_MenuButtonIndicator, btn, w);
                 QRect ir = btn->rect;
-                HIRect arrowRect = CGRectMake(ir.right() - mbi - PushButtonRightOffset,
+                HIRect arrowRect = CGRectMake(ir.right() - mbi - QMacStylePrivate::PushButtonRightOffset,
                                               ir.height() / 2 - 4, mbi, ir.height() / 2);
                 bool drawColorless = btn->palette.currentColorGroup() == QPalette::Active;
                 if (drawColorless && tds == kThemeStateInactive)
@@ -3605,14 +3494,14 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
                         if (btn->state & State_On)
                             state = QIcon::On;
                         QPixmap pixmap = btn->icon.pixmap(btn->iconSize, mode, state);
-                        contentW += pixmap.width() + PushButtonContentPadding;
+                        contentW += pixmap.width() + QMacStylePrivate::PushButtonContentPadding;
                         int iconLeftOffset = freeContentRect.x() + (freeContentRect.width() - contentW) / 2;
                         int iconTopOffset = freeContentRect.y() + (freeContentRect.height() - pixmap.height()) / 2;
                         QRect iconDestRect(iconLeftOffset, iconTopOffset, pixmap.width(), pixmap.height());
                         QRect visualIconDestRect = visualRect(btn->direction, freeContentRect, iconDestRect);
                         proxy()->drawItemPixmap(p, visualIconDestRect, Qt::AlignLeft | Qt::AlignVCenter, pixmap);
                         int newOffset = iconDestRect.x() + iconDestRect.width()
-                                        + PushButtonContentPadding - textRect.x();
+                                        + QMacStylePrivate::PushButtonContentPadding - textRect.x();
                         textRect.adjust(newOffset, 0, newOffset, 0);
                     }
                     // Draw the text:
@@ -5708,8 +5597,8 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
         // By default, we fit the contents inside a normal rounded push button.
         // Do this by add enough space around the contents so that rounded
         // borders (including highlighting when active) will show.
-        sz.rwidth() += PushButtonLeftOffset + PushButtonRightOffset + 12;
-        sz.rheight() += PushButtonTopOffset + PushButtonBottomOffset;
+        sz.rwidth() += QMacStylePrivate::PushButtonLeftOffset + QMacStylePrivate::PushButtonRightOffset + 12;
+        sz.rheight() += QMacStylePrivate::PushButtonTopOffset + QMacStylePrivate::PushButtonBottomOffset;
         break;
     case QStyle::CT_MenuItem:
         if (const QStyleOptionMenuItem *mi = qstyleoption_cast<const QStyleOptionMenuItem *>(opt)) {
diff --git a/src/gui/styles/qmacstyle_mac_p.h b/src/gui/styles/qmacstyle_mac_p.h
index 7f8994e..5a0ba4c 100644
--- a/src/gui/styles/qmacstyle_mac_p.h
+++ b/src/gui/styles/qmacstyle_mac_p.h
@@ -107,19 +107,7 @@
 // We mean it.
 //
 
-// These colors specify the titlebar gradient colors on
-// Leopard. Ideally we should get them from the system.
-static const QColor titlebarGradientActiveBegin(220, 220, 220);
-static const QColor titlebarGradientActiveEnd(151, 151, 151);
-static const QColor titlebarSeparatorLineActive(111, 111, 111);
-static const QColor titlebarGradientInactiveBegin(241, 241, 241);
-static const QColor titlebarGradientInactiveEnd(207, 207, 207);
-static const QColor titlebarSeparatorLineInactive(131, 131, 131);
-
-// Gradient colors used for the dock widget title bar and
-// non-unifed tool bar bacground.
-static const QColor mainWindowGradientBegin(240, 240, 240);
-static const QColor mainWindowGradientEnd(200, 200, 200);
+QT_BEGIN_NAMESPACE
 
 #if (MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5)
 enum {
@@ -136,12 +124,6 @@ enum {
 };
 #endif
 
-// Resolve these at run-time, since the functions was moved in Leopard.
-typedef HIRect * (*PtrHIShapeGetBounds)(HIShapeRef, HIRect *);
-static PtrHIShapeGetBounds ptrHIShapeGetBounds = 0;
-
-static int closeButtonSize = 12;
-
 /*
     AHIG:
         Apple Human Interface Guidelines
@@ -252,4 +234,6 @@ public:
     bool mouseDown;
 };
 
+QT_END_NAMESPACE
+
 #endif // QMACSTYLE_MAC_P_H
diff --git a/src/gui/styles/qmacstylepixmaps_mac_p.h b/src/gui/styles/qmacstylepixmaps_mac_p.h
index 6a5e0e6..58038c3 100644
--- a/src/gui/styles/qmacstylepixmaps_mac_p.h
+++ b/src/gui/styles/qmacstylepixmaps_mac_p.h
@@ -39,6 +39,9 @@
 **
 ****************************************************************************/
 
+#ifndef QMACSTYLEPIXMAPS_MAC_P_H
+#define QMACSTYLEPIXMAPS_MAC_P_H
+
 //
 //  W A R N I N G
 //  -------------
@@ -65,3 +68,5 @@ static const char * const qt_mac_toolbar_ext[]={
     "aab###bb###baa",
     "ab###bb###baaa",
     ".###..###.aaaa"};
+
+#endif //  QMACSTYLEPIXMAPS_MAC_P_H
diff --git a/src/gui/styles/styles.pri b/src/gui/styles/styles.pri
index f920032..0a96272 100644
--- a/src/gui/styles/styles.pri
+++ b/src/gui/styles/styles.pri
@@ -46,7 +46,8 @@ x11{
 contains( styles, mac ) {
 	HEADERS += \
 		styles/qmacstyle_mac.h \
-		styles/qmacstylepixmaps_mac_p.h
+		styles/qmacstylepixmaps_mac_p.h \
+		styles/qmacstyle_mac_p.h
         OBJECTIVE_SOURCES += styles/qmacstyle_mac.mm
 
 	!contains( styles, windows ) {
diff --git a/src/gui/widgets/qpushbutton.cpp b/src/gui/widgets/qpushbutton.cpp
index 7b8c0db..d73cf6f 100644
--- a/src/gui/widgets/qpushbutton.cpp
+++ b/src/gui/widgets/qpushbutton.cpp
@@ -68,6 +68,7 @@
 
 #include "private/qmenu_p.h"
 #include "private/qpushbutton_p.h"
+#include "private/qmacstyle_mac_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -705,10 +706,10 @@ bool QPushButton::hitButton(const QPoint &pos) const
 bool QPushButtonPrivate::hitButton(const QPoint &pos)
 {
     Q_Q(QPushButton);
-    QRect roundedRect(q->rect().left() + QMacStyle::PushButtonLeftOffset,
-                      q->rect().top() + QMacStyle::PushButtonContentPadding,
-                      q->rect().width() - QMacStyle::PushButtonRightOffset,
-                      q->rect().height() - QMacStyle::PushButtonBottomOffset);
+    QRect roundedRect(q->rect().left() + QMacStylePrivate::PushButtonLeftOffset,
+                      q->rect().top() + QMacStylePrivate::PushButtonContentPadding,
+                      q->rect().width() - QMacStylePrivate::PushButtonRightOffset,
+                      q->rect().height() - QMacStylePrivate::PushButtonBottomOffset);
     return roundedRect.contains(pos);
 }
 #endif // Q_WS_MAC
-- 
cgit v0.12


From 634e3646cfbc53e85b66b42d2a75fb1fd4dab164 Mon Sep 17 00:00:00 2001
From: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
Date: Fri, 21 May 2010 15:18:46 +0200
Subject: Removing unneeded qDebug statement.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/styles/qmacstyle_mac.mm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 9cffc1e..aaebe4b 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -3361,7 +3361,6 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter
         QCommonStyle::drawControl(ce, opt, p, w);
         break;
     case CE_PushButtonBevel:
-        qDebug() << "here";
         if (const QStyleOptionButton *btn = ::qstyleoption_cast<const QStyleOptionButton *>(opt)) {
             if (!(btn->state & (State_Raised | State_Sunken | State_On)))
                 break;
-- 
cgit v0.12


From e06bc69870d1ef79466557dd716ec1edb0e48fee Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Fri, 21 May 2010 16:14:38 +0200
Subject: QDebug operator for QFlags

Output the flags one by one instead of just an integer

Reviewed-by: Robert Griebl
---
 src/corelib/io/qdebug.h | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h
index bc68599..093312f 100644
--- a/src/corelib/io/qdebug.h
+++ b/src/corelib/io/qdebug.h
@@ -254,6 +254,29 @@ inline QDebug operator<<(QDebug debug, const QContiguousCache<T> &cache)
     return debug.space();
 }
 
+#if defined(FORCE_UREF)
+template <class T>
+inline QDebug &operator<<(QDebug debug, const QFlags<T> &flags)
+#else
+template <class T>
+inline QDebug operator<<(QDebug debug, const QFlags<T> &flags)
+#endif
+{
+    debug.nospace() << "QFlags(";
+    bool needSeparator = false;
+    for (uint i = 0; i < sizeof(T) * 8; ++i) {
+        if (flags.testFlag(T(1 << i))) {
+            if (needSeparator)
+                debug.nospace() << '|';
+            else
+                needSeparator = true;
+            debug.nospace() << "0x" << QByteArray::number(T(1 << i), 16).constData();
+        }
+    }
+    debug << ')';
+    return debug.space();
+}
+
 #if !defined(QT_NO_DEBUG_STREAM)
 Q_CORE_EXPORT_INLINE QDebug qDebug() { return QDebug(QtDebugMsg); }
 
-- 
cgit v0.12


From 1ec8acd77b6c048f5a68887ac7750b0764ade598 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 21 May 2010 12:05:15 +0200
Subject: Remove Q_PACKED from QChar and QLocale::Data.

Reviewed-by: Olivier Goffart
---
 dist/changes-4.7.0          | 7 +++++++
 src/corelib/tools/qchar.h   | 6 +-----
 src/corelib/tools/qlocale.h | 6 +-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 34d002c..4965ef5 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -333,3 +333,10 @@ QtScript: Changes due to updating src/3rdparty/javascriptcore:
    a column number of 1.
  - QScriptValueIterator will include the "length" property when iterating
    over Array objects.
+
+QtCore:
+  - QChar no longer carries the Q_PACKED tag on ARM. This flag was
+    used to allow proper alignment of QChar on 2 bytes on older ARM
+    ABIs, but it also allowed for unaligned access. Qt never generates
+    or uses unaligned access and the new EABI aligns as expected, so
+    the flag was removed.
diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h
index 205f911..b9e7e01 100644
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/tools/qchar.h
@@ -358,11 +358,7 @@ private:
     QChar(uchar c);
 #endif
     ushort ucs;
-}
-#if (defined(__arm__) || defined(__ARMEL__))
-    Q_PACKED
-#endif
-    ;
+};
 
 Q_DECLARE_TYPEINFO(QChar, Q_MOVABLE_TYPE);
 
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h
index 5023201..f2fd892 100644
--- a/src/corelib/tools/qlocale.h
+++ b/src/corelib/tools/qlocale.h
@@ -685,11 +685,7 @@ public:
     struct Data {
         quint16 index;
         quint16 numberOptions;
-    }
-#if (defined(__arm__) || defined(__ARMEL__))
-        Q_PACKED
-#endif
-        ;
+    };
 private:
     friend struct QLocalePrivate;
     // ### We now use this field to pack an index into locale_data and NumberOptions.
-- 
cgit v0.12


From b5f1a55c3112f46f27e2306fac7d93bde96152e6 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 21 May 2010 13:21:44 +0200
Subject: tst_bic: make it possible to test for cross-compilation

---
 tests/auto/bic/gen.sh      |  2 +-
 tests/auto/bic/tst_bic.cpp | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tests/auto/bic/gen.sh b/tests/auto/bic/gen.sh
index 8005880..7bcad24 100755
--- a/tests/auto/bic/gen.sh
+++ b/tests/auto/bic/gen.sh
@@ -56,7 +56,7 @@ fi
 
 for module in $modules; do
     echo "#include <$module/$module>" >test.cpp
-    g++ -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp
+    ${CXX-g++} $CXXFLAGS -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp
     mv test.cpp*.class $module.$2.txt
     # Remove template classes from the output
     perl -pi -e '$skip = 1 if (/^(Class|Vtable).*</);
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index 400fcc1..504512d 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -178,13 +178,17 @@ void tst_Bic::sizesAndVTables_data()
     QSKIP("Test not implemented for this compiler/platform", SkipAll);
 #else
 
-#if defined Q_OS_LINUX && defined Q_WS_X11
+#if defined(FILESUFFIX)
+    // cross-testing
+#elif defined Q_OS_LINUX && defined Q_WS_X11
 # if defined(__powerpc__) && !defined(__powerpc64__)
 #  define FILESUFFIX "linux-gcc-ppc32"
 # elif defined(__amd64__)
 #  define FILESUFFIX "linux-gcc-amd64"
 # elif defined(__i386__)
 #  define FILESUFFIX "linux-gcc-ia32"
+# elif defined(__ARMEL__)
+#  define FILESUFFIX "linux-gcc-armel"
 # endif
 #elif defined Q_OS_MAC && defined(__powerpc__)
 #  define FILESUFFIX "macx-gcc-ppc32"
@@ -233,9 +237,11 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName)
 #ifdef Q_OS_WIN
     qtDir.replace('\\', '/');
 #endif
-    QString compilerName = "g++";
+    QString compilerName = QString::fromLocal8Bit(qgetenv("CXX"));
+    if (compilerName.isEmpty())
+        compilerName = "g++";
 
-    QStringList args;
+    QStringList args = QString::fromLocal8Bit(qgetenv("CXXFLAGS")).split(' ');
     args << "-c"
          << "-I" + qtDir + "/include"
 #ifdef Q_OS_MAC
-- 
cgit v0.12


From cafd53ce84b13085fe2b594bf42bed533e26a3e8 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 18 May 2010 20:15:36 +0200
Subject: QDBusAbstractInterface: don't set lastError outside the object's own
 thread

---
 src/dbus/qdbusabstractinterface.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 1a7c417..4e9c1ad 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -42,6 +42,8 @@
 #include "qdbusabstractinterface.h"
 #include "qdbusabstractinterface_p.h"
 
+#include <qthread.h>
+
 #include "qdbusargument.h"
 #include "qdbuspendingcall.h"
 #include "qdbusmessage_p.h"
@@ -440,7 +442,8 @@ QDBusMessage QDBusAbstractInterface::callWithArgumentList(QDBus::CallMode mode,
     msg.setArguments(args);
 
     QDBusMessage reply = d->connection.call(msg, mode);
-    d->lastError = reply;       // will clear if reply isn't an error
+    if (thread() == QThread::currentThread())
+        d->lastError = reply;       // will clear if reply isn't an error
 
     // ensure that there is at least one element
     if (reply.arguments().isEmpty())
-- 
cgit v0.12


From 3d96cbd2ec0c104a77254219ef583b6ade3c547d Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Sun, 23 May 2010 10:07:54 +0200
Subject: Unbreak compilation outside Mac

---
 src/gui/widgets/qpushbutton.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/widgets/qpushbutton.cpp b/src/gui/widgets/qpushbutton.cpp
index d73cf6f..8a18ed0 100644
--- a/src/gui/widgets/qpushbutton.cpp
+++ b/src/gui/widgets/qpushbutton.cpp
@@ -60,6 +60,7 @@
 #include "qdialogbuttonbox.h"
 #ifdef Q_WS_MAC
 #include "qmacstyle_mac.h"
+#include "private/qmacstyle_mac_p.h"
 #endif // Q_WS_MAC
 
 #ifndef QT_NO_ACCESSIBILITY
@@ -68,7 +69,6 @@
 
 #include "private/qmenu_p.h"
 #include "private/qpushbutton_p.h"
-#include "private/qmacstyle_mac_p.h"
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v0.12


From b827967fef469f66a5a2f975bfafc3cdb82c4ffb Mon Sep 17 00:00:00 2001
From: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Date: Sun, 23 May 2010 19:51:22 +0200
Subject: Compile with QT_NO_ACTION.

Merge-request: 643
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
---
 src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 7c55009..151a9e9 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -140,7 +140,9 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterType<QDeclarativeScaleGrid>();
     qmlRegisterType<QValidator>();
     qmlRegisterType<QDeclarativeVisualModel>();
+#ifndef QT_NO_ACTION
     qmlRegisterType<QAction>();
+#endif
     qmlRegisterType<QDeclarativePen>();
     qmlRegisterType<QDeclarativeFlickableVisibleArea>();
 #ifndef QT_NO_GRAPHICSEFFECT
-- 
cgit v0.12


From aee4174771cf9d64b3b36db6ab90f29b084a39d6 Mon Sep 17 00:00:00 2001
From: Alex <qt-info@nokia.com>
Date: Mon, 24 May 2010 16:07:18 +1000
Subject: Improve Bearer Management related documentation in
 QNetworkAccessManager

Reviewed-by: trustme
---
 src/network/access/qnetworkaccessmanager.cpp | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 1c7661d..c9e2638 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -141,6 +141,32 @@ static void ensureInitialized()
     can be:
     \snippet doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp 1
 
+    \section1 Network and Roaming support
+
+    With the addition of the \l {Bearer Management} API to Qt 4.7
+    QNetworkAccessManager gained the ability to manage network connections.
+    QNetworkAccessManager can start the network interface if the device is
+    offline and terminates the interface if the current process is the last
+    one to use the uplink. Note that some platform utilize grace periods from
+    when the last application stops using a uplink until the system actually
+    terminates the connectivity link. Roaming is equally transparent. Any
+    queued/pending network requests are automatically transferred to new
+    access point.
+
+    Clients wanting to utlize this feature should not require any changes. In fact
+    it is likely that existing platform specific connection code can simply be
+    removed from the application.
+
+    \note The network and roaming support in QNetworkAccessManager is conditional
+    upon the platform supporting connection management. The
+    \l QNetworkConfigurationManager::NetworkSessionRequired can be used to
+    detect whether QNetworkAccessManager utilizes this feature. Currently only
+    Meego/Harmattan and Symbian platforms provide connection management support.
+
+    \note This feature cannot be used in combination with the Bearer Management
+    API as provided by QtMobility. Applications have to migrate to the Qt version
+    of Bearer Management.
+
     \section1 Symbian Platform Security Requirements
 
     On Symbian, processes which use this class must have the
-- 
cgit v0.12


From 2fa76dc524b97590e554f0f86e6e8c58b6396d51 Mon Sep 17 00:00:00 2001
From: Alex <qt-info@nokia.com>
Date: Mon, 24 May 2010 16:09:47 +1000
Subject: fix typo in documentation

---
 src/network/access/qnetworkaccessmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index c9e2638..6669b5d 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -153,7 +153,7 @@ static void ensureInitialized()
     queued/pending network requests are automatically transferred to new
     access point.
 
-    Clients wanting to utlize this feature should not require any changes. In fact
+    Clients wanting to utilize this feature should not require any changes. In fact
     it is likely that existing platform specific connection code can simply be
     removed from the application.
 
-- 
cgit v0.12


From 559f44abace0203a1930c71ec1040855dd1db573 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Tue, 25 May 2010 09:32:25 +0200
Subject: Updated WebKit to 807157e42add842605ec67d9363dd3f1861748ca

* Changes integrated:

|| <https://webkit.org/b/24289> || [Qt] lacks clipToImageBuffer() ||
|| <https://webkit.org/b/38641> || [Qt] Nested overflow div does not scroll ||
|| <https://webkit.org/b/37322> || [Qt] tst_QWebHistory::serialize_2() fails ||
|| <https://webkit.org/b/35340> || [Qt] Enable alternate HTML/JavaScript front-ends for Web Inspector ||
|| <https://webkit.org/b/39314> || [Qt] Skipping popup focus test for maemo ||
|| <https://webkit.org/b/39150> || Canvas's getContext() must return null when called with an invalid/unsupported parameter ||
|| <https://webkit.org/b/39153> || Canvas's toDataURL() should be case insensitive wrt the mimeType argument ||
|| <https://webkit.org/b/39218> || [Qt] Tiled backing store tiles sometimes flicker when exiting a zoom animation ||
|| <https://webkit.org/b/38456> || [Qt] QtTestBrowser does not support websites which requires HTTP Authentication via dialogs ||
|| <https://webkit.org/b/37273> || [Qt] Weekly binary builds on Mac OS X don't work when launched in the Finder ||
|| <https://webkit.org/b/38779> || [Qt] QWebPage::inputMethodQuery() returns wrong values for Qt::ImCursorPosition, Qt::ImAnchorPosition ||
|| <https://webkit.org/b/38526> || [Qt] REGRESSION: CoolClock isn't rendered properly ||

Plus def file fixes.
---
 src/3rdparty/webkit/.tag                           |   2 +-
 src/3rdparty/webkit/ChangeLog                      |  12 ++
 src/3rdparty/webkit/VERSION                        |   2 +-
 src/3rdparty/webkit/WebCore/ChangeLog              | 121 +++++++++++++++++++
 .../bindings/js/JSHTMLCanvasElementCustom.cpp      |   5 +-
 .../webkit/WebCore/html/HTMLCanvasElement.cpp      |   6 +-
 src/3rdparty/webkit/WebCore/page/ChromeClient.h    |   6 +-
 src/3rdparty/webkit/WebCore/page/Frame.cpp         |   8 ++
 src/3rdparty/webkit/WebCore/page/Frame.h           |   1 +
 .../platform/graphics/TiledBackingStore.cpp        |  28 ++---
 .../WebCore/platform/graphics/TiledBackingStore.h  |   4 +-
 .../platform/graphics/TiledBackingStoreClient.h    |   1 +
 .../platform/graphics/qt/GraphicsContextQt.cpp     |  57 +++++++--
 .../WebCore/platform/graphics/qt/ImageBufferQt.cpp |  14 ++-
 .../webkit/WebCore/platform/graphics/qt/PathQt.cpp |   7 +-
 .../webkit/WebCore/platform/qt/QWebPageClient.h    |   2 +
 src/3rdparty/webkit/WebKit.pri                     |   7 +-
 .../webkit/WebKit/qt/Api/qgraphicswebview.cpp      |   9 +-
 src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp    |  32 +++--
 src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp  |   2 +
 src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp     |   4 +-
 src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp |  26 -----
 src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h   |   3 -
 src/3rdparty/webkit/WebKit/qt/ChangeLog            | 129 +++++++++++++++++++++
 .../WebKit/qt/WebCoreSupport/ChromeClientQt.cpp    |   9 ++
 .../WebKit/qt/WebCoreSupport/ChromeClientQt.h      |   4 +
 .../WebKit/qt/WebCoreSupport/InspectorClientQt.cpp |   9 +-
 .../webkit/WebKit/qt/symbian/bwins/QtWebKitu.def   |   5 +-
 .../webkit/WebKit/qt/symbian/eabi/QtWebKitu.def    |  54 ++++++++-
 .../WebKit/qt/tests/qwebframe/tst_qwebframe.cpp    |  35 ++++--
 .../WebKit/qt/tests/qwebpage/tst_qwebpage.cpp      |  92 +++++++++++++++
 31 files changed, 594 insertions(+), 102 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 1973377..c4a7dd7 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-807157e42add842605ec67d9363dd3f1861748ca
+eb07c6f9bd50d0d74e9ac19ade4a2fbd5cece7c7
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog
index 8f9c7ac..c2862fd 100644
--- a/src/3rdparty/webkit/ChangeLog
+++ b/src/3rdparty/webkit/ChangeLog
@@ -1,3 +1,15 @@
+2010-05-04  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Unreviewed, build fix for Symbian.
+
+        [Symbian] Symbian builds does not support shadow builds
+
+        Revision r54715 broke the Symbian build. For Symbian
+        the include directory is generated in the root of the source tree.
+        This patch sets the INCLUDEPATH accordingly for Symbian.
+
+        * WebKit.pri:
+
 2010-05-14  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Rubber-stamped by Antti Koivisto.
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 79581d1..0899e3c 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        cacbdf18fc917122834042d77a9164a490aafde4
+        807157e42add842605ec67d9363dd3f1861748ca
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 481b416..625faa6 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,124 @@
+2010-05-19  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        Fix painting when using clipToImageBuffer()
+
+        When we apply the transform of the parent painter to the painter of
+        the transparency layer, we adopt its coordinate system, thus offset
+        should not be in page coordinates, but in the coordinate system of
+        the parent painter.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::TransparencyLayer::TransparencyLayer):
+
+2010-05-19  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] REGRESSION: CoolClock isn't rendered properly
+
+        https://bugs.webkit.org/show_bug.cgi?id=38526
+
+        CanvasRenderingContext2D's arc() should connect to the previous point
+        with a straight line (HTML5 spec 4.8.11.1.8), but if the path is empty
+        to begin with, we don't want a line back to (0,0)
+        This also fixes the rendering artifact discussed in bug 36226.
+
+        Spec link:
+        http://www.whatwg.org/specs/web-apps/current-work/#dom-context-2d-arc
+
+        Test: fast/canvas/canvas-arc-connecting-line.html
+
+        * platform/graphics/qt/PathQt.cpp:
+        (WebCore::Path::addArc):
+
+2010-05-18  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Rubberstamped by Simon Hausmann.
+
+        Return null when creating an ImageBuffer failed, due to for
+        instance a nulled pixmap.
+
+        * platform/graphics/qt/ImageBufferQt.cpp:
+        (WebCore::ImageBufferData::ImageBufferData):
+        (WebCore::ImageBuffer::ImageBuffer):
+
+2010-05-17  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39218
+        [Qt] Tiled backing store tiles sometimes flicker when exiting a zoom animation
+        
+        Tiles sometimes flicker when exiting a zoom animation. This happens as a result
+        of the visible rectangle being momentarily out of sync.
+        
+        Instead of updating the visible rect by explicitly setting it, pull it through
+        the client and recompute in the WebKit level.
+
+        * page/ChromeClient.h:
+        (WebCore::ChromeClient::visibleRectForTiledBackingStore):
+        * page/Frame.cpp:
+        (WebCore::Frame::tiledBackingStoreVisibleRect):
+        * page/Frame.h:
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::checkVisibleRectChanged):
+        (WebCore::TiledBackingStore::createTiles):
+        * platform/graphics/TiledBackingStore.h:
+        * platform/graphics/TiledBackingStoreClient.h:
+
+2010-05-18  Zoltan Herczeg  <zherczeg@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Implementing clipToImageBuffer for Qt port.
+        https://bugs.webkit.org/show_bug.cgi?id=24289
+
+        The implementation combines pixmap layers and destinationIn
+        composition mode.
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::TransparencyLayer::TransparencyLayer):
+        (WebCore::GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate):
+        (WebCore::GraphicsContext::savePlatformState):
+        (WebCore::GraphicsContext::restorePlatformState):
+        (WebCore::GraphicsContext::inTransparencyLayer):
+        (WebCore::GraphicsContext::beginTransparencyLayer):
+        (WebCore::GraphicsContext::endTransparencyLayer):
+        (WebCore::GraphicsContext::clipToImageBuffer):
+
+2010-05-16  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Canvas's toDataURL() should be case insensitive wrt the mimeType argument.
+        https://bugs.webkit.org/show_bug.cgi?id=39153
+
+        Spec link:
+        http://www.whatwg.org/specs/web-apps/current-work/#dom-canvas-todataurl
+
+        Test: fast/canvas/canvas-toDataURL-case-insensitive-mimetype.html
+
+        * dom/CanvasSurface.cpp:
+        (WebCore::CanvasSurface::toDataURL):
+
+2010-05-16  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Canvas's getContext() must return null when called with an invalid/unsupported parameter.
+        (HTML5 spec 4.8.11): http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#dom-canvas-getcontext
+
+        https://bugs.webkit.org/show_bug.cgi?id=39150
+
+        Test: fast/canvas/canvas-getContext-invalid.html
+
+        * bindings/js/JSHTMLCanvasElementCustom.cpp:
+        (WebCore::JSHTMLCanvasElement::getContext):
+        * bindings/v8/custom/V8HTMLCanvasElementCustom.cpp:
+        (WebCore::V8HTMLCanvasElement::getContextCallback):
+
 2010-05-17  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 
         Reviewed by Laszlo Gombos.
diff --git a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp
index 80634f7..8f241f9 100644
--- a/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp
+++ b/src/3rdparty/webkit/WebCore/bindings/js/JSHTMLCanvasElementCustom.cpp
@@ -78,7 +78,10 @@ JSValue JSHTMLCanvasElement::getContext(ExecState* exec, const ArgList& args)
         }
     }
 #endif
-    return toJS(exec, globalObject(), WTF::getPtr(canvas->getContext(contextId, attrs.get())));
+    CanvasRenderingContext* context = canvas->getContext(contextId, attrs.get());
+    if (!context)
+        return jsNull();
+    return toJS(exec, globalObject(), WTF::getPtr(context));
 }
 
 } // namespace WebCore
diff --git a/src/3rdparty/webkit/WebCore/html/HTMLCanvasElement.cpp b/src/3rdparty/webkit/WebCore/html/HTMLCanvasElement.cpp
index 30a620c..0c5159d 100644
--- a/src/3rdparty/webkit/WebCore/html/HTMLCanvasElement.cpp
+++ b/src/3rdparty/webkit/WebCore/html/HTMLCanvasElement.cpp
@@ -143,10 +143,12 @@ String HTMLCanvasElement::toDataURL(const String& mimeType, ExceptionCode& ec)
     if (m_size.isEmpty() || !buffer())
         return String("data:,");
 
-    if (mimeType.isNull() || !MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(mimeType))
+    String lowercaseMimeType = mimeType.lower();
+
+    if (mimeType.isNull() || !MIMETypeRegistry::isSupportedImageMIMETypeForEncoding(lowercaseMimeType))
         return buffer()->toDataURL("image/png");
 
-    return buffer()->toDataURL(mimeType);
+    return buffer()->toDataURL(lowercaseMimeType);
 }
 
 CanvasRenderingContext* HTMLCanvasElement::getContext(const String& type, CanvasContextAttributes* attrs)
diff --git a/src/3rdparty/webkit/WebCore/page/ChromeClient.h b/src/3rdparty/webkit/WebCore/page/ChromeClient.h
index 0bfdbaf..a01eef1 100644
--- a/src/3rdparty/webkit/WebCore/page/ChromeClient.h
+++ b/src/3rdparty/webkit/WebCore/page/ChromeClient.h
@@ -222,7 +222,11 @@ namespace WebCore {
         virtual bool supportsFullscreenForNode(const Node*) { return false; }
         virtual void enterFullscreenForNode(Node*) { }
         virtual void exitFullscreenForNode(Node*) { }
-        
+
+#if ENABLE(TILED_BACKING_STORE)
+        virtual IntRect visibleRectForTiledBackingStore() const { return IntRect(); }
+#endif
+
 #if PLATFORM(MAC)
         virtual KeyboardUIMode keyboardUIMode() { return KeyboardAccessDefault; }
 
diff --git a/src/3rdparty/webkit/WebCore/page/Frame.cpp b/src/3rdparty/webkit/WebCore/page/Frame.cpp
index 6dbca69..379bf7d 100644
--- a/src/3rdparty/webkit/WebCore/page/Frame.cpp
+++ b/src/3rdparty/webkit/WebCore/page/Frame.cpp
@@ -37,6 +37,7 @@
 #include "CSSPropertyNames.h"
 #include "CachedCSSStyleSheet.h"
 #include "Chrome.h"
+#include "ChromeClient.h"
 #include "DOMWindow.h"
 #include "DocLoader.h"
 #include "DocumentType.h"
@@ -1853,6 +1854,13 @@ IntRect Frame::tiledBackingStoreContentsRect()
         return IntRect();
     return IntRect(IntPoint(), m_view->contentsSize());
 }
+
+IntRect Frame::tiledBackingStoreVisibleRect()
+{
+    if (!m_page)
+        return IntRect();
+    return m_page->chrome()->client()->visibleRectForTiledBackingStore();
+}
 #endif
 
 } // namespace WebCore
diff --git a/src/3rdparty/webkit/WebCore/page/Frame.h b/src/3rdparty/webkit/WebCore/page/Frame.h
index 67761f9..a654cd7 100644
--- a/src/3rdparty/webkit/WebCore/page/Frame.h
+++ b/src/3rdparty/webkit/WebCore/page/Frame.h
@@ -288,6 +288,7 @@ namespace WebCore {
         virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&);
         virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea);
         virtual IntRect tiledBackingStoreContentsRect();
+        virtual IntRect tiledBackingStoreVisibleRect();
 #endif
 
     #if PLATFORM(MAC)
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp
index 6214f1b..f00e792 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp
@@ -129,13 +129,12 @@ void TiledBackingStore::paint(GraphicsContext* context, const IntRect& rect)
     context->restore();
 }
 
-void TiledBackingStore::viewportChanged(const IntRect& contentsViewport)
+void TiledBackingStore::adjustVisibleRect()
 {
-    IntRect viewport = mapFromContents(contentsViewport);
-    if (m_viewport == viewport)
+    IntRect visibleRect = mapFromContents(m_client->tiledBackingStoreVisibleRect());
+    if (m_previousVisibleRect == visibleRect)
         return;
-
-    m_viewport = viewport;
+    m_previousVisibleRect = visibleRect;
 
     startTileCreationTimer();
 }
@@ -177,24 +176,27 @@ void TiledBackingStore::createTiles()
 {
     if (m_contentsFrozen)
         return;
+    
+    IntRect visibleRect = mapFromContents(m_client->tiledBackingStoreVisibleRect());
+    m_previousVisibleRect = visibleRect;
 
-    if (m_viewport.isEmpty())
+    if (visibleRect.isEmpty())
         return;
 
     // Remove tiles that extend outside the current contents rect.
     dropOverhangingTiles();
 
     // FIXME: Make configurable/adapt to memory.
-    IntRect keepRect = m_viewport;
-    keepRect.inflateX(m_viewport.width());
-    keepRect.inflateY(3 * m_viewport.height());
+    IntRect keepRect = visibleRect;
+    keepRect.inflateX(visibleRect.width());
+    keepRect.inflateY(3 * visibleRect.height());
     keepRect.intersect(contentsRect());
     
     dropTilesOutsideRect(keepRect);
     
-    IntRect coverRect = m_viewport;
-    coverRect.inflateX(m_viewport.width() / 2);
-    coverRect.inflateY(2 * m_viewport.height());
+    IntRect coverRect = visibleRect;
+    coverRect.inflateX(visibleRect.width() / 2);
+    coverRect.inflateY(2 * visibleRect.height());
     coverRect.intersect(contentsRect());
     
     // Search for the tile position closest to the viewport center that does not yet contain a tile. 
@@ -211,7 +213,7 @@ void TiledBackingStore::createTiles()
                 continue;
             ++requiredTileCount;
             // Distance is 0 for all currently visible tiles.
-            double distance = tileDistance(m_viewport, currentCoordinate);
+            double distance = tileDistance(visibleRect, currentCoordinate);
             if (distance > shortestDistance)
                 continue;
             if (distance < shortestDistance) {
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.h b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.h
index 8ed4336..d12f191 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.h
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.h
@@ -41,7 +41,7 @@ public:
     TiledBackingStore(TiledBackingStoreClient*);
     ~TiledBackingStore();
 
-    void viewportChanged(const IntRect& viewportRect);
+    void adjustVisibleRect();
     
     float contentsScale() { return m_contentsScale; }
     void setContentsScale(float);
@@ -95,7 +95,7 @@ private:
 
     IntSize m_tileSize;
     
-    IntRect m_viewport;
+    IntRect m_previousVisibleRect;
     float m_contentsScale;
     float m_pendingScale;
 
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStoreClient.h b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStoreClient.h
index 4adbbab..c5845b9 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStoreClient.h
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStoreClient.h
@@ -29,6 +29,7 @@ public:
     virtual void tiledBackingStorePaint(GraphicsContext*, const IntRect&) = 0;
     virtual void tiledBackingStorePaintEnd(const Vector<IntRect>& paintedArea) = 0;
     virtual IntRect tiledBackingStoreContentsRect() = 0;
+    virtual IntRect tiledBackingStoreVisibleRect() = 0;
 };
 
 #else
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 0100b72..69121c8 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -167,10 +167,13 @@ static inline Qt::FillRule toQtFillRule(WindRule rule)
 }
 
 struct TransparencyLayer : FastAllocBase {
-    TransparencyLayer(const QPainter* p, const QRect &rect)
+    TransparencyLayer(const QPainter* p, const QRect &rect, qreal opacity, QPixmap& alphaMask)
         : pixmap(rect.width(), rect.height())
+        , opacity(opacity)
+        , alphaMask(alphaMask)
+        , saveCounter(1) // see the comment for saveCounter
     {
-        offset = rect.topLeft();
+        offset = p->transform().mapRect(rect).topLeft();
         pixmap.fill(Qt::transparent);
         painter.begin(&pixmap);
         painter.setRenderHint(QPainter::Antialiasing, p->testRenderHint(QPainter::Antialiasing));
@@ -182,7 +185,9 @@ struct TransparencyLayer : FastAllocBase {
         painter.setFont(p->font());
         if (painter.paintEngine()->hasFeature(QPaintEngine::PorterDuff))
             painter.setCompositionMode(p->compositionMode());
-        painter.setClipPath(p->clipPath());
+        // if the path is an empty region, this assignment disables all painting
+        if (!p->clipPath().isEmpty())
+            painter.setClipPath(p->clipPath());
     }
 
     TransparencyLayer()
@@ -193,6 +198,11 @@ struct TransparencyLayer : FastAllocBase {
     QPoint offset;
     QPainter painter;
     qreal opacity;
+    // for clipToImageBuffer
+    QPixmap alphaMask;
+    // saveCounter is only used in combination with alphaMask
+    // otherwise, its value is unspecified
+    int saveCounter;
 private:
     TransparencyLayer(const TransparencyLayer &) {}
     TransparencyLayer & operator=(const TransparencyLayer &) { return *this; }
@@ -217,6 +227,9 @@ public:
     bool antiAliasingForRectsAndLines;
 
     QStack<TransparencyLayer*> layers;
+    // Counting real layers. Required by inTransparencyLayer() calls
+    // For example, layers with valid alphaMask are not real layers
+    int layerCount;
     QPainter* redirect;
 
     // reuse this brush for solid color (to prevent expensive QBrush construction)
@@ -235,6 +248,7 @@ private:
 GraphicsContextPlatformPrivate::GraphicsContextPlatformPrivate(QPainter* p)
 {
     painter = p;
+    layerCount = 0;
     redirect = 0;
 
     solidColor = QBrush(Qt::black);
@@ -289,11 +303,17 @@ AffineTransform GraphicsContext::getCTM() const
 
 void GraphicsContext::savePlatformState()
 {
+    if (!m_data->layers.isEmpty() && !m_data->layers.top()->alphaMask.isNull())
+        ++m_data->layers.top()->saveCounter;
     m_data->p()->save();
 }
 
 void GraphicsContext::restorePlatformState()
 {
+    if (!m_data->layers.isEmpty() && !m_data->layers.top()->alphaMask.isNull())
+        if (!--m_data->layers.top()->saveCounter)
+            endTransparencyLayer();
+
     m_data->p()->restore();
 
     if (!m_data->currentPath.isEmpty() && m_common->state.pathTransform.isInvertible()) {
@@ -678,7 +698,7 @@ void GraphicsContext::addPath(const Path& path)
 
 bool GraphicsContext::inTransparencyLayer() const
 {
-    return !m_data->layers.isEmpty();
+    return m_data->layerCount;
 }
 
 PlatformPath* GraphicsContext::currentPath()
@@ -837,10 +857,9 @@ void GraphicsContext::beginTransparencyLayer(float opacity)
     w = int(qBound(qreal(0), deviceClip.width(), (qreal)w) + 2);
     h = int(qBound(qreal(0), deviceClip.height(), (qreal)h) + 2);
 
-    TransparencyLayer * layer = new TransparencyLayer(m_data->p(), QRect(x, y, w, h));
-
-    layer->opacity = opacity;
-    m_data->layers.push(layer);
+    QPixmap emptyAlphaMask;
+    m_data->layers.push(new TransparencyLayer(m_data->p(), QRect(x, y, w, h), opacity, emptyAlphaMask));
+    ++m_data->layerCount;
 }
 
 void GraphicsContext::endTransparencyLayer()
@@ -849,6 +868,12 @@ void GraphicsContext::endTransparencyLayer()
         return;
 
     TransparencyLayer* layer = m_data->layers.pop();
+    if (!layer->alphaMask.isNull()) {
+        layer->painter.resetTransform();
+        layer->painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+        layer->painter.drawPixmap(QPoint(), layer->alphaMask);
+    } else
+        --m_data->layerCount; // see the comment for layerCount
     layer->painter.end();
 
     QPainter* p = m_data->p();
@@ -1086,9 +1111,21 @@ void GraphicsContext::clipOutEllipseInRect(const IntRect& rect)
     }
 }
 
-void GraphicsContext::clipToImageBuffer(const FloatRect&, const ImageBuffer*)
+void GraphicsContext::clipToImageBuffer(const FloatRect& floatRect, const ImageBuffer* image)
 {
-    notImplemented();
+    if (paintingDisabled())
+        return;
+
+    QPixmap* nativeImage = image->image()->nativeImageForCurrentFrame();
+    if (!nativeImage)
+        return;
+
+    IntRect rect(floatRect);
+    QPixmap alphaMask = *nativeImage;
+    if (alphaMask.width() != rect.width() || alphaMask.height() != rect.height())
+        alphaMask = alphaMask.scaled(rect.width(), rect.height());
+
+    m_data->layers.push(new TransparencyLayer(m_data->p(), rect, 1.0, alphaMask));
 }
 
 void GraphicsContext::addInnerRoundedRectClip(const IntRect& rect,
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp
index d831566..eafdcf0 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp
@@ -46,12 +46,19 @@ namespace WebCore {
 
 ImageBufferData::ImageBufferData(const IntSize& size)
     : m_pixmap(size)
+    , m_painter(0)
 {
+    if (m_pixmap.isNull())
+        return;
+
     m_pixmap.fill(QColor(Qt::transparent));
 
-    QPainter* painter = new QPainter(&m_pixmap);
+    QPainter* painter = new QPainter;
     m_painter.set(painter);
 
+    if (!painter->begin(&m_pixmap))
+        return;
+
     // Since ImageBuffer is used mainly for Canvas, explicitly initialize
     // its painter's pen and brush with the corresponding canvas defaults
     // NOTE: keep in sync with CanvasRenderingContext2D::State
@@ -72,8 +79,11 @@ ImageBuffer::ImageBuffer(const IntSize& size, ImageColorSpace, bool& success)
     : m_data(size)
     , m_size(size)
 {
+    success = m_data.m_painter && m_data.m_painter->isActive();
+    if (!success)
+        return;
+
     m_context.set(new GraphicsContext(m_data.m_painter.get()));
-    success = true;
 }
 
 ImageBuffer::~ImageBuffer()
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp
index 4b0c21f..a7351a0 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp
@@ -298,9 +298,10 @@ void Path::addArc(const FloatPoint& p, float r, float sar, float ear, bool antic
         span += ea - sa;
     }
 
-    // connect to the previous point by a straight line
-    m_path.lineTo(QPointF(xc + radius  * cos(sar),
-                          yc - radius  * sin(sar)));
+    // If the path is empty, move to where the arc will start to avoid painting a line from (0,0)
+    // NOTE: QPainterPath::isEmpty() won't work here since it ignores a lone MoveToElement
+    if (!m_path.elementCount())
+        m_path.arcMoveTo(xs, ys, width, height, sa);
 
     m_path.arcTo(xs, ys, width, height, sa, span);
 
diff --git a/src/3rdparty/webkit/WebCore/platform/qt/QWebPageClient.h b/src/3rdparty/webkit/WebCore/platform/qt/QWebPageClient.h
index 467941f..8e48d1f 100644
--- a/src/3rdparty/webkit/WebCore/platform/qt/QWebPageClient.h
+++ b/src/3rdparty/webkit/WebCore/platform/qt/QWebPageClient.h
@@ -89,6 +89,8 @@ public:
 
     virtual QStyle* style() const = 0;
 
+    virtual QRectF graphicsItemVisibleRect() const { return QRectF(); }
+
 protected:
 #ifndef QT_NO_CURSOR
     virtual QCursor cursor() const = 0;
diff --git a/src/3rdparty/webkit/WebKit.pri b/src/3rdparty/webkit/WebKit.pri
index a3ccd9d..921a6e0 100644
--- a/src/3rdparty/webkit/WebKit.pri
+++ b/src/3rdparty/webkit/WebKit.pri
@@ -48,7 +48,12 @@ CONFIG(release, debug|release) {
 }
 
 BASE_DIR = $$PWD
-INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
+
+symbian {
+    INCLUDEPATH += $$PWD/include/QtWebKit
+} else {
+    INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
+}
 
 CONFIG -= warn_on
 *-g++*:QMAKE_CXXFLAGS += -Wall -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
index 75a23d9..7a25646 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp
@@ -127,7 +127,7 @@ public:
 #endif
 
     void updateResizesToContentsForPage();
-    QRectF graphicsItemVisibleRect() const;
+    virtual QRectF graphicsItemVisibleRect() const;
 #if ENABLE(TILED_BACKING_STORE)
     void updateTiledBackingStoreScale();
 #endif
@@ -597,12 +597,7 @@ void QGraphicsWebView::paint(QPainter* painter, const QStyleOptionGraphicsItem*
 #if ENABLE(TILED_BACKING_STORE)
     if (WebCore::TiledBackingStore* backingStore = QWebFramePrivate::core(page()->mainFrame())->tiledBackingStore()) {
         // FIXME: We should set the backing store viewport earlier than in paint
-        if (d->resizesToContents)
-            backingStore->viewportChanged(WebCore::IntRect(d->graphicsItemVisibleRect()));
-        else {
-            QRectF visibleRect(d->page->mainFrame()->scrollPosition(), d->page->mainFrame()->geometry().size());
-            backingStore->viewportChanged(WebCore::IntRect(visibleRect));
-        }
+        backingStore->adjustVisibleRect();
         // QWebFrame::render is a public API, bypass it for tiled rendering so behavior does not need to change.
         WebCore::GraphicsContext context(painter); 
         page()->mainFrame()->d->renderFromTiledBackingStore(&context, option->exposedRect.toAlignedRect());
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
index 44cc3b5..721aaa6 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.cpp
@@ -275,8 +275,9 @@ void QWEBKIT_EXPORT qt_drt_evaluateScriptInIsolatedWorld(QWebFrame* qFrame, int
         JSC::JSValue result = frame->script()->executeScriptInWorld(mainThreadNormalWorld(), script, true).jsValue();
 }
 
-static bool webframe_scrollOverflow(WebCore::Frame* frame, int dx, int dy, const QPoint& pos)
+bool QWEBKIT_EXPORT qtwebkit_webframe_scrollOverflow(QWebFrame* qFrame, int dx, int dy, const QPoint& pos)
 {
+    WebCore::Frame* frame = QWebFramePrivate::core(qFrame);
     if (!frame || !frame->document() || !frame->view() || !frame->eventHandler())
         return false;
 
@@ -299,17 +300,24 @@ static bool webframe_scrollOverflow(WebCore::Frame* frame, int dx, int dy, const
     bool scrolledHorizontal = false;
     bool scrolledVertical = false;
 
-    if (dx > 0)
-        scrolledHorizontal = renderLayer->scroll(ScrollRight, ScrollByPixel, dx);
-    else if (dx < 0)
-        scrolledHorizontal = renderLayer->scroll(ScrollLeft, ScrollByPixel, qAbs(dx));
+    do {
+        if (dx > 0)
+            scrolledHorizontal = renderLayer->scroll(ScrollRight, ScrollByPixel, dx);
+        else if (dx < 0)
+            scrolledHorizontal = renderLayer->scroll(ScrollLeft, ScrollByPixel, qAbs(dx));
+
+        if (dy > 0)
+            scrolledVertical = renderLayer->scroll(ScrollDown, ScrollByPixel, dy);
+        else if (dy < 0)
+            scrolledVertical = renderLayer->scroll(ScrollUp, ScrollByPixel, qAbs(dy));
 
-    if (dy > 0)
-        scrolledVertical = renderLayer->scroll(ScrollDown, ScrollByPixel, dy);
-    else if (dy < 0)
-        scrolledVertical = renderLayer->scroll(ScrollUp, ScrollByPixel, qAbs(dy));
+        if (scrolledHorizontal || scrolledVertical)
+            return true;
 
-    return (scrolledHorizontal || scrolledVertical);
+        renderLayer = renderLayer->parent();
+    } while (renderLayer);
+
+    return false;
 }
 
 
@@ -325,7 +333,7 @@ void QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int d
     if (!qFrame)
         return;
 
-    if (webframe_scrollOverflow(QWebFramePrivate::core(qFrame), dx, dy, pos))
+    if (qtwebkit_webframe_scrollOverflow(qFrame, dx, dy, pos))
         return;
 
     bool scrollHorizontal = false;
@@ -339,7 +347,7 @@ void QWEBKIT_EXPORT qtwebkit_webframe_scrollRecursively(QWebFrame* qFrame, int d
 
         if (dy > 0)  // scroll down
             scrollVertical = qFrame->scrollBarValue(Qt::Vertical) < qFrame->scrollBarMaximum(Qt::Vertical);
-            else if (dy < 0) //scroll up
+        else if (dy < 0) //scroll up
             scrollVertical = qFrame->scrollBarValue(Qt::Vertical) > qFrame->scrollBarMinimum(Qt::Vertical);
 
         if (scrollHorizontal || scrollVertical) {
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp
index d852012..06e6cfa 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp
@@ -540,6 +540,8 @@ QDataStream& operator>>(QDataStream& source, QWebHistory& history)
                 d->lst->addItem(item);
             }
             d->lst->removeItem(nullItem);
+            // Update the HistoryController.
+            history.d->lst->page()->mainFrame()->loader()->history()->setCurrentItem(history.d->lst->entries()[currentIndex].get());
             history.goToItem(history.itemAt(currentIndex));
         }
     }
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index c5f508f..44bd902 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -1518,7 +1518,7 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const
                     RefPtr<Range> range = editor->compositionRange();
                     return QVariant(renderTextControl->selectionEnd() - TextIterator::rangeLength(range.get()));
                 }
-                return QVariant(renderTextControl->selectionEnd());
+                return QVariant(frame->selection()->extent().offsetInContainerNode());
             }
             return QVariant();
         }
@@ -1550,7 +1550,7 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const
                     RefPtr<Range> range = editor->compositionRange();
                     return QVariant(renderTextControl->selectionStart() - TextIterator::rangeLength(range.get()));
                 }
-                return QVariant(renderTextControl->selectionStart());
+                return QVariant(frame->selection()->base().offsetInContainerNode());
             }
             return QVariant();
         }
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
index 115f9fc..81823f6 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp
@@ -74,7 +74,6 @@ public:
     QString localStoragePath;
     QString offlineWebApplicationCachePath;
     qint64 offlineStorageDefaultQuota;
-    QUrl inspectorLocation;
 
     void apply();
     WebCore::Settings* settings;
@@ -1011,31 +1010,6 @@ void QWebSettings::setLocalStoragePath(const QString& path)
 }
 
 /*!
-    \since 4.7
-
-    Specifies the \a location of a frontend to load with each web page when using Web Inspector.
-
-    \sa inspectorUrl()
-*/
-void QWebSettings::setInspectorUrl(const QUrl& location)
-{
-    d->inspectorLocation = location;
-    d->apply();
-}
-
-/*!
-    \since 4.7
-
-    Returns the location of the Web Inspector frontend.
-
-    \sa setInspectorUrl()
-*/
-QUrl QWebSettings::inspectorUrl() const
-{
-    return d->inspectorLocation;
-}
-
-/*!
     \since 4.6
 
     Returns the path for HTML5 local storage.
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
index 3592e2c..b978f5e 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h
@@ -136,9 +136,6 @@ public:
     void setLocalStoragePath(const QString& path);
     QString localStoragePath() const; 
 
-    void setInspectorUrl(const QUrl &location);
-    QUrl inspectorUrl() const;
-
     static void clearMemoryCaches();
 
     static void enablePersistentStorage(const QString& path = QString());
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index efc8f27..2f87c7b 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,132 @@
+2010-05-21  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Symbian build fix.
+
+        [Qt] Updated the wins def file with one new export.
+
+        The DRT symbols are still missing, but I can't build DRT ;(
+
+        * symbian/bwins/QtWebKitu.def:
+
+2010-05-12  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        Add a comment to explain the web inspector dynamic property url hook
+        and that it's there on purpose :)
+
+        https://bugs.webkit.org/show_bug.cgi?id=35340
+
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+
+2010-05-06  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Replace public inspector url with private property for QtLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=35340
+
+        Replace the public API with a private dynamic property until this feature
+        is ready.
+
+        * Api/qwebsettings.cpp:
+        * Api/qwebsettings.h:
+        * WebCoreSupport/InspectorClientQt.cpp:
+        (WebCore::InspectorClientQt::openInspectorFrontend):
+        * symbian/bwins/QtWebKitu.def:
+        * symbian/eabi/QtWebKitu.def:
+
+2010-05-20  Luiz Agostini  <luiz.agostini@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Skipping popup focus test for maemo
+        https://bugs.webkit.org/show_bug.cgi?id=39314
+
+        Skipping popup focus test for maemo in qwebframe auto test.
+
+        The test method tst_QWebFrame::popupFocus() was testing popup focus AND input
+        field focus. The input field focus has been removed from the method popupFocus()
+        and a new test method named inputFieldFocus() has been added. Finally the test 
+        method popupFocus() has been skipped for maemo.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+
+2010-05-20  Rajiv Ramanasankaran  <rajiv.ramanasankaran@nokia.com>
+
+        Reviewed by Simon Hausmann.
+        
+        [Qt] QWebPage::inputMethodQuery() returns wrong values for Qt::ImCursorPosition, Qt::ImAnchorPosition
+        https://bugs.webkit.org/show_bug.cgi?id=38779
+
+        The earlier implementation was written with the assumption that in this scenario the 
+        anchor position always corresponds to the START index and that the current cursor position
+        always corresponds to the END index in WebKit.
+
+        Updated the implementation of QWebPage::inputMethodQuery(Qt::ImCursorPosition) and 
+        QWebPage::inputMethodQuery(Qt::ImAnchorPosition) for the case where the Editor is not in
+        composition mode. In the non-composition mode, the Anchor and the Current cursor positions
+        correspond to the Base and Extent position offsets in WebKit.
+
+        Also added the auto-tests for the RIGHT to LEFT and LEFT to RIGHT selections.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::inputMethodQuery): Now returning correct values for Qt::ImCursorPosition and
+        Qt::ImAnchorPosition when the Editor is not in composition mode. 
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods): Added auto-tests for RIGHT to LEFT and LEFT to RIGHT selections
+
+2010-05-12  Joe Ligman  <joseph.ligman@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Nested overflow div does not scroll
+        https://bugs.webkit.org/show_bug.cgi?id=38641
+
+        Modify qtwebkit_webframe_scrollOverflow, if the current node's render layer
+        does not scroll it will try and scroll the parent's render layer. Also export
+        qtwebkit_webframe_scrollOverflow so we can use it independently of
+        qtwebkit_webframe_scrollRecursively
+
+        * Api/qwebframe.cpp:
+        (qtwebkit_webframe_scrollOverflow):
+        (qtwebkit_webframe_scrollRecursively):
+
+2010-05-17  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39218
+        [Qt] Tiled backing store tiles sometimes flicker when exiting a zoom animation
+        
+        Tiles sometimes flicker when exiting a zoom animation. This happens as a result
+        of the visible rectangle being momentarily out of sync.
+        
+        Instead of updating the visible rect by explicitly setting it, pull it through
+        the client and recompute in WebKit the level.
+
+        * Api/qgraphicswebview.cpp:
+        (QGraphicsWebView::paint):
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::visibleRectForTiledBackingStore):
+        * WebCoreSupport/ChromeClientQt.h:
+
+2010-05-18  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Fix QWebHistory serialization.
+
+        Regression was caused by bug 33224. The streaming function
+        should generate a documentSequenceNumber for all loaded values.
+
+        [Qt] tst_QWebHistory::serialize_2() fails
+        https://bugs.webkit.org/show_bug.cgi?id=37322
+
+        * Api/qwebhistory.cpp:
+        (operator>>):
+
 2010-05-14  Kent Hansen <kent.hansen@nokia.com>, Jocelyn Turcotte <jocelyn.turcotte@nokia.com>, Tor Arne Vestbø <tor.arne.vestbo@nokia.com>, Henry Haverinen <henry.haverinen@nokia.com>, Jedrzej Nowacki <jedrzej.nowacki@nokia.com>, Andreas Kling <andreas.kling@nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index 9eb10d6..4e742fc 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -559,6 +559,15 @@ bool ChromeClientQt::allowsAcceleratedCompositing() const
 }
 
 #endif
+    
+#if ENABLE(TILED_BACKING_STORE)
+IntRect ChromeClientQt::visibleRectForTiledBackingStore() const
+{ 
+    if (!platformPageClient())
+        return IntRect();
+    return enclosingIntRect(FloatRect(platformPageClient()->graphicsItemVisibleRect()));
+}
+#endif
 
 QtAbstractWebPopup* ChromeClientQt::createSelectPopup()
 {
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h
index f0a7c8c..a47adf0 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -140,6 +140,10 @@ namespace WebCore {
         virtual bool allowsAcceleratedCompositing() const;
 #endif
 
+#if ENABLE(TILED_BACKING_STORE)
+        virtual IntRect visibleRectForTiledBackingStore() const;
+#endif
+
 #if ENABLE(TOUCH_EVENTS)
         virtual void needTouchEvents(bool) { }
 #endif
diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
index 7fabbda..725c5fb 100644
--- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp
@@ -88,12 +88,17 @@ void InspectorClientQt::openInspectorFrontend(WebCore::InspectorController*)
     InspectorClientWebPage* inspectorPage = new InspectorClientWebPage(inspectorView);
     inspectorView->setPage(inspectorPage);
 
-    QUrl inspectorUrl = m_inspectedWebPage->settings()->inspectorUrl();
+    QWebInspector* inspector = m_inspectedWebPage->d->getOrCreateInspector();
+    // This is a known hook that allows changing the default URL for the
+    // Web inspector. This is used for SDK purposes. Please keep this hook
+    // around and don't remove it.
+    // https://bugs.webkit.org/show_bug.cgi?id=35340
+    QUrl inspectorUrl = inspector->property("_q_inspectorUrl").toUrl();
     if (!inspectorUrl.isValid())
         inspectorUrl = QUrl("qrc:/webkit/inspector/inspector.html");
     inspectorView->page()->mainFrame()->load(inspectorUrl);
     m_inspectedWebPage->d->inspectorFrontend = inspectorView;
-    m_inspectedWebPage->d->getOrCreateInspector()->d->setFrontend(inspectorView);
+    inspector->d->setFrontend(inspectorView);
 
     inspectorView->page()->d->page->inspectorController()->setInspectorFrontendClient(new InspectorFrontendClientQt(m_inspectedWebPage, inspectorView));
 }
diff --git a/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def b/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def
index 910ba8f..969defe 100644
--- a/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def
+++ b/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def
@@ -625,7 +625,7 @@ EXPORTS
 	?qt_suspendActiveDOMObjects@@YAXPAVQWebFrame@@@Z @ 624 NONAME ; void qt_suspendActiveDOMObjects(class QWebFrame *)
 	?qtwebkit_webframe_scrollRecursively@@YA_NPAVQWebFrame@@HH@Z @ 625 NONAME ABSENT ; bool qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int)
 	?closeEvent@QWebInspector@@MAEXPAVQCloseEvent@@@Z @ 626 NONAME ; void QWebInspector::closeEvent(class QCloseEvent *)
-	?inspectorUrl@QWebSettings@@QBE?AVQUrl@@XZ @ 627 NONAME ; class QUrl QWebSettings::inspectorUrl(void) const
+	?inspectorUrl@QWebSettings@@QBE?AVQUrl@@XZ @ 627 NONAME ABSENT ; class QUrl QWebSettings::inspectorUrl(void) const
 	?isTiledBackingStoreFrozen@QGraphicsWebView@@QBE_NXZ @ 628 NONAME ; bool QGraphicsWebView::isTiledBackingStoreFrozen(void) const
 	?pageChanged@QWebFrame@@IAEXXZ @ 629 NONAME ; void QWebFrame::pageChanged(void)
 	?qt_drt_enableCaretBrowsing@@YAXPAVQWebPage@@_N@Z @ 630 NONAME ; void qt_drt_enableCaretBrowsing(class QWebPage *, bool)
@@ -646,7 +646,8 @@ EXPORTS
 	?qtwebkit_webframe_scrollRecursively@@YAXPAVQWebFrame@@HHABVQPoint@@@Z @ 645 NONAME ; void qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int, class QPoint const &)
 	?resizesToContents@QGraphicsWebView@@QBE_NXZ @ 646 NONAME ; bool QGraphicsWebView::resizesToContents(void) const
 	?scrollToAnchor@QWebFrame@@QAEXABVQString@@@Z @ 647 NONAME ; void QWebFrame::scrollToAnchor(class QString const &)
-	?setInspectorUrl@QWebSettings@@QAEXABVQUrl@@@Z @ 648 NONAME ; void QWebSettings::setInspectorUrl(class QUrl const &)
+	?setInspectorUrl@QWebSettings@@QAEXABVQUrl@@@Z @ 648 NONAME ABSENT ; void QWebSettings::setInspectorUrl(class QUrl const &)
 	?setResizesToContents@QGraphicsWebView@@QAEX_N@Z @ 649 NONAME ; void QGraphicsWebView::setResizesToContents(bool)
 	?setTiledBackingStoreFrozen@QGraphicsWebView@@QAEX_N@Z @ 650 NONAME ; void QGraphicsWebView::setTiledBackingStoreFrozen(bool)
+	?qtwebkit_webframe_scrollOverflow@@YA_NPAVQWebFrame@@HHABVQPoint@@@Z @ 651 NONAME ; bool qtwebkit_webframe_scrollOverflow(QWebFrame *, int, int, const QPoint&)
 
diff --git a/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def b/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
index ca462d0..e0f2125 100644
--- a/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
+++ b/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
@@ -712,11 +712,61 @@ EXPORTS
 	_Z47qt_drt_setDomainRelaxationForbiddenForURLSchemebRK7QString @ 711 NONAME
 	_ZN9QWebFrame11pageChangedEv @ 712 NONAME
 	_ZN9QWebFrame14scrollToAnchorERK7QString @ 713 NONAME
-	_ZN12QWebSettings15setInspectorUrlERK4QUrl @ 714 NONAME
+	_ZN12QWebSettings15setInspectorUrlERK4QUrl @ 714 NONAME ABSENT
 	_ZN13QWebInspector10closeEventEP11QCloseEvent @ 715 NONAME
 	_ZN16QGraphicsWebView26setTiledBackingStoreFrozenEb @ 716 NONAME
 	_ZNK16QGraphicsWebView25isTiledBackingStoreFrozenEv @ 717 NONAME
 	_Z18qt_wrt_setViewModeP8QWebPageRK7QString @ 718 NONAME ABSENT
 	_Z19qt_drt_setMediaTypeP9QWebFrameRK7QString @ 719 NONAME
 	_Z26qt_drt_enableCaretBrowsingP8QWebPageb @ 720 NONAME
-	_ZNK12QWebSettings12inspectorUrlEv @ 721 NONAME
+	_ZNK12QWebSettings12inspectorUrlEv @ 721 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt19webPageSetGroupNameEP8QWebPageRK7QString @ 722 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt16webPageGroupNameEP8QWebPage @ 723 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt23garbageCollectorCollectEv @ 724 NONAME ABSENT
+	_Z32qtwebkit_webframe_scrollOverflowP9QWebFrameiiRK6QPoint @ 725 NONAME
+	_ZN23DumpRenderTreeSupportQt12setMediaTypeEP9QWebFrameRK7QString @ 726 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt13numberOfPagesEP9QWebFrameff @ 727 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt13selectedRangeEP8QWebPage @ 728 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt14clearFrameNameEP9QWebFrame @ 729 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt14pauseAnimationEP9QWebFrameRK7QStringdS4_ @ 730 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt15dumpFrameLoaderEb @ 731 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt16dumpNotificationEb @ 732 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt16isCommandEnabledEP8QWebPageRK7QString @ 733 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt16webInspectorShowEP8QWebPage @ 734 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt17pauseSVGAnimationEP9QWebFrameRK7QStringdS4_ @ 735 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt17webInspectorCloseEP8QWebPage @ 736 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt17workerThreadCountEv @ 737 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt18hasDocumentElementEP9QWebFrame @ 738 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt20dumpEditingCallbacksEb @ 739 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt21markerTextForListItemERK11QWebElement @ 740 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt22javaScriptObjectsCountEv @ 741 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt23setCaretBrowsingEnabledEP8QWebPageb @ 742 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt24executeCoreCommandByNameEP8QWebPageRK7QStringS4_ @ 743 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt21dumpSetAcceptsEditingEb @744 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt22resumeActiveDOMObjectsEP9QWebFrame @745 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt23suspendActiveDOMObjectsEP9QWebFrame @746 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt24numberOfActiveAnimationsEP9QWebFrame @747 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt24pageNumberForElementByIdEP9QWebFrameRK7QStringff @748 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt25dumpResourceLoadCallbacksEb @749 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt25pauseTransitionOfPropertyEP9QWebFrameRK7QStringdS4_ @750 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt25setFrameFlatteningEnabledEP8QWebPageb @751 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt25webInspectorExecuteScriptEP8QWebPagelRK7QString @752 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt25whiteListAccessFromOriginERK7QStringS2_S2_b @753 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt26counterValueForElementByIdEP9QWebFrameRK7QString @754 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt26firstRectForCharacterRangeEP8QWebPageii @755 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt26overwritePluginDirectoriesEv @756 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt27resetOriginAccessWhiteListsEv @757 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt27setSmartInsertDeleteEnabledEP8QWebPageb @758 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt27setTimelineProfilingEnabledEP8QWebPageb @759 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt28setDumpRenderTreeModeEnabledEb @760 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt29dumpResourceLoadCallbacksPathERK7QString @761 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt29evaluateScriptInIsolatedWorldEP9QWebFrameiRK7QString @762 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt29setJavaScriptProfilingEnabledEP9QWebFrameb @763 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt29setWillSendRequestReturnsNullEb @764 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt30setWillSendRequestClearHeadersERK11QStringList @765 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt33computedStyleIncludingVisitedInfoERK11QWebElement @766 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt34setSelectTrailingWhitespaceEnabledEP8QWebPageb @767 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt39elementDoesAutoCompleteForElementWithIdEP9QWebFrameRK7QString @768 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt39setWillSendRequestReturnsNullOnRedirectEb @769 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt40garbageCollectorCollectOnAlternateThreadEb @770 NONAME ABSENT
+	_ZN23DumpRenderTreeSupportQt40setDomainRelaxationForbiddenForURLSchemeEbRK7QString @771 NONAME ABSENT
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index bea7a67..c53a42d 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -600,7 +600,12 @@ private slots:
     void setHtmlWithBaseURL();
     void ipv6HostEncoding();
     void metaData();
+#if !defined(Q_WS_MAEMO_5)
+    // as maemo 5 does not use QComboBoxes to implement the popups
+    // this test does not make sense for it.
     void popupFocus();
+#endif
+    void inputFieldFocus();
     void hitTestContent();
     void jsByteArray();
     void ownership();
@@ -686,13 +691,13 @@ private:
     QWebView* m_view;
     QWebPage* m_page;
     MyQObject* m_myObject;
-    QWebView* m_popupTestView;
-    int m_popupTestPaintCount;
+    QWebView* m_inputFieldsTestView;
+    int m_inputFieldTestPaintCount;
 };
 
 tst_QWebFrame::tst_QWebFrame()
     : sTrue("true"), sFalse("false"), sUndefined("undefined"), sArray("array"), sFunction("function"), sError("error"),
-        sString("string"), sObject("object"), sNumber("number"), m_popupTestView(0), m_popupTestPaintCount(0)
+        sString("string"), sObject("object"), sNumber("number"), m_inputFieldsTestView(0), m_inputFieldTestPaintCount(0)
 {
 }
 
@@ -702,10 +707,10 @@ tst_QWebFrame::~tst_QWebFrame()
 
 bool tst_QWebFrame::eventFilter(QObject* watched, QEvent* event)
 {
-    // used on the popupFocus test
-    if (watched == m_popupTestView) {
+    // used on the inputFieldFocus test
+    if (watched == m_inputFieldsTestView) {
         if (event->type() == QEvent::Paint)
-            m_popupTestPaintCount++;
+            m_inputFieldTestPaintCount++;
     }
     return QObject::eventFilter(watched, event);
 }
@@ -2549,6 +2554,7 @@ void tst_QWebFrame::metaData()
     QCOMPARE(metaData.value("nonexistant"), QString());
 }
 
+#if !defined(Q_WS_MAEMO_5)
 void tst_QWebFrame::popupFocus()
 {
     QWebView view;
@@ -2580,16 +2586,27 @@ void tst_QWebFrame::popupFocus()
     // hide the popup and check if focus is on the page
     combo->hidePopup();
     QTRY_VERIFY(view.hasFocus() && !combo->view()->hasFocus()); // Focus should be back on the WebView
+}
+#endif
+
+void tst_QWebFrame::inputFieldFocus()
+{
+    QWebView view;
+    view.setHtml("<html><body><input type=\"text\"></input></body></html>");
+    view.resize(400, 100);
+    view.show();
+    view.setFocus();
+    QTRY_VERIFY(view.hasFocus());
 
     // double the flashing time, should at least blink once already
     int delay = qApp->cursorFlashTime() * 2;
 
     // focus the lineedit and check if it blinks
-    QTest::mouseClick(&view, Qt::LeftButton, 0, QPoint(200, 25));
-    m_popupTestView = &view;
+    QTest::mouseClick(&view, Qt::LeftButton, 0, QPoint(25, 25));
+    m_inputFieldsTestView = &view;
     view.installEventFilter( this );
     QTest::qWait(delay);
-    QVERIFY2(m_popupTestPaintCount >= 3,
+    QVERIFY2(m_inputFieldTestPaintCount >= 3,
              "The input field should have a blinking caret");
 }
 
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 12fb9b3..52dc6bb 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -1492,6 +1492,98 @@ void tst_QWebPage::inputMethods()
     QCOMPARE(value, QString("QtWebKit"));
 #endif
 
+    // Cancel current composition first
+    inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 0, 0, QVariant());
+    QInputMethodEvent eventSelection4("", inputAttributes);
+    page->event(&eventSelection4);
+
+    // START - Tests for Selection when the Editor is NOT in Composition mode
+
+    // LEFT to RIGHT selection
+    // Deselect the selection by sending MouseButtonPress events
+    // This moves the current cursor to the end of the text
+    page->event(&evpres);
+    page->event(&evrel);
+
+    //Move to the start of the line
+    page->triggerAction(QWebPage::MoveToStartOfLine);
+
+    QKeyEvent keyRightEventPress(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier);
+    QKeyEvent keyRightEventRelease(QEvent::KeyRelease, Qt::Key_Right, Qt::NoModifier);
+
+    //Move 2 characters RIGHT
+    for (int j = 0; j < 2; ++j) {
+        page->event(&keyRightEventPress);
+        page->event(&keyRightEventRelease);
+    }
+
+    //Select to the end of the line
+    page->triggerAction(QWebPage::SelectEndOfLine);
+
+    //ImAnchorPosition QtWebKit
+    variant = page->inputMethodQuery(Qt::ImAnchorPosition);
+    anchorPosition =  variant.toInt();
+    QCOMPARE(anchorPosition, 2);
+
+    //ImCursorPosition
+    variant = page->inputMethodQuery(Qt::ImCursorPosition);
+    cursorPosition =  variant.toInt();
+    QCOMPARE(cursorPosition, 8);
+
+    //ImCurrentSelection
+    variant = page->inputMethodQuery(Qt::ImCurrentSelection);
+    selectionValue = variant.value<QString>();
+    QCOMPARE(selectionValue, QString("WebKit"));
+
+    //RIGHT to LEFT selection
+    //Deselect the selection (this moves the current cursor to the end of the text)
+    page->event(&evpres);
+    page->event(&evrel);
+
+    //ImAnchorPosition
+    variant = page->inputMethodQuery(Qt::ImAnchorPosition);
+    anchorPosition =  variant.toInt();
+    QCOMPARE(anchorPosition, 8);
+
+    //ImCursorPosition
+    variant = page->inputMethodQuery(Qt::ImCursorPosition);
+    cursorPosition =  variant.toInt();
+    QCOMPARE(cursorPosition, 8);
+
+    //ImCurrentSelection
+    variant = page->inputMethodQuery(Qt::ImCurrentSelection);
+    selectionValue = variant.value<QString>();
+    QCOMPARE(selectionValue, QString(""));
+
+    QKeyEvent keyLeftEventPress(QEvent::KeyPress, Qt::Key_Left, Qt::NoModifier);
+    QKeyEvent keyLeftEventRelease(QEvent::KeyRelease, Qt::Key_Left, Qt::NoModifier);
+
+    //Move 2 characters LEFT
+    for (int i = 0; i < 2; ++i) {
+        page->event(&keyLeftEventPress);
+        page->event(&keyLeftEventRelease);
+    }
+
+    //Select to the start of the line
+    page->triggerAction(QWebPage::SelectStartOfLine);
+
+    //ImAnchorPosition
+    variant = page->inputMethodQuery(Qt::ImAnchorPosition);
+    anchorPosition =  variant.toInt();
+    QCOMPARE(anchorPosition, 6);
+
+    //ImCursorPosition
+    variant = page->inputMethodQuery(Qt::ImCursorPosition);
+    cursorPosition =  variant.toInt();
+    QCOMPARE(cursorPosition, 0);
+
+    //ImCurrentSelection
+    variant = page->inputMethodQuery(Qt::ImCurrentSelection);
+    selectionValue = variant.value<QString>();
+    QCOMPARE(selectionValue, QString("QtWebK"));
+
+    //END - Tests for Selection when the Editor is not in Composition mode
+
     //ImhHiddenText
     QMouseEvent evpresPassword(QEvent::MouseButtonPress, inputs.at(1).geometry().center(), Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
     page->event(&evpresPassword);
-- 
cgit v0.12


From 7c33aef69f59f92c9efbe43368aba33d6391be0c Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 25 May 2010 10:03:00 +0200
Subject: Revert "tst_bic: make it possible to test for cross-compilation"

This reverts commit b5f1a55c3112f46f27e2306fac7d93bde96152e6.
---
 tests/auto/bic/gen.sh      |  2 +-
 tests/auto/bic/tst_bic.cpp | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/auto/bic/gen.sh b/tests/auto/bic/gen.sh
index 7bcad24..8005880 100755
--- a/tests/auto/bic/gen.sh
+++ b/tests/auto/bic/gen.sh
@@ -56,7 +56,7 @@ fi
 
 for module in $modules; do
     echo "#include <$module/$module>" >test.cpp
-    ${CXX-g++} $CXXFLAGS -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp
+    g++ -c -I$QTDIR/include -DQT_NO_STL -DQT3_SUPPORT -fdump-class-hierarchy test.cpp
     mv test.cpp*.class $module.$2.txt
     # Remove template classes from the output
     perl -pi -e '$skip = 1 if (/^(Class|Vtable).*</);
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index 504512d..400fcc1 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -178,17 +178,13 @@ void tst_Bic::sizesAndVTables_data()
     QSKIP("Test not implemented for this compiler/platform", SkipAll);
 #else
 
-#if defined(FILESUFFIX)
-    // cross-testing
-#elif defined Q_OS_LINUX && defined Q_WS_X11
+#if defined Q_OS_LINUX && defined Q_WS_X11
 # if defined(__powerpc__) && !defined(__powerpc64__)
 #  define FILESUFFIX "linux-gcc-ppc32"
 # elif defined(__amd64__)
 #  define FILESUFFIX "linux-gcc-amd64"
 # elif defined(__i386__)
 #  define FILESUFFIX "linux-gcc-ia32"
-# elif defined(__ARMEL__)
-#  define FILESUFFIX "linux-gcc-armel"
 # endif
 #elif defined Q_OS_MAC && defined(__powerpc__)
 #  define FILESUFFIX "macx-gcc-ppc32"
@@ -237,11 +233,9 @@ QBic::Info tst_Bic::getCurrentInfo(const QString &libName)
 #ifdef Q_OS_WIN
     qtDir.replace('\\', '/');
 #endif
-    QString compilerName = QString::fromLocal8Bit(qgetenv("CXX"));
-    if (compilerName.isEmpty())
-        compilerName = "g++";
+    QString compilerName = "g++";
 
-    QStringList args = QString::fromLocal8Bit(qgetenv("CXXFLAGS")).split(' ');
+    QStringList args;
     args << "-c"
          << "-I" + qtDir + "/include"
 #ifdef Q_OS_MAC
-- 
cgit v0.12


From 0a0b37fe0fd1e0152766e3924fdea00427420e39 Mon Sep 17 00:00:00 2001
From: Pino Toscano <toscano.pino@tiscali.it>
Date: Tue, 25 May 2010 10:46:39 +0200
Subject: Fix architecture detection on GNU/Hurd.

On GNU/Hurd, `uname -m` returns a string like "i686-AT386", which is not recognized.
Instead, do a specific mangling on "GNU" host, the same done by autotools' config.guess,
so the architecture can be identified and the proper atomic primitives used.

Merge-request: 638
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 configure | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/configure b/configure
index f2023b8..0111f51 100755
--- a/configure
+++ b/configure
@@ -2755,6 +2755,17 @@ fi
 
 if [ -z "${CFG_HOST_ARCH}" ]; then
     case "$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_MACHINE" in
+    GNU:*:*)
+        CFG_HOST_ARCH=`echo ${UNAME_MACHINE} | sed -e 's,[-/].*$,,'`
+        case "$CFG_HOST_ARCH" in
+            i?86)
+                CFG_HOST_ARCH=i386
+                ;;
+        esac
+        if [ "$OPT_VERBOSE" = "yes" ]; then
+            echo "    GNU/Hurd ($CFG_HOST_ARCH)"
+        fi
+        ;;
     IRIX*:*:*)
         CFG_HOST_ARCH=`uname -p`
         if [ "$OPT_VERBOSE" = "yes" ]; then
-- 
cgit v0.12


From d9e41640dcbd7a5f5f9d7afb1024e1c4f6672f6e Mon Sep 17 00:00:00 2001
From: John Brooks <special@dereferenced.net>
Date: Tue, 25 May 2010 10:51:39 +0200
Subject: Added MSVC 2010 project files to .gitignore

Merge-request: 2394
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 04f6e7e..4e3b130 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,6 +131,8 @@ qrc_*.cpp
 *.vcproj
 *vcproj.*.*.user
 *.ncb
+*.vcxproj
+*.vcxproj.filters
 
 # MinGW generated files
 *.Debug
-- 
cgit v0.12


From 4fe5f175f07212194a8aa64c9d4622f8b8c44e71 Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
Date: Tue, 25 May 2010 11:54:28 +0300
Subject: Fix for QRuntimePixmapData serial number setting.

Generate serial number in the same way as X11 and Mac.
Fixes OSX x64 build problem.

Reviewed-by: Jason Barron
---
 src/gui/painting/qgraphicssystem_runtime.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index ceb16ed..1c5d944 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -50,6 +50,8 @@
 
 QT_BEGIN_NAMESPACE
 
+static int qt_pixmap_serial = 0;
+
 #define READBACK(f)                                         \
     m_graphicsSystem->decreaseMemoryUsage(memoryUsage());   \
     f                                                       \
@@ -89,7 +91,7 @@ private:
 QRuntimePixmapData::QRuntimePixmapData(const QRuntimeGraphicsSystem *gs, PixelType type)
         : QPixmapData(type, RuntimeClass), m_graphicsSystem(gs)
 {
-    setSerialNumber((int)this);
+    setSerialNumber(++qt_pixmap_serial);
 }
 
 QRuntimePixmapData::~QRuntimePixmapData()
-- 
cgit v0.12


From 9a3d28dda6ddc1b275de3e3256462870d9078e21 Mon Sep 17 00:00:00 2001
From: Fathi Boudra <fabo@debian.org>
Date: Tue, 25 May 2010 11:52:45 +0200
Subject: QTBUG-5955: Qt fails to build on alpha architecture  - add alpha
 platform support based on JavaScriptCore from src/3rdparty/webkit copy.  -
 fix invalid type conversions on alpha architecture.

Merge-request: 640
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
 src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h |  7 ++++++-
 src/corelib/arch/qatomic_alpha.h                          | 12 ++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
index be74e2a..5e15480 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
@@ -317,6 +317,11 @@
 #define WTF_PLATFORM_X86_64 1
 #endif
 
+/* PLATFORM(ALPHA) */
+#if defined(__alpha__)
+#define WTF_PLATFORM_ALPHA 1
+#endif
+
 /* PLATFORM(SH4) */
 #if defined(__SH4__)
 #define WTF_PLATFORM_SH4 1
@@ -720,7 +725,7 @@
 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
 #if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX))
 #define WTF_USE_JSVALUE64 1
-#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64)
+#elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA)
 #define WTF_USE_JSVALUE64 1
 #elif PLATFORM(AIX64)
 #define WTF_USE_JSVALUE64 1
diff --git a/src/corelib/arch/qatomic_alpha.h b/src/corelib/arch/qatomic_alpha.h
index 5d0b2b6..6989c25 100644
--- a/src/corelib/arch/qatomic_alpha.h
+++ b/src/corelib/arch/qatomic_alpha.h
@@ -367,7 +367,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelease(T *expectedValu
 template <typename T>
 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
 {
-    register void *old, *tmp;
+    register T *old, *tmp;
     asm volatile("1:\n"
                  "ldq_l %0,%2\n"   /* old=*ptr;                               */
                  "mov   %3,%1\n"   /* tmp=newval;                             */
@@ -385,7 +385,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelaxed(T *newValue)
 template <typename T>
 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
 {
-    register void *old, *tmp;
+    register T *old, *tmp;
     asm volatile("1:\n"
                  "ldq_l %0,%2\n"   /* old=*ptr;                               */
                  "mov   %3,%1\n"   /* tmp=newval;                             */
@@ -404,7 +404,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreAcquire(T *newValue)
 template <typename T>
 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
 {
-    register void *old, *tmp;
+    register T *old, *tmp;
     asm volatile("mb\n"
                  "1:\n"
                  "ldq_l %0,%2\n"   /* old=*ptr;                               */
@@ -423,7 +423,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndStoreRelease(T *newValue)
 template <typename T>
 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueToAdd)
 {
-    register void *old, *tmp;
+    register T *old, *tmp;
     asm volatile("1:\n"
                  "ldq_l %0,%2\n"   /* old=*ptr;                               */
                  "addq  %0,%3,%1\n"/* tmp=old+value;                          */
@@ -441,7 +441,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelaxed(qptrdiff valueTo
 template <typename T>
 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueToAdd)
 {
-    register void *old, *tmp;
+    register T *old, *tmp;
     asm volatile("1:\n"
                  "ldq_l %0,%2\n"   /* old=*ptr;                               */
                  "addq  %0,%3,%1\n"/* tmp=old+value;                          */
@@ -460,7 +460,7 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddAcquire(qptrdiff valueTo
 template <typename T>
 Q_INLINE_TEMPLATE T *QBasicAtomicPointer<T>::fetchAndAddRelease(qptrdiff valueToAdd)
 {
-    register void *old, *tmp;
+    register T *old, *tmp;
     asm volatile("mb\n"
                  "1:\n"
                  "ldq_l %0,%2\n"   /* old=*ptr;                               */
-- 
cgit v0.12


From c6d92ebe915e4ed857aca5130e514c6ec81dd33f Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Tue, 25 May 2010 12:09:14 +0200
Subject: qdoc: Improved class index page.

The classes.html page will look good with the correct css.
---
 doc/src/declarative/examples.qdoc     |   5 +-
 doc/src/getting-started/examples.qdoc | 570 ++--------------------------------
 tools/qdoc3/htmlgenerator.cpp         | 193 ++++++------
 3 files changed, 120 insertions(+), 648 deletions(-)

diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 6e0426c..15d7652 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -42,12 +42,9 @@
 /*!
   \page qdeclarativeexamples.html
   \title QML Examples and Demos
+  \brief Building UI's with QML
   \ingroup all-examples
 
-\previouspage Graphics View Examples
-\contentspage Qt Examples
-\nextpage Painting Examples
-
 \section1 Running the examples
 
 You can find many simple examples in the \c examples/declarative
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 61fa1cd..a3393dd 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -76,423 +76,11 @@
 */
 
 /*!
-    \page examples.html
-    \title Qt Examples
-    \brief The example programs provided with Qt.
-
-    \previouspage Tutorials
-    \contentspage How to Learn Qt
-    \nextpage Qt Demonstrations
-
-    Qt is supplied with a variety of examples that cover almost every aspect
-    of development. They are not all designed to be impressive when you run
-    them, but their source code is carefully written to show good Qt
-    programming practices. You can launch any of these programs from the
-    \l{Examples and Demos Launcher} application.
-
-    These examples are ordered by functional area, but many examples often
-    use features from many parts of Qt to highlight one area in particular.
-    If you are new to Qt, you should probably start by going through the
-    \l{Tutorials} before you have a look at the
-    \l{mainwindows/application}{Application} example.
-
-    In addition to the examples and the tutorial, Qt includes a
-    \l{Qt Demonstrations}{selection of demos} that deliberately show off
-    Qt's features. You might want to look at these as well.
-
-    \section1 \l{Widgets Examples}{Widgets}
-    \beginfloatleft
-    \l{Widgets Examples}{\inlineimage widget-examples.png
-    }
-
-    \endfloat
-    Qt comes with a large range of standard widgets that users of modern
-    applications have come to expect. You can also develop your own custom
-    widgets and controls, and use them alongside standard widgets.
-
-    It is even possible to provide custom styles and themes for widgets that can
-    be used to change the appearance of standard widgets and appropriately
-    written custom widgets.
-
-    \clearfloat
-    \section1 \l{Dialog Examples}{Dialogs}
-    \beginfloatleft
-    \l{Dialog Examples}{\inlineimage dialog-examples.png
-    }
-
-    \endfloat
-    Qt includes standard dialogs for many common operations, such as file
-    selection, printing, and color selection.
-
-    Custom dialogs can also be created for specialized modal or modeless
-    interactions with users.
-
-    \clearfloat
-    \section1 \l{Main Window Examples}{Main Windows}
-    \beginfloatleft
-    \l{Main Window Examples}{\inlineimage mainwindow-examples.png
-    }
-
-    \endfloat
-    All the standard features of application main windows are provided by Qt.
-
-    Main windows can have pull down menus, tool bars, and dock windows. These
-    separate forms of user input are unified in an integrated action system that
-    also supports keyboard shortcuts and accelerator keys in menu items.
-
-    \clearfloat
-    \section1 \l{Layout Examples}{Layouts}
-    \beginfloatleft
-    \l{Layout Examples}{\inlineimage layout-examples.png
-    }
-
-    \endfloat
-    Qt uses a layout-based approach to widget management. Widgets are arranged in
-    the optimal positions in windows based on simple layout rules, leading to a
-    consistent look and feel.
-
-    Custom layouts can be used to provide more control over the positions and
-    sizes of child widgets.
-
-    \clearfloat
-    \section1 \l{Item Views Examples}{Item Views}
-    \beginfloatleft
-    \l{Item Views Examples}{\inlineimage itemview-examples.png
-    }
-
-    \endfloat
-    Item views are widgets that typically display data sets. Qt 4's model/view
-    framework lets you handle large data sets by separating the underlying data
-    from the way it is represented to the user, and provides support for
-    customized rendering through the use of delegates.
-
-    \clearfloat
-    \section1 \l{Graphics View Examples}{Graphics View}
-    \beginfloatleft
-    \l{Graphics View Examples}{\inlineimage graphicsview-examples.png
-    }
-
-    \endfloat
-    Qt is provided with a comprehensive canvas through the GraphicsView
-    classes.
-
-    \clearfloat
-    \section1 \l{QML Examples and Demos}{Declarative}
-    \beginfloatleft
-    \l{QML Examples and Demos}{\inlineimage declarative-examples.png
-    }
-
-    \endfloat
-    The Qt Declarative module provides a declarative framework for building
-    highly dynamic, custom user interfaces.
-
-    \clearfloat
-    \section1 \l{Painting Examples}{Painting}
-    \beginfloatleft
-    \l{Painting Examples}{\inlineimage painting-examples.png
-    }
-
-    \endfloat
-    Qt's painting system is able to render vector graphics, images, and outline
-    font-based text with sub-pixel accuracy accuracy using anti-aliasing to
-    improve rendering quality.
-
-    \clearfloat
-    \section1 \l{Rich Text Examples}{Rich Text}
-    \beginfloatleft
-    \l{Rich Text Examples}{\inlineimage richtext-examples.png
-    }
-
-    \endfloat
-    Qt provides powerful document-oriented rich text engine that supports Unicode
-    and right-to-left scripts. Documents can be manipulated using a cursor-based
-    API, and their contents can be imported and exported as both HTML and in a
-    custom XML format.
-
-    \clearfloat
-    \section1 \l{Desktop Examples}{Desktop}
-    \beginfloatleft
-    \l{Desktop Examples}{\inlineimage desktop-examples.png
-    }
-
-    \endfloat
-    Qt provides features to enable applications to integrate with the user's
-    preferred desktop environment.
-
-    Features such as system tray icons, access to the desktop widget, and
-    support for desktop services can be used to improve the appearance of
-    applications and take advantage of underlying desktop facilities.
-
-    \clearfloat
-    \section1 \l{Drag and Drop Examples}{Drag and Drop}
-    \beginfloatleft
-    \l{Drag and Drop Examples}{\inlineimage draganddrop-examples.png
-    }
-
-    \endfloat
-    Qt supports native drag and drop on all platforms via an extensible
-    MIME-based system that enables applications to send data to each other in the
-    most appropriate formats.
-
-    Drag and drop can also be implemented for internal use by applications.
-
-    \clearfloat
-    \section1 \l{Threading and Concurrent Programming Examples}{Threading and Concurrent Programming}
-    \beginfloatleft
-    \l{Threading and Concurrent Programming Examples}{\inlineimage thread-examples.png
-    }
-
-    \endfloat
-    Qt 4 makes it easier than ever to write multithreaded applications. More
-    classes have been made usable from non-GUI threads, and the signals and slots
-    mechanism can now be used to communicate between threads.
-
-    The QtConcurrent namespace includes a collection of classes and functions
-    for straightforward concurrent programming.
-
-    \clearfloat
-    \section1 \l{Tools Examples}{Tools}
-    \beginfloatleft
-    \l{Tools Examples}{\inlineimage tool-examples.png
-    }
-
-    \endfloat
-    Qt is equipped with a range of capable tool classes, from containers and
-    iterators to classes for string handling and manipulation.
-
-    Other classes provide application infrastructure support, handling plugin
-    loading and managing configuration files.
-
-    \clearfloat
-    \section1 \l{Network Examples}{Network}
-    \beginfloatleft
-    \l{Network Examples}{\inlineimage network-examples.png
-    }
-
-    \endfloat
-    Qt is provided with an extensive set of network classes to support both
-    client-based and server side network programming.
-
-    \clearfloat
-    \section1 \l{Inter-Process Communication Examples}{Inter-Process Communication}
-    \beginfloatleft
-    \l{Inter-Process Communication Examples}{\inlineimage ipc-examples.png
-    }
-
-    \endfloat
-    Simple, lightweight inter-process communication can be performed using shared
-    memory and local sockets.
-
-    \clearfloat
-    \section1 \l{OpenGL Examples}{OpenGL} and \l{OpenVG Examples}{OpenVG} Examples
-    \beginfloatleft
-    \l{OpenGL Examples}{\inlineimage opengl-examples.png
-    }
-
-    \endfloat
-    Qt provides support for integration with OpenGL implementations on all
-    platforms, giving developers the opportunity to display hardware accelerated
-    3D graphics alongside a more conventional user interface.
-
-    Qt provides support for integration with OpenVG implementations on
-    platforms with suitable drivers.
-
-    \clearfloat
-    \section1 \l{Multimedia Examples}{Multimedia Framework}
-    \beginfloatleft
-    \l{Multimedia Examples}{\inlineimage phonon-examples.png
-    }
-
-    \endfloat
-    Qt provides low-level audio support on linux,windows and mac platforms by default and
-    an audio plugin API to allow developers to implement there own audio support for
-    custom devices and platforms.
-
-    The Phonon Multimedia Framework brings multimedia support to Qt applications.
-
-    \clearfloat
-    \section1 \l{SQL Examples}{SQL}
-    \beginfloatleft
-    \l{SQL Examples}{\inlineimage sql-examples.png
-    }
-
-    \endfloat
-    Qt provides extensive database interoperability, with support for products
-    from both open source and proprietary vendors.
-
-    SQL support is integrated with Qt's model/view architecture, making it easier
-    to provide GUI integration for your database applications.
-
-    \clearfloat
-    \section1 \l{XML Examples}{XML}
-    \beginfloatleft
-    \l{XML Examples}{\inlineimage xml-examples.png
-    }
-
-    \endfloat
-    XML parsing and handling is supported through SAX and DOM compliant APIs
-    as well as streaming classes.
-
-    The XQuery/XPath and XML Schema engines in the QtXmlPatterns modules
-    provide classes for querying XML files and custom data models.
-
-    \clearfloat
-    \section1 \l{Qt Designer Examples}{Qt Designer}
-    \beginfloatleft
-    \l{Qt Designer Examples}{\inlineimage designer-examples.png
-    }
-
-    \endfloat
-    Qt Designer is a capable graphical user interface designer that lets you
-    create and configure forms without writing code. GUIs created with
-    Qt Designer can be compiled into an application or created at run-time.
-
-    \clearfloat
-    \section1 \l{UiTools Examples}{UiTools}
-    \beginfloatleft
-    \l{UiTools Examples}{\inlineimage uitools-examples.png
-    }
-
-    \endfloat
-    User interfaces created with Qt Designer can be loaded and displayed at
-    run-time using the facilities of the QtUiTools module without the need
-    to generate code in advance.
-
-    \clearfloat
-    \section1 \l{Qt Linguist Examples}{Qt Linguist}
-    \beginfloatleft
-    \l{Qt Linguist Examples}{\inlineimage linguist-examples.png
-    }
-
-    \endfloat
-    Internationalization is a core feature of Qt.
-
-    \clearfloat
-    \section1 \l{Qt Script Examples}{Qt Script}
-    \beginfloatleft
-    \l{Qt Script Examples}{\inlineimage qtscript-examples.png
-    }
-
-    \endfloat
-    Qt is provided with a powerful embedded scripting environment through the QtScript
-    classes.
-
-    \clearfloat
-    \section1 \l{WebKit Examples}{WebKit}
-    \beginfloatleft
-    \l{WebKit Examples}{\inlineimage webkit-examples.png
-    }
-
-    \endfloat
-    Qt provides an integrated Web browser component based on WebKit, the popular
-    open source browser engine.
-
-    \clearfloat
-    \section1 \l{Help System Examples}{Help System}
-    \beginfloatleft
-    \l{Help System Examples}{\inlineimage assistant-examples.png
-    }
-
-    \endfloat
-    Support for interactive help is provided by the Qt Assistant application.
-    Developers can take advantages of the facilities it offers to display
-    specially-prepared documentation to users of their applications.
-
-    \clearfloat
-    \section1 \l{State Machine Examples}{State Machine}
-    \beginfloatleft
-    \l{State Machine Examples}{\inlineimage statemachine-examples.png
-    }
-
-    \endfloat
-    Qt provides a powerful hierarchical finite state machine through the Qt State
-    Machine classes.
-
-    \clearfloat
-    \section1 \l{Animation Framework Examples}{Animation Framework}
-    \beginfloatleft
-    \l{Animation Framework Examples}{\inlineimage animation-examples.png
-    }
-
-    \endfloat
-    These examples show to to use the \l{The Animation Framework}{animation framework}
-    to build highly animated, high-performance GUIs.
-
-    \clearfloat
-    \section1 \l{Multi-Touch Examples}{Multi-Touch Framework}
-    \beginfloatleft
-    \l{Multi-Touch Examples}{\inlineimage multitouch-examples.png
-    }
-
-    \endfloat
-    Support for multi-touch input makes it possible for developers to create
-    extensible and intuitive user interfaces.
-
-    \clearfloat
-    \section1 \l{Gestures Examples}{Gestures}
-    \beginfloatleft
-    \l{Gestures Examples}{\inlineimage gestures-examples.png
-    }
-
-    \endfloat
-    Applications can be written to respond to gestures as a natural input method.
-    These examples show how to enable support for standard and custom gestures in
-    applications.
-
-    \clearfloat
-    \section1 \l{D-Bus Examples}{D-Bus}
-    \beginfloatleft
-    \l{D-Bus Examples}{\inlineimage dbus-examples.png
-    }
-
-    \endfloat
-    Systems with limited resources, specialized hardware, and small
-    screens require special attention.
-
-    \clearfloat
-    \section1 \l{Qt for Embedded Linux Examples}{Qt for Embedded Linux}
-    \beginfloatleft
-    \l{Qt for Embedded Linux Examples}{\inlineimage qt-embedded-examples.png
-    }
-
-    \endfloat
-    D-Bus is an inter-process communication protocol for Unix/Linux systems.
-    These examples demonstrate how to write application that communicate with
-    each other.
-
-    \clearfloat
-    \section1 \l{ActiveQt Examples}{ActiveQt}
-    \beginfloatleft
-    \l{ActiveQt Examples}{\inlineimage activeqt-examples.png
-    }
-
-    \endfloat
-    These examples demonstrate how to write ActiveX controls and control servers
-    with Qt, and how to use ActiveX controls and COM objects in a Qt application.
-
-    \clearfloat
-    \section1 \l{Qt Quarterly}{Qt Quarterly}
-    \beginfloatleft
-    \l{Qt Quarterly}{\inlineimage qq-thumbnail.png
-    }
-
-    \endfloat
-    One more valuable source for examples and explanations of Qt
-    features is the archive of \l{Qt Quarterly}, a newsletter for
-    Qt developers.
-
-    \clearfloat
-*/
-
-/*!
     \page examples-widgets.html
-    \title Widgets Examples
+    \title Widget Examples
     \ingroup all-examples
     \brief Lots of examples of how to use different kinds of widgets.
 
-    \contentspage Qt Examples
-    \nextpage Dialog Examples
-
     \image widget-examples.png
 
     Qt comes with a large range of standard widgets that users of modern
@@ -541,10 +129,6 @@
     \title Dialog Examples
     \brief Using Qt's standard dialogs and building and using custom dialogs.
 
-    \previouspage Widgets Examples
-    \contentspage Qt Examples
-    \nextpage Main Window Examples
-
     \image dialog-examples.png
 
     Qt includes standard dialogs for many common operations, such as file
@@ -573,10 +157,6 @@
     \title Main Window Examples
     \brief Building applications around a main window.
 
-    \previouspage Dialog Examples
-    \contentspage Qt Examples
-    \nextpage Layout Examples
-
     \image mainwindow-examples.png
 
     All the standard features of application main windows are provided by Qt.
@@ -601,11 +181,7 @@
     \page examples-layouts.html
     \ingroup all-examples
     \title Layout Examples
-    Using Qt's layout-based approach to widget management.
-
-    \previouspage Main Window Examples
-    \contentspage Qt Examples
-    \nextpage Item Views Examples
+    \brief Using Qt's layout-based approach to widget management.
 
     \image layout-examples.png
 
@@ -632,10 +208,6 @@
     \title Item Views Examples
     \brief Using the model/view design pattern to separate presentation from data.
 
-    \previouspage Layout Examples
-    \contentspage Qt Examples
-    \nextpage Graphics View Examples
-
     \image itemview-examples.png
 
     Item views are widgets that typically display data sets. Qt 4's model/view
@@ -672,10 +244,6 @@
     \title Graphics View Examples
     \brief Using Qt to manage and interact with a large (potentially) number of graphics items.
 
-    \previouspage Item Views Examples
-    \contentspage Qt Examples
-    \nextpage QML Examples and Demos
-
     \image graphicsview-examples.png
 
     Qt is provided with a comprehensive canvas through the GraphicsView
@@ -718,10 +286,7 @@
     \page examples-painting.html
     \ingroup all-examples
     \title Painting Examples
-
-    \previouspage QML Examples and Demos
-    \contentspage Qt Examples
-    \nextpage Rich Text Examples
+    \brief How to use the Qt painting system
 
     \image painting-examples.png
 
@@ -751,10 +316,7 @@
     \page examples-richtext.html
     \ingroup all-examples
     \title Rich Text Examples
-
-    \previouspage Painting Examples
-    \contentspage Qt Examples
-    \nextpage Desktop Examples
+    \brief Using the document-oriented rich text engine
 
     \image richtext-examples.png
 
@@ -775,10 +337,7 @@
     \page examples-desktop.html
     \ingroup all-examples
     \title Desktop Examples
-
-    \previouspage Rich Text Examples
-    \contentspage Qt Examples
-    \nextpage Drag and Drop Examples
+    \brief Integrating your Qt application with your favorite desktop
 
     \image desktop-examples.png
 
@@ -798,11 +357,8 @@
 /*!
     \page examples-draganddrop.html
     \ingroup all-examples
-    \title Drag and Drop Examples
-
-    \previouspage Desktop Examples
-    \contentspage Qt Examples
-    \nextpage Threading and Concurrent Programming Examples
+    \title Drag &amp Drop Examples
+    \brief How to access your platform's native darg &amp drop functionality
 
     \image draganddrop-examples.png
 
@@ -828,10 +384,7 @@
     \page examples-threadandconcurrent.html
     \ingroup all-examples
     \title Threading and Concurrent Programming Examples
-
-    \previouspage Drag and Drop Examples
-    \contentspage Qt Examples
-    \nextpage Tools Examples
+    \brief Threading and concurrent programming in Qt
 
     \image thread-examples.png
 
@@ -869,10 +422,7 @@
     \page examples.tools.html
     \ingroup all-examples
     \title Tools Examples
-
-    \previouspage Threading and Concurrent Programming Examples
-    \contentspage Qt Examples
-    \nextpage Network Examples
+    \brief Using Qt's containers, iterators, and other tool classes
 
     \image tool-examples.png
 
@@ -908,10 +458,7 @@
     \page examples-network.html
     \ingroup all-examples
     \title Network Examples
-
-    \previouspage Tools Examples
-    \contentspage Qt Examples
-    \nextpage Inter-Process Communication Examples
+    \brief How to do network programming in Qt
 
     \image network-examples.png
 
@@ -946,11 +493,8 @@
 /*!
     \page examples-ipc.html
     \ingroup all-examples
-    \title Inter-Process Communication Examples
-
-    \previouspage Network Examples
-    \contentspage Qt Examples
-    \nextpage OpenGL Examples
+    \title IPC Examples
+    \brief Inter-Process Communication with Qt
 
     \image ipc-examples.png
 
@@ -965,10 +509,7 @@
     \page examples-opengl.html
     \ingroup all-examples
     \title OpenGL Examples
-
-    \previouspage Inter-Process Communication Examples
-    \contentspage Qt Examples
-    \nextpage OpenVG Examples
+    \brief Accessing OpenGL from Qt
 
     \image opengl-examples.png
 
@@ -1000,10 +541,7 @@
     \page examples-openvg.html
     \ingroup all-examples
     \title OpenVG Examples
-
-    \previouspage OpenGL Examples
-    \contentspage Qt Examples
-    \nextpage Multimedia Examples
+    \brief Accessing OpenVG from Qt
 
     \image openvg-examples.png
 
@@ -1022,10 +560,7 @@
     \page examples-multimedia.html
     \ingroup all-examples
     \title Multimedia Examples
-
-    \previouspage OpenGL Examples
-    \contentspage Qt Examples
-    \nextpage SQL Examples
+    \brief Accessing audio support from Qt
 
     \image phonon-examples.png
 
@@ -1072,10 +607,7 @@
     \page examples-sql.html
     \ingroup all-examples
     \title SQL Examples
-
-    \previouspage Multimedia Examples
-    \contentspage Qt Examples
-    \nextpage XML Examples
+    \brief Accessing your SQL database from Qt
 
     \image sql-examples.png
 
@@ -1102,10 +634,7 @@
     \page examples-xml.html
     \ingroup all-examples
     \title XML Examples
-
-    \previouspage SQL Examples
-    \contentspage Qt Examples
-    \nextpage Qt Designer Examples
+    \brief Using XML with Qt
 
     \image xml-examples.png XML
 
@@ -1139,10 +668,7 @@
     \page examples-designer.html
     \ingroup all-examples
     \title Qt Designer Examples
-
-    \previouspage XML Examples
-    \contentspage Qt Examples
-    \nextpage UiTools Examples
+    \brief Using Qt Designer to build your UI
 
     \image designer-examples.png QtDesigner
 
@@ -1165,10 +691,7 @@
     \page examples-uitools.html
     \ingroup all-examples
     \title UiTools Examples
-
-    \previouspage Qt Designer Examples
-    \contentspage Qt Examples
-    \nextpage Qt Linguist Examples
+    \brief Using the QtUiTools module
 
     \image uitools-examples.png UiTools
 
@@ -1182,10 +705,7 @@
     \page examples-linguist.html
     \ingroup all-examples
     \title Qt Linguist Examples
-
-    \previouspage UiTools Examples
-    \contentspage Qt Examples
-    \nextpage Qt Script Examples
+    \brief Using Qt Linguist to internationalize your Qt application
 
     \image linguist-examples.png
 
@@ -1203,10 +723,7 @@
     \page examples-script.html
     \ingroup all-examples
     \title Qt Script Examples
-
-    \previouspage Qt Linguist Examples
-    \contentspage Qt Examples
-    \nextpage WebKit Examples
+    \brief Using the Qt scripting environment
 
     \image qtscript-examples.png QtScript
 
@@ -1233,10 +750,7 @@
     \page examples-webkit.html
     \ingroup all-examples
     \title WebKit Examples
-
-    \previouspage Qt Script Examples
-    \contentspage Qt Examples
-    \nextpage Help System Examples
+    \brief Using WebKit in your Qt application
 
     \image webkit-examples.png WebKit
 
@@ -1275,10 +789,7 @@
     \page examples-helpsystem.html 
     \ingroup all-examples
     \title Help System Examples
-
-    \previouspage WebKit Examples
-    \contentspage Qt Examples
-    \nextpage State Machine Examples
+    \brief Adding interactive help to your Qt application
 
     \image assistant-examples.png HelpSystem
 
@@ -1299,10 +810,7 @@
     \page examples-statemachine.html
     \ingroup all-examples
     \title State Machine Examples
-
-    \previouspage Help System Examples
-    \contentspage Qt Examples
-    \nextpage Animation Framework Examples
+    \brief Using Qt's finite state machine classes
 
     \image statemachine-examples.png StateMachine
 
@@ -1326,10 +834,7 @@
     \page examples-animation.html
     \ingroup all-examples
     \title Animation Framework Examples
-
-    \previouspage State Machine Examples
-    \contentspage Qt Examples
-    \nextpage Multi-Touch Examples
+    \brief Doing animations with Qt
 
     \image animation-examples.png Animation
 
@@ -1349,10 +854,7 @@
     \page examples-multitouch.html
     \ingroup all-examples
     \title Multi-Touch Examples
-
-    \previouspage Animation Framework Examples
-    \contentspage Qt Examples
-    \nextpage Gestures Examples
+    \brief Using Qt's multi-touch input capability
 
     Support for multi-touch input makes it possible for developers to create
     extensible and intuitive user interfaces.
@@ -1369,10 +871,7 @@
     \page examples-gestures.html
     \ingroup all-examples
     \title Gestures Examples
-
-    \previouspage Multi-Touch Examples
-    \contentspage Qt Examples
-    \nextpage D-Bus Examples
+    \brief Gesture programming examples
 
     The API of the gesture framework is not yet finalized and
     still subject to change.
@@ -1386,10 +885,7 @@
     \page examples-dbus.html
     \ingroup all-examples
     \title D-Bus Examples
-
-    \previouspage Gestures Examples
-    \contentspage Qt Examples
-    \nextpage Qt for Embedded Linux Examples
+    \brief Using D-Bus from Qt applications
 
     \list
     \o \l{dbus/dbus-chat}{Chat}
@@ -1406,10 +902,7 @@
     \page examples-embeddedlinux.html
     \ingroup all-examples
     \title Qt for Embedded Linux Examples
-
-    \previouspage D-Bus Examples
-    \contentspage Qt Examples
-    \nextpage ActiveQt Examples
+    \brief Using Qt in Embedded Linux
 
     \image qt-embedded-examples.png QtEmbedded
 
@@ -1429,10 +922,7 @@
     \page examples-activeqt.html
     \ingroup all-examples
     \title ActiveQt Examples
-
-    \previouspage Qt for Embedded Linux Examples
-    \contentspage Qt Examples
-    \nextpage Qt Quarterly
+    \brief Using ActiveX from Qt applications
 
     \image activeqt-examples.png ActiveQt
 
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index cf8ea7c..42db4e8 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -434,6 +434,9 @@ void HtmlGenerator::startText(const Node * /* relative */,
     sectionNumber.clear();
 }
 
+/*!
+  Generate html from an instance of Atom.
+ */
 int HtmlGenerator::generateAtom(const Atom *atom,
                                 const Node *relative,
                                 CodeMarker *marker)
@@ -1217,6 +1220,9 @@ int HtmlGenerator::generateAtom(const Atom *atom,
     return skipAhead;
 }
 
+/*!
+  Generate a reference page for a C++ class.
+ */
 void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
                                           CodeMarker *marker)
 {
@@ -1466,6 +1472,10 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
     appendDcfSubSection(&dcfClassesRoot, classSection);
 }
 
+/*!
+  Generate the html page for a qdoc file that doesn't map
+  to an underlying c++ file.
+ */
 void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
 {
     SubTitleSize subTitleSize = LargeSubTitle;
@@ -1682,6 +1692,9 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
     }
 }
 
+/*!
+  Returns "html" for this subclass of Generator.
+ */
 QString HtmlGenerator::fileExtension(const Node * /* node */) const
 {
     return "html";
@@ -1735,10 +1748,10 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title,
         }
         else if (node->subType() == Node::Page) {
             if (fn->name() == QString("examples.html")) {
-                out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
+                out() << "              <li><a href=\"all-examples.html\">Examples</a></li>";
             }
             else if (fn->name().startsWith("examples-")) {
-                out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
+                out() << "              <li><a href=\"all-examples.html\">Examples</a></li>";
                 out() << "              <li><a href=\"" << fn->name() << "\">" << title
                       << "</a></li>";
             }
@@ -1756,7 +1769,7 @@ void HtmlGenerator::generateBreadCrumbs(const QString& title,
                   << "</a></li>";
         }
         else if (node->subType() == Node::Example) {
-            out() << "              <li><a href=\"examples.html\">All Examples</a></li>";
+            out() << "              <li><a href=\"all-examples.html\">Examples</a></li>";
             QStringList sl = fn->name().split('/');
             QString name = "examples-" + sl.at(0) + ".html";
             QString t = CodeParser::titleFromName(name);
@@ -2332,7 +2345,6 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                                         QString commonPrefix)
 {
     const int NumParagraphs = 37; // '0' to '9', 'A' to 'Z', '_'
-    const int NumColumns = 1; // number of columns in the result
 
     if (classMap.isEmpty())
         return;
@@ -2415,18 +2427,18 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         else
             key = pieces.last().toLower();
 
-        int paragraphNo = NumParagraphs - 1;
+        int paragraphNr = NumParagraphs - 1;
 
         if (key[0].digitValue() != -1) {
-            paragraphNo = key[0].digitValue();
+            paragraphNr = key[0].digitValue();
         }
         else if (key[0] >= QLatin1Char('a') && key[0] <= QLatin1Char('z')) {
-            paragraphNo = 10 + key[0].unicode() - 'a';
+            paragraphNr = 10 + key[0].unicode() - 'a';
         }
 
-        paragraphName[paragraphNo] = key[0].toUpper();
+        paragraphName[paragraphNr] = key[0].toUpper();
         usedParagraphNames.insert(key[0].toLower().cell());
-        paragraph[paragraphNo].insert(key, c.value());
+        paragraph[paragraphNr].insert(key, c.value());
         ++c;
     }
 
@@ -2439,36 +2451,16 @@ void HtmlGenerator::generateCompactList(const Node *relative,
       start at offsets 0, 3, 4, 8, 9, 14, 23.
     */
     int paragraphOffset[NumParagraphs + 1];     // 37 + 1
-    int i, j, k;
-
     paragraphOffset[0] = 0;
-    for (j = 0; j < NumParagraphs; j++)         // j = 0..36
-        paragraphOffset[j + 1] = paragraphOffset[j] + paragraph[j].count();
-
-    int firstOffset[NumColumns + 1];
-    int currentOffset[NumColumns];
-    int currentParagraphNo[NumColumns];
-    int currentOffsetInParagraph[NumColumns];
+    for (int i=0; i<NumParagraphs; i++)         // i = 0..36
+        paragraphOffset[i+1] = paragraphOffset[i] + paragraph[i].count();
 
-    int numRows = (classMap.count() + NumColumns - 1) / NumColumns;
-    int curParagNo = 0;
-
-    for (i = 0; i < NumColumns; i++) {
-        firstOffset[i] = qMin(i * numRows, classMap.size());
-        currentOffset[i] = firstOffset[i];
-
-        for (j = curParagNo; j < NumParagraphs; j++) {
-            if (paragraphOffset[j] > firstOffset[i])
-                break;
-            if (paragraphOffset[j] <= firstOffset[i])
-                curParagNo = j;
-        }
-        currentParagraphNo[i] = curParagNo;
-        currentOffsetInParagraph[i] = firstOffset[i] -
-                                      paragraphOffset[curParagNo];
-    }
-    firstOffset[NumColumns] = classMap.count();
+    int curParNr = 0;
+    int curParOffset = 0;
 
+    /*
+      Output the alphabet as a row of links.
+     */
     if (includeAlphabet) {
         out() << "<p  class=\"centerAlign functionIndex\"><b>";
         for (int i = 0; i < 26; i++) {
@@ -2479,80 +2471,73 @@ void HtmlGenerator::generateCompactList(const Node *relative,
         out() << "</b></p>\n";
     }
 
+    /*
+      Output a <div> element to contain all the <dl> elements.
+     */
     out() << "<div class=\"flowListDiv\">\n";
-    for (k = 0; k < numRows; k++) {
-        if (++numTableRows % 2 == 1)
-            out() << "<dl class=\"flowList odd\">";
-        else
-            out() << "<dl class=\"flowList even\">";
-        //break;
-
-//	out() << "<tr>\n";
-        for (i = 0; i < NumColumns; i++) {
-            if (currentOffset[i] >= firstOffset[i + 1]) {
-                // this column is finished
-                out() << "<dd>\n</dd>\n"; // check why?
+
+    for (int i=0; i<classMap.count()-1; i++) {
+        while ((curParNr < NumParagraphs) &&
+               (curParOffset == paragraph[curParNr].count())) {
+            ++curParNr;
+            curParOffset = 0;
+        }
+
+        /*
+          Starting a new paragraph means starting a new <dl>.
+        */
+        if (curParOffset == 0) {
+            if (i > 0)
+                out() << "</dl>\n";
+            if (++numTableRows % 2 == 1)
+                out() << "<dl class=\"flowList odd\">";
+            else
+                out() << "<dl class=\"flowList even\">";
+            out() << "<dt class=\"alphaChar\"><p>";
+            if (includeAlphabet) {
+                QChar c = paragraphName[curParNr][0].toLower();
+                out() << QString("<a name=\"%1\"></a>").arg(c);
             }
-            else {
-                while ((currentParagraphNo[i] < NumParagraphs) &&
-                       (currentOffsetInParagraph[i] == paragraph[currentParagraphNo[i]].count())) {
-                    ++currentParagraphNo[i];
-                    currentOffsetInParagraph[i] = 0;
-                }
-#if 0
-                if (currentParagraphNo[i] >= NumParagraphs) {
-                    qDebug() << "### Internal error ###" << __FILE__ << __LINE__
-                             << currentParagraphNo[i] << NumParagraphs;
-                    currentParagraphNo[i] = NumParagraphs - 1;
-                }
-#endif
-                out() << "<dt  class=\"alphaChar\"><p>";
-                if (currentOffsetInParagraph[i] == 0) {
-                    // start a new paragraph
-                    if (includeAlphabet) {
-                        QChar c = paragraphName[currentParagraphNo[i]][0].toLower();
-                        out() << QString("<a name=\"%1\"></a>").arg(c);
-                    }
-                    out() << "<b>"
-                          << paragraphName[currentParagraphNo[i]]
-                          << "</b>";
-                }
-                out() << "</p></dt>\n";
-
-                out() << "<dd><p>";
-                if ((currentParagraphNo[i] < NumParagraphs) &&
-                    !paragraphName[currentParagraphNo[i]].isEmpty()) {
-                    NodeMap::Iterator it;
-                    it = paragraph[currentParagraphNo[i]].begin();
-                    for (j = 0; j < currentOffsetInParagraph[i]; j++)
-                        ++it;
-
-                    // Previously, we used generateFullName() for this, but we
-                    // require some special formatting.
-                    out() << "<a href=\""
-                        << linkForNode(it.value(), relative)
-                        << "\">";
-                    QStringList pieces;
-                    if (it.value()->subType() == Node::QmlClass)
-                        pieces << it.value()->name();
-                    else
-                        pieces = fullName(it.value(), relative, marker).split("::");
-                    out() << protectEnc(pieces.last());
-                    out() << "</a>";
-                    if (pieces.size() > 1) {
-                        out() << " (";
-                        generateFullName(it.value()->parent(), relative, marker);
-                        out() << ")";
-                    }
-                }
-                out() << "</p></dd>\n";
+            out() << "<b>"
+                  << paragraphName[curParNr]
+                  << "</b>";
+            out() << "</p></dt>\n";
+        }
 
-                currentOffset[i]++;
-                currentOffsetInParagraph[i]++;
+        /*
+          Output a <dd> for the current offset in the current paragraph.
+         */
+        out() << "<dd><p>";
+        if ((curParNr < NumParagraphs) &&
+            !paragraphName[curParNr].isEmpty()) {
+            NodeMap::Iterator it;
+            it = paragraph[curParNr].begin();
+            for (int i=0; i<curParOffset; i++)
+                ++it;
+
+            /*
+              Previously, we used generateFullName() for this, but we
+              require some special formatting.
+            */
+            out() << "<a href=\"" << linkForNode(it.value(), relative) << "\">";
+            
+            QStringList pieces;
+            if (it.value()->subType() == Node::QmlClass)
+                pieces << it.value()->name();
+            else
+                pieces = fullName(it.value(), relative, marker).split("::");
+            out() << protectEnc(pieces.last());
+            out() << "</a>";
+            if (pieces.size() > 1) {
+                out() << " (";
+                generateFullName(it.value()->parent(), relative, marker);
+                out() << ")";
             }
         }
-        out() << "</dl>\n";
+        out() << "</p></dd>\n";
+        curParOffset++;
     }
+    out() << "</dl>\n";
     out() << "</div>\n";
 }
 
-- 
cgit v0.12


From 4c612a53a0fb137ac3eacbea96284eca9f5f018e Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 25 May 2010 10:24:41 +0200
Subject: Don't use QAtomicInt in statics because they are non-POD.

Reviewed-By: Olivier Goffart
---
 src/gui/egl/qegl.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/egl/qegl.cpp b/src/gui/egl/qegl.cpp
index c16aeb1..776cdba 100644
--- a/src/gui/egl/qegl.cpp
+++ b/src/gui/egl/qegl.cpp
@@ -69,12 +69,12 @@ public:
     static bool displayOpened() { return displayOpen; }
 
 private:
-    static QAtomicInt contexts;
-    static QAtomicInt displayOpen;
+    static QBasicAtomicInt contexts;
+    static QBasicAtomicInt displayOpen;
 };
 
-QAtomicInt QEglContextTracker::contexts = 0;
-QAtomicInt QEglContextTracker::displayOpen = 0;
+QBasicAtomicInt QEglContextTracker::contexts = Q_BASIC_ATOMIC_INITIALIZER(0);
+QBasicAtomicInt QEglContextTracker::displayOpen = Q_BASIC_ATOMIC_INITIALIZER(0);
 
 // Current GL and VG contexts.  These are used to determine if
 // we can avoid an eglMakeCurrent() after a call to lazyDoneCurrent().
-- 
cgit v0.12


From 5579af0f12bb6bae1eaf03ed514dab8557b84954 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 25 May 2010 13:17:42 +0300
Subject: Fix double slashes on few data caging paths

QT_PLUGINS_BASE_DIR and QT_IMPORTS_BASE_DIR paths had double slash in
front of them.

Reviewed-by: Janne Koskinen
---
 mkspecs/features/symbian/data_caging_paths.prf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf
index ae9bc09..6b709cc 100644
--- a/mkspecs/features/symbian/data_caging_paths.prf
+++ b/mkspecs/features/symbian/data_caging_paths.prf
@@ -74,8 +74,8 @@ exists($${EPOCROOT}epoc32/include/data_caging_paths.prf) {
     BOOTDATA_DIR            = /resource/bootdata
 }
 
-isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins
-isEmpty(QT_IMPORTS_BASE_DIR): QT_IMPORTS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt/imports
+isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = $$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins
+isEmpty(QT_IMPORTS_BASE_DIR): QT_IMPORTS_BASE_DIR = $$RESOURCE_FILES_DIR/qt/imports
 isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z
 isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps
 isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps
\ No newline at end of file
-- 
cgit v0.12


From b5702253a08e315b4db5620a1d4b0ffd4c8e0d0f Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Tue, 25 May 2010 12:26:21 +0200
Subject: Doc: Correcting style to class lists

---
 doc/src/template/style/style.css | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index ebc1607..c155d9b 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -989,6 +989,7 @@
     border-width: 1px;
     border-style: solid;
     border-color: #E6E6E6;
+	width:100%;
 	}
 	
 	.centerAlign
@@ -1141,11 +1142,24 @@
     /* end of screen media */
 
 .flowList{
-display:inline-block;
-width:260px;
+vertical-align:top;
 }	
+.alphaChar{
+width:100%;
+background-color:#F6F6F6;
+border:1px solid #E6E6E6;
+font-size:12pt;
+padding-left:10px;
+margin-top:10px;
+margin-bottom:10px;
+}
+
 .flowList dl{
-padding:0px;
+}
+.flowList dd{
+display:inline-block;
+margin-left:10px;
+width:250px;
 }
 .wrap .content .flowList p{
 padding:0px;
-- 
cgit v0.12


From 7efefb3b0f651d66523dad8fe95c764d0024e687 Mon Sep 17 00:00:00 2001
From: Sami Merila <sami.merila@nokia.com>
Date: Tue, 25 May 2010 13:59:08 +0300
Subject: Qt app draws background incorrectly when animated wallpaper is used

In Symbian^3 OS supports animated wallpapers. Unfortunately animation
is drawn to separate surface underneath the application surface. To
avoid fiddling with system surfaces, Qt apps indicate to the
OS that application does not support animated wallpaper and thus,
system draws a "regular" wallpaper for the application.

This feature is supported only in Sym^3.

Task-number: QT-3148
Reviewed-by: Shane Kearns
---
 src/gui/s60framework/qs60mainappui.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp
index feffc9f..ce13de8 100644
--- a/src/gui/s60framework/qs60mainappui.cpp
+++ b/src/gui/s60framework/qs60mainappui.cpp
@@ -64,6 +64,9 @@
 #include <private/qt_s60_p.h>
 #include <qdebug.h>
 
+//Animated wallpapers in Qt applications are not supported.
+const TInt KAknDisableAnimationBackground = 0x02000000;
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -115,6 +118,11 @@ void QS60MainAppUi::ConstructL()
     TInt flags = CAknAppUi::EAknEnableSkin
                  | CAknAppUi::ENoScreenFurniture
                  | CAknAppUi::ENonStandardResourceFile;
+    // After 5th Edition S60, native side supports animated wallpapers.
+	// However, there is no support for that feature on Qt side, so indicate to
+	// native UI framework that this application will not support background animations.
+    if (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0)
+        flags |= KAknDisableAnimationBackground;
     BaseConstructL(flags);
 }
 
-- 
cgit v0.12


From 88abca461b554628b3deb47f2b379f5a36c62f30 Mon Sep 17 00:00:00 2001
From: Thomas Zander <t.zander@nokia.com>
Date: Tue, 25 May 2010 13:12:02 +0200
Subject: Make link on linux/symbian

On systems where libs don't automagically go to the system dirs we need
to add the build dir for using the lib.
---
 demos/spectrum/app/app.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro
index 8d7ce8e..257675c 100644
--- a/demos/spectrum/app/app.pro
+++ b/demos/spectrum/app/app.pro
@@ -57,6 +57,7 @@ symbian {
     symbian {
         # Must explicitly add the .dll suffix to ensure dynamic linkage
         LIBS += -lfftreal.dll
+        QMAKE_LIBDIR += $${fftreal_dir}
     } else {
         macx {
             # Link to fftreal framework
-- 
cgit v0.12


From e3e814ece7a387b85dfe2f8becdfd444e2613f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Nilsen?= <bjorn.nilsen@nokia.com>
Date: Tue, 25 May 2010 13:54:48 +0200
Subject: Updating 4.7.0 change log.

---
 dist/changes-4.7.0 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 31130e8..e7b1e84 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -88,6 +88,9 @@ QtGui
  - QGraphicsItem
     * [QTBUG-8112] itemChange() is now called when transformation
       properties change (setRotation, setScale, setTransformOriginPoint).
+    * [QTBUG-9024] Improved performance when calling update() on items that
+      are clipped by an ancestor (QGraphicsItem::ItemClipsChildrenToShape).
+    * [QTBUG-7703], [QTBUG-8378] Fixed scrolling issues
 
  - QGraphicsTextItem
     * [QTBUG-7333] Fixed keyboard shortcuts not being triggered when the
@@ -96,6 +99,7 @@ QtGui
  - QGraphicsView
     * [QTBUG-7438] Fixed viewport cursor getting reset when releasing
       the mouse.
+    * [QTBUG-10338] Fixed drawing artifacts due to rounding errors.
 
  - QImage
     * [QTBUG-9640] Prevented unneccessary copy in QImage::setAlphaChannel().
-- 
cgit v0.12


From d0f2abcdd58af4afbb75763953fb2f14688360c4 Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Fri, 21 May 2010 13:55:26 +0100
Subject: Fixed license headers in spectrum demo

Reviewed-by: Jason McDonald
Task-number: QTBUG-10887
---
 demos/spectrum/app/engine.cpp              | 53 ++++++++++++++-------------
 demos/spectrum/app/engine.h                | 47 ++++++++++++------------
 demos/spectrum/app/frequencyspectrum.cpp   | 53 ++++++++++++++-------------
 demos/spectrum/app/frequencyspectrum.h     | 47 ++++++++++++------------
 demos/spectrum/app/levelmeter.cpp          | 53 ++++++++++++++-------------
 demos/spectrum/app/levelmeter.h            | 47 ++++++++++++------------
 demos/spectrum/app/main.cpp                | 57 +++++++++++++++---------------
 demos/spectrum/app/mainwidget.cpp          | 53 ++++++++++++++-------------
 demos/spectrum/app/mainwidget.h            | 47 ++++++++++++------------
 demos/spectrum/app/progressbar.cpp         | 53 ++++++++++++++-------------
 demos/spectrum/app/progressbar.h           | 47 ++++++++++++------------
 demos/spectrum/app/settingsdialog.cpp      | 53 ++++++++++++++-------------
 demos/spectrum/app/settingsdialog.h        | 47 ++++++++++++------------
 demos/spectrum/app/spectrograph.cpp        | 53 ++++++++++++++-------------
 demos/spectrum/app/spectrograph.h          | 47 ++++++++++++------------
 demos/spectrum/app/spectrum.h              | 47 ++++++++++++------------
 demos/spectrum/app/spectrumanalyser.cpp    | 53 ++++++++++++++-------------
 demos/spectrum/app/spectrumanalyser.h      | 47 ++++++++++++------------
 demos/spectrum/app/tonegenerator.cpp       | 53 ++++++++++++++-------------
 demos/spectrum/app/tonegenerator.h         | 47 ++++++++++++------------
 demos/spectrum/app/tonegeneratordialog.cpp | 53 ++++++++++++++-------------
 demos/spectrum/app/tonegeneratordialog.h   | 47 ++++++++++++------------
 demos/spectrum/app/utils.cpp               | 53 ++++++++++++++-------------
 demos/spectrum/app/utils.h                 | 47 ++++++++++++------------
 demos/spectrum/app/waveform.cpp            | 53 ++++++++++++++-------------
 demos/spectrum/app/waveform.h              | 47 ++++++++++++------------
 demos/spectrum/app/wavfile.cpp             | 53 ++++++++++++++-------------
 demos/spectrum/app/wavfile.h               | 47 ++++++++++++------------
 28 files changed, 716 insertions(+), 688 deletions(-)

diff --git a/demos/spectrum/app/engine.cpp b/demos/spectrum/app/engine.cpp
index 5cdfb6d..119a0e3 100644
--- a/demos/spectrum/app/engine.cpp
+++ b/demos/spectrum/app/engine.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/engine.h b/demos/spectrum/app/engine.h
index 16088b2..21867b3 100644
--- a/demos/spectrum/app/engine.h
+++ b/demos/spectrum/app/engine.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 ENGINE_H
 #define ENGINE_H
diff --git a/demos/spectrum/app/frequencyspectrum.cpp b/demos/spectrum/app/frequencyspectrum.cpp
index 6ab80c2..3057428 100644
--- a/demos/spectrum/app/frequencyspectrum.cpp
+++ b/demos/spectrum/app/frequencyspectrum.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/frequencyspectrum.h b/demos/spectrum/app/frequencyspectrum.h
index 0dd814e..d974a44 100644
--- a/demos/spectrum/app/frequencyspectrum.h
+++ b/demos/spectrum/app/frequencyspectrum.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 FREQUENCYSPECTRUM_H
 #define FREQUENCYSPECTRUM_H
diff --git a/demos/spectrum/app/levelmeter.cpp b/demos/spectrum/app/levelmeter.cpp
index 39e43c9..819b98d 100644
--- a/demos/spectrum/app/levelmeter.cpp
+++ b/demos/spectrum/app/levelmeter.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/levelmeter.h b/demos/spectrum/app/levelmeter.h
index ab8340b..38d13b1 100644
--- a/demos/spectrum/app/levelmeter.h
+++ b/demos/spectrum/app/levelmeter.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 LEVELMETER_H
 #define LEVELMETER_H
diff --git a/demos/spectrum/app/main.cpp b/demos/spectrum/app/main.cpp
index 6e2b6fc..3bdfb7d 100644
--- a/demos/spectrum/app/main.cpp
+++ b/demos/spectrum/app/main.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/mainwidget.cpp b/demos/spectrum/app/mainwidget.cpp
index 3b7c306..dd51a91 100644
--- a/demos/spectrum/app/mainwidget.cpp
+++ b/demos/spectrum/app/mainwidget.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/mainwidget.h b/demos/spectrum/app/mainwidget.h
index 846b97a..86a47e6 100644
--- a/demos/spectrum/app/mainwidget.h
+++ b/demos/spectrum/app/mainwidget.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 MAINWIDGET_H
 #define MAINWIDGET_H
diff --git a/demos/spectrum/app/progressbar.cpp b/demos/spectrum/app/progressbar.cpp
index 256acf0..6bfc690 100644
--- a/demos/spectrum/app/progressbar.cpp
+++ b/demos/spectrum/app/progressbar.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/progressbar.h b/demos/spectrum/app/progressbar.h
index de9e5a9..8514adb 100644
--- a/demos/spectrum/app/progressbar.h
+++ b/demos/spectrum/app/progressbar.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 PROGRESSBAR_H
 #define PROGRESSBAR_H
diff --git a/demos/spectrum/app/settingsdialog.cpp b/demos/spectrum/app/settingsdialog.cpp
index 204b43f..b5e8459 100644
--- a/demos/spectrum/app/settingsdialog.cpp
+++ b/demos/spectrum/app/settingsdialog.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/settingsdialog.h b/demos/spectrum/app/settingsdialog.h
index 7215a50..77b2b61 100644
--- a/demos/spectrum/app/settingsdialog.h
+++ b/demos/spectrum/app/settingsdialog.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 SETTINGSDIALOG_H
 #define SETTINGSDIALOG_H
diff --git a/demos/spectrum/app/spectrograph.cpp b/demos/spectrum/app/spectrograph.cpp
index 1fcf434..3ec0804 100644
--- a/demos/spectrum/app/spectrograph.cpp
+++ b/demos/spectrum/app/spectrograph.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/spectrograph.h b/demos/spectrum/app/spectrograph.h
index 6bfef33..45db244 100644
--- a/demos/spectrum/app/spectrograph.h
+++ b/demos/spectrum/app/spectrograph.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 SPECTROGRAPH_H
 #define SPECTROGRAPH_H
diff --git a/demos/spectrum/app/spectrum.h b/demos/spectrum/app/spectrum.h
index 6cfe29f..cac320e 100644
--- a/demos/spectrum/app/spectrum.h
+++ b/demos/spectrum/app/spectrum.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 SPECTRUM_H
 #define SPECTRUM_H
diff --git a/demos/spectrum/app/spectrumanalyser.cpp b/demos/spectrum/app/spectrumanalyser.cpp
index 54d3f5e..c467f61 100644
--- a/demos/spectrum/app/spectrumanalyser.cpp
+++ b/demos/spectrum/app/spectrumanalyser.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/spectrumanalyser.h b/demos/spectrum/app/spectrumanalyser.h
index caeb1c1..98d9d84 100644
--- a/demos/spectrum/app/spectrumanalyser.h
+++ b/demos/spectrum/app/spectrumanalyser.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 SPECTRUMANALYSER_H
 #define SPECTRUMANALYSER_H
diff --git a/demos/spectrum/app/tonegenerator.cpp b/demos/spectrum/app/tonegenerator.cpp
index 6458a7d..470eb4c 100644
--- a/demos/spectrum/app/tonegenerator.cpp
+++ b/demos/spectrum/app/tonegenerator.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/tonegenerator.h b/demos/spectrum/app/tonegenerator.h
index 419f7e4..0c2f8fd 100644
--- a/demos/spectrum/app/tonegenerator.h
+++ b/demos/spectrum/app/tonegenerator.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 TONEGENERATOR_H
 #define TONEGENERATOR_H
diff --git a/demos/spectrum/app/tonegeneratordialog.cpp b/demos/spectrum/app/tonegeneratordialog.cpp
index 06e453c..01e1198 100644
--- a/demos/spectrum/app/tonegeneratordialog.cpp
+++ b/demos/spectrum/app/tonegeneratordialog.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/tonegeneratordialog.h b/demos/spectrum/app/tonegeneratordialog.h
index 35d69c2..2e66706 100644
--- a/demos/spectrum/app/tonegeneratordialog.h
+++ b/demos/spectrum/app/tonegeneratordialog.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 TONEGENERATORDIALOG_H
 #define TONEGENERATORDIALOG_H
diff --git a/demos/spectrum/app/utils.cpp b/demos/spectrum/app/utils.cpp
index 97dc6e3..4ead6c2 100644
--- a/demos/spectrum/app/utils.cpp
+++ b/demos/spectrum/app/utils.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/utils.h b/demos/spectrum/app/utils.h
index 83467cd..596533e 100644
--- a/demos/spectrum/app/utils.h
+++ b/demos/spectrum/app/utils.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 UTILS_H
 #define UTILS_H
diff --git a/demos/spectrum/app/waveform.cpp b/demos/spectrum/app/waveform.cpp
index 3fc4f76..1f7d315 100644
--- a/demos/spectrum/app/waveform.cpp
+++ b/demos/spectrum/app/waveform.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/waveform.h b/demos/spectrum/app/waveform.h
index 4de527f..dce3c37 100644
--- a/demos/spectrum/app/waveform.h
+++ b/demos/spectrum/app/waveform.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 WAVEFORM_H
 #define WAVEFORM_H
diff --git a/demos/spectrum/app/wavfile.cpp b/demos/spectrum/app/wavfile.cpp
index ec911ad..b9467e3 100644
--- a/demos/spectrum/app/wavfile.cpp
+++ b/demos/spectrum/app/wavfile.cpp
@@ -6,35 +6,34 @@
 **
 ** This file is part of the examples 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_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$
 **
 ****************************************************************************/
diff --git a/demos/spectrum/app/wavfile.h b/demos/spectrum/app/wavfile.h
index 05866f7..f2f3304 100644
--- a/demos/spectrum/app/wavfile.h
+++ b/demos/spectrum/app/wavfile.h
@@ -9,31 +9,34 @@
 ** $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.
+** "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.
+** 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 WAVFILE_H
-- 
cgit v0.12


From 830067a683e9264bf075757fc2476e1e038ef7b3 Mon Sep 17 00:00:00 2001
From: Morten Engvoldsen <morten.engvoldsen@nokia.com>
Date: Tue, 25 May 2010 15:38:58 +0200
Subject: Doc: Fixing bugs in HTML generator

---
 tools/qdoc3/htmlgenerator.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 42db4e8..16df0c0 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2493,7 +2493,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                 out() << "<dl class=\"flowList odd\">";
             else
                 out() << "<dl class=\"flowList even\">";
-            out() << "<dt class=\"alphaChar\"><p>";
+            out() << "<dt class=\"alphaChar\">";
             if (includeAlphabet) {
                 QChar c = paragraphName[curParNr][0].toLower();
                 out() << QString("<a name=\"%1\"></a>").arg(c);
@@ -2501,13 +2501,13 @@ void HtmlGenerator::generateCompactList(const Node *relative,
             out() << "<b>"
                   << paragraphName[curParNr]
                   << "</b>";
-            out() << "</p></dt>\n";
+            out() << "</dt>\n";
         }
 
         /*
           Output a <dd> for the current offset in the current paragraph.
          */
-        out() << "<dd><p>";
+        out() << "<dd>";
         if ((curParNr < NumParagraphs) &&
             !paragraphName[curParNr].isEmpty()) {
             NodeMap::Iterator it;
@@ -2534,7 +2534,7 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                 out() << ")";
             }
         }
-        out() << "</p></dd>\n";
+        out() << "</dd>\n";
         curParOffset++;
     }
     out() << "</dl>\n";
-- 
cgit v0.12


From 245892ac07dd4f104601f4c3502094f54fc9c06e Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 25 May 2010 17:14:03 +0200
Subject: Remove unused function in QDBusConnectionPrivate

---
 src/dbus/qdbusconnection.cpp | 8 --------
 src/dbus/qdbusconnection_p.h | 1 -
 2 files changed, 9 deletions(-)

diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index abb3224..4382032 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -1003,14 +1003,6 @@ void QDBusConnectionPrivate::setSender(const QDBusConnectionPrivate *s)
 /*!
   \internal
 */
-void QDBusConnectionPrivate::setConnection(const QString &name, QDBusConnectionPrivate *c)
-{
-    _q_manager()->setConnection(name, c);
-}
-
-/*!
-  \internal
-*/
 void QDBusConnectionPrivate::setBusService(const QDBusConnection &connection)
 {
     busService = new QDBusConnectionInterface(connection, this);
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
index 34bb6b3..81af2c7 100644
--- a/src/dbus/qdbusconnection_p.h
+++ b/src/dbus/qdbusconnection_p.h
@@ -309,7 +309,6 @@ public:
     static QDBusConnection q(QDBusConnectionPrivate *connection) { return QDBusConnection(connection); }
 
     static void setSender(const QDBusConnectionPrivate *s);
-    static void setConnection(const QString &name, QDBusConnectionPrivate *c);
 
     friend class QDBusActivateObjectEvent;
     friend class QDBusCallDeliveryEvent;
-- 
cgit v0.12


From b105d39e12c22321e06a6c4d9e8e05aaf92036bd Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Tue, 25 May 2010 16:33:44 +0100
Subject: Build fix for spectrum demo when -qtnamespace is used

Task-number: QTBUG-10881
Reviewed-by: Liang Qi
---
 demos/spectrum/app/engine.h              |  7 ++++---
 demos/spectrum/app/mainwidget.h          | 11 ++++++-----
 demos/spectrum/app/settingsdialog.h      | 10 +++++-----
 demos/spectrum/app/spectrograph.h        |  2 +-
 demos/spectrum/app/spectrumanalyser.h    |  5 +++--
 demos/spectrum/app/tonegenerator.h       |  4 ++--
 demos/spectrum/app/tonegeneratordialog.h |  8 ++++----
 demos/spectrum/app/utils.h               |  2 +-
 demos/spectrum/app/waveform.h            |  2 +-
 9 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/demos/spectrum/app/engine.h b/demos/spectrum/app/engine.h
index 21867b3..ab5ae0d 100644
--- a/demos/spectrum/app/engine.h
+++ b/demos/spectrum/app/engine.h
@@ -64,10 +64,11 @@
 #include <QDir>
 #endif
 
-class QAudioInput;
-class QAudioOutput;
 class FrequencySpectrum;
-class QFile;
+
+QT_FORWARD_DECLARE_CLASS(QAudioInput)
+QT_FORWARD_DECLARE_CLASS(QAudioOutput)
+QT_FORWARD_DECLARE_CLASS(QFile)
 
 /**
  * This class interfaces with the QtMultimedia audio classes, and also with
diff --git a/demos/spectrum/app/mainwidget.h b/demos/spectrum/app/mainwidget.h
index 86a47e6..ddab8b7 100644
--- a/demos/spectrum/app/mainwidget.h
+++ b/demos/spectrum/app/mainwidget.h
@@ -53,11 +53,12 @@ class Waveform;
 class LevelMeter;
 class SettingsDialog;
 class ToneGeneratorDialog;
-class QAudioFormat;
-class QLabel;
-class QPushButton;
-class QMenu;
-class QAction;
+
+QT_FORWARD_DECLARE_CLASS(QAudioFormat)
+QT_FORWARD_DECLARE_CLASS(QLabel)
+QT_FORWARD_DECLARE_CLASS(QPushButton)
+QT_FORWARD_DECLARE_CLASS(QMenu)
+QT_FORWARD_DECLARE_CLASS(QAction)
 
 /**
  * Main application widget, responsible for connecting the various UI
diff --git a/demos/spectrum/app/settingsdialog.h b/demos/spectrum/app/settingsdialog.h
index 77b2b61..796b4af 100644
--- a/demos/spectrum/app/settingsdialog.h
+++ b/demos/spectrum/app/settingsdialog.h
@@ -45,11 +45,11 @@
 #include <QDialog>
 #include <QtMultimedia/QAudioDeviceInfo>
 
-class QComboBox;
-class QCheckBox;
-class QSlider;
-class QSpinBox;
-class QGridLayout;
+QT_FORWARD_DECLARE_CLASS(QComboBox)
+QT_FORWARD_DECLARE_CLASS(QCheckBox)
+QT_FORWARD_DECLARE_CLASS(QSlider)
+QT_FORWARD_DECLARE_CLASS(QSpinBox)
+QT_FORWARD_DECLARE_CLASS(QGridLayout)
 
 /**
  * Dialog used to control settings such as the audio input / output device
diff --git a/demos/spectrum/app/spectrograph.h b/demos/spectrum/app/spectrograph.h
index 45db244..ce59d90 100644
--- a/demos/spectrum/app/spectrograph.h
+++ b/demos/spectrum/app/spectrograph.h
@@ -44,7 +44,7 @@
 #include <QWidget>
 #include "frequencyspectrum.h"
 
-class QMouseEvent;
+QT_FORWARD_DECLARE_CLASS(QMouseEvent)
 
 /**
  * Widget which displays a spectrograph showing the frequency spectrum
diff --git a/demos/spectrum/app/spectrumanalyser.h b/demos/spectrum/app/spectrumanalyser.h
index 98d9d84..ab4abe1 100644
--- a/demos/spectrum/app/spectrumanalyser.h
+++ b/demos/spectrum/app/spectrumanalyser.h
@@ -58,8 +58,9 @@
 #include "FFTRealFixLenParam.h"
 #endif
 
-class QAudioFormat;
-class QThread;
+QT_FORWARD_DECLARE_CLASS(QAudioFormat)
+QT_FORWARD_DECLARE_CLASS(QThread)
+
 class FFTRealWrapper;
 
 class SpectrumAnalyserThreadPrivate;
diff --git a/demos/spectrum/app/tonegenerator.h b/demos/spectrum/app/tonegenerator.h
index 0c2f8fd..bf31179 100644
--- a/demos/spectrum/app/tonegenerator.h
+++ b/demos/spectrum/app/tonegenerator.h
@@ -44,8 +44,8 @@
 #include <QtCore/qglobal.h>
 #include "spectrum.h"
 
-class QAudioFormat;
-class QByteArray;
+QT_FORWARD_DECLARE_CLASS(QAudioFormat)
+QT_FORWARD_DECLARE_CLASS(QByteArray)
 
 /**
  * Generate a sine wave
diff --git a/demos/spectrum/app/tonegeneratordialog.h b/demos/spectrum/app/tonegeneratordialog.h
index 2e66706..c2aa892 100644
--- a/demos/spectrum/app/tonegeneratordialog.h
+++ b/demos/spectrum/app/tonegeneratordialog.h
@@ -45,10 +45,10 @@
 #include <QDialog>
 #include <QtMultimedia/QAudioDeviceInfo>
 
-class QCheckBox;
-class QSlider;
-class QSpinBox;
-class QGridLayout;
+QT_FORWARD_DECLARE_CLASS(QCheckBox)
+QT_FORWARD_DECLARE_CLASS(QSlider)
+QT_FORWARD_DECLARE_CLASS(QSpinBox)
+QT_FORWARD_DECLARE_CLASS(QGridLayout)
 
 /**
  * Dialog which controls the parameters of the tone generator.
diff --git a/demos/spectrum/app/utils.h b/demos/spectrum/app/utils.h
index 596533e..4e29030 100644
--- a/demos/spectrum/app/utils.h
+++ b/demos/spectrum/app/utils.h
@@ -44,7 +44,7 @@
 #include <QtCore/qglobal.h>
 #include <QDebug>
 
-class QAudioFormat;
+QT_FORWARD_DECLARE_CLASS(QAudioFormat)
 
 //-----------------------------------------------------------------------------
 // Miscellaneous utility functions
diff --git a/demos/spectrum/app/waveform.h b/demos/spectrum/app/waveform.h
index dce3c37..57c9eec 100644
--- a/demos/spectrum/app/waveform.h
+++ b/demos/spectrum/app/waveform.h
@@ -46,7 +46,7 @@
 #include <QPixmap>
 #include <QScopedPointer>
 
-class QByteArray;
+QT_FORWARD_DECLARE_CLASS(QByteArray)
 
 /**
  * Widget which displays a section of the audio waveform.
-- 
cgit v0.12


From ce05a9a2a4480344e6939f3c63620715c950f903 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Tue, 25 May 2010 12:55:00 +0200
Subject: Fix for Norwegian and Korean languages on symbian.

Last commits added Norwegian Nynorsk and Korean locales support, however the
array that contains the mapping between symbian locale constant and locale
string should be sorted to work.

Task-number: QT-3368
Task-number: QT-3370
Reviewed-by: trustme
---
 src/corelib/tools/qlocale.cpp         |   1 +
 src/corelib/tools/qlocale_symbian.cpp | 121 +++++++++++++++++-----------------
 2 files changed, 62 insertions(+), 60 deletions(-)

diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 519ff3d..c000dc8 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -754,6 +754,7 @@ struct WindowsToISOListElt {
     char iso_name[6];
 };
 
+/* NOTE: This array should be sorted by the first column! */
 static const WindowsToISOListElt windows_to_iso_list[] = {
     { 0x0401, "ar_SA" },
     { 0x0402, "bg\0  " },
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index b6afa12..1e674af 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -93,72 +93,73 @@ struct symbianToISO {
 
 
 /*
-  Mapping from Symbian to ISO locale
+  Mapping from Symbian to ISO locale.
+  NOTE: This array should be sorted by the first column!
 */
 static const symbianToISO symbian_to_iso_list[] = {
-    { ELangEnglish,             "en_GB" },
-    { ELangFrench,              "fr_FR" },
-    { ELangGerman,              "de_DE" },
-    { ELangSpanish,             "es_ES" },
-    { ELangItalian,             "it_IT" },
-    { ELangSwedish,             "sv_SE" },
-    { ELangDanish,              "da_DK" },
-    { ELangNorwegian,           "no_NO" },
-    { ELangNorwegianNynorsk,    "nn_NO" },
-    { ELangFinnish,             "fi_FI" },
-    { ELangAmerican,            "en_US" },
-    { ELangPortuguese,          "pt_PT" },
-    { ELangTurkish,             "tr_TR" },
-    { ELangIcelandic,           "is_IS" },
-    { ELangRussian,             "ru_RU" },
-    { ELangHungarian,           "hu_HU" },
-    { ELangDutch,               "nl_NL" },
-    { ELangBelgianFlemish,      "nl_BE" },
-    { ELangCzech,               "cs_CZ" },
-    { ELangSlovak,              "sk_SK" },
-    { ELangPolish,              "pl_PL" },
-    { ELangSlovenian,           "sl_SI" },
-    { ELangTaiwanChinese,       "zh_TW" },
-    { ELangHongKongChinese,     "zh_HK" },
-    { ELangPrcChinese,          "zh_CN" },
-    { ELangJapanese,            "ja_JP" },
-    { ELangThai,                "th_TH" },
-    { ELangArabic,              "ar_AE" },
-    { ELangTagalog,             "tl_PH" },
-    { ELangBulgarian,           "bg_BG" },
-    { ELangCatalan,             "ca_ES" },
-    { ELangCroatian,            "hr_HR" },
-    { ELangEstonian,            "et_EE" },
-    { ELangFarsi,               "fa_IR" },
-    { ELangCanadianFrench,      "fr_CA" },
-    { ELangGreek,               "el_GR" },
-    { ELangHebrew,              "he_IL" },
-    { ELangHindi,               "hi_IN" },
-    { ELangIndonesian,          "id_ID" },
-    { ELangLatvian,             "lv_LV" },
-    { ELangLithuanian,          "lt_LT" },
-    { ELangMalay,               "ms_MY" },
-    { ELangBrazilianPortuguese, "pt_BR" },
-    { ELangRomanian,            "ro_RO" },
-    { ELangSerbian,             "sr_RS" },
-    { ELangLatinAmericanSpanish,"es_419" },
-    { ELangUkrainian,           "uk_UA" },
-    { ELangUrdu,                "ur_PK" }, // India/Pakistan
-    { ELangVietnamese,          "vi_VN" },
-    { ELangKorean,              "ko_KO" },
+    { ELangEnglish,             "en_GB" },  // 1
+    { ELangFrench,              "fr_FR" },  // 2
+    { ELangGerman,              "de_DE" },  // 3
+    { ELangSpanish,             "es_ES" },  // 4
+    { ELangItalian,             "it_IT" },  // 5
+    { ELangSwedish,             "sv_SE" },  // 6
+    { ELangDanish,              "da_DK" },  // 7
+    { ELangNorwegian,           "no_NO" },  // 8
+    { ELangFinnish,             "fi_FI" },  // 9
+    { ELangAmerican,            "en_US" },  // 10
+    { ELangPortuguese,          "pt_PT" },  // 13
+    { ELangTurkish,             "tr_TR" },  // 14
+    { ELangIcelandic,           "is_IS" },  // 15
+    { ELangRussian,             "ru_RU" },  // 16
+    { ELangHungarian,           "hu_HU" },  // 17
+    { ELangDutch,               "nl_NL" },  // 18
+    { ELangBelgianFlemish,      "nl_BE" },  // 19
+    { ELangCzech,               "cs_CZ" },  // 25
+    { ELangSlovak,              "sk_SK" },  // 26
+    { ELangPolish,              "pl_PL" },  // 27
+    { ELangSlovenian,           "sl_SI" },  // 28
+    { ELangTaiwanChinese,       "zh_TW" },  // 29
+    { ELangHongKongChinese,     "zh_HK" },  // 30
+    { ELangPrcChinese,          "zh_CN" },  // 31
+    { ELangJapanese,            "ja_JP" },  // 32
+    { ELangThai,                "th_TH" },  // 33
+    { ELangArabic,              "ar_AE" },  // 37
+    { ELangTagalog,             "tl_PH" },  // 39
+    { ELangBulgarian,           "bg_BG" },  // 42
+    { ELangCatalan,             "ca_ES" },  // 44
+    { ELangCroatian,            "hr_HR" },  // 45
+    { ELangEstonian,            "et_EE" },  // 49
+    { ELangFarsi,               "fa_IR" },  // 50
+    { ELangCanadianFrench,      "fr_CA" },  // 51
+    { ELangGreek,               "el_GR" },  // 54
+    { ELangHebrew,              "he_IL" },  // 57
+    { ELangHindi,               "hi_IN" },  // 58
+    { ELangIndonesian,          "id_ID" },  // 59
+    { ELangKorean,              "ko_KO" },  // 65
+    { ELangLatvian,             "lv_LV" },  // 67
+    { ELangLithuanian,          "lt_LT" },  // 68
+    { ELangMalay,               "ms_MY" },  // 70
+    { ELangNorwegianNynorsk,    "nn_NO" },  // 75
+    { ELangBrazilianPortuguese, "pt_BR" },  // 76
+    { ELangRomanian,            "ro_RO" },  // 78
+    { ELangSerbian,             "sr_RS" },  // 79
+    { ELangLatinAmericanSpanish,"es_419" }, // 83
+    { ELangUkrainian,           "uk_UA" },  // 93
+    { ELangUrdu,                "ur_PK" },  // 94 - India/Pakistan
+    { ELangVietnamese,          "vi_VN" },  // 96
 #ifdef __E32LANG_H__
 // 5.0
-    { ELangBasque,              "eu_ES" },
-    { ELangGalician,            "gl_ES" },
+    { ELangBasque,              "eu_ES" },  // 102
+    { ELangGalician,            "gl_ES" },  // 103
 #endif
 #if !defined(__SERIES60_31__)
-    { ELangEnglish_Apac,        "en" },
-    { ELangEnglish_Taiwan,      "en_TW" },
-    { ELangEnglish_HongKong,    "en_HK" },
-    { ELangEnglish_Prc,         "en_CN" },
-    { ELangEnglish_Japan,       "en_JP"},
-    { ELangEnglish_Thailand,    "en_TH" },
-    { ELangMalay_Apac,          "ms" }
+    { ELangEnglish_Apac,        "en" },     // 129
+    { ELangEnglish_Taiwan,      "en_TW" },  // 157 ### Not supported by CLDR
+    { ELangEnglish_HongKong,    "en_HK" },  // 158
+    { ELangEnglish_Prc,         "en_CN" },  // 159 ### Not supported by CLDR
+    { ELangEnglish_Japan,       "en_JP"},   // 160 ### Not supported by CLDR
+    { ELangEnglish_Thailand,    "en_TH" },  // 161 ### Not supported by CLDR
+    { ELangMalay_Apac,          "ms" }      // 326
 #endif
 };
 
-- 
cgit v0.12


From 132933df69b355695dd9401d81b7bc2ac5f5684f Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Tue, 25 May 2010 17:14:09 +0200
Subject: Fixed a typo in variable name in qlocale data generator.

Reviewed-by: trustme
---
 util/local_database/cldr2qlocalexml.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/local_database/cldr2qlocalexml.py b/util/local_database/cldr2qlocalexml.py
index 20a7d34..1d9ccda 100755
--- a/util/local_database/cldr2qlocalexml.py
+++ b/util/local_database/cldr2qlocalexml.py
@@ -123,7 +123,7 @@ def generateLocaleInfo(path):
     result['language_id'] = language_id
     result['country_id'] = country_id
 
-    numberingSystem = None
+    numbering_system = None
     try:
         numbering_system = findEntry(path, "numbers/defaultNumberingSystem")
     except:
-- 
cgit v0.12


From a32c96e753c2f5a123e518a92762ec9c9ff3b0b7 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Tue, 25 May 2010 17:27:38 +0200
Subject: Dont crash when assigning the same input context twice.

Added a guard check to return if the given input context is the same is we
already have.

Explicitly mention in the doc that we take ownership of the given input context
object.

Task-number: QTBUG-10780
Reviewed-by: Thomas Zander
---
 src/gui/kernel/qapplication.cpp | 10 ++++++----
 src/gui/kernel/qwidget.cpp      |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index b805a72..57c4c99 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -5270,18 +5270,20 @@ bool QApplication::keypadNavigationEnabled()
     This function replaces the QInputContext instance used by the application
     with \a inputContext.
 
+    Qt takes ownership of the given \a inputContext.
+
     \sa inputContext()
 */
 void QApplication::setInputContext(QInputContext *inputContext)
 {
-    Q_D(QApplication);
-    Q_UNUSED(d);// only static members being used.
+    if (inputContext == QApplicationPrivate::inputContext)
+        return;
     if (!inputContext) {
         qWarning("QApplication::setInputContext: called with 0 input context");
         return;
     }
-    delete d->inputContext;
-    d->inputContext = inputContext;
+    delete QApplicationPrivate::inputContext;
+    QApplicationPrivate::inputContext = inputContext;
 }
 
 /*!
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 1c7f6ac..569af42 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -312,6 +312,8 @@ QInputContext *QWidget::inputContext()
   This function sets the input context \a context
   on this widget.
 
+  Qt takes ownership of the given input \a context.
+
   \sa inputContext()
 */
 void QWidget::setInputContext(QInputContext *context)
@@ -320,6 +322,8 @@ void QWidget::setInputContext(QInputContext *context)
     if (!testAttribute(Qt::WA_InputMethodEnabled))
         return;
 #ifndef QT_NO_IM
+    if (context == d->ic)
+        return;
     if (d->ic)
         delete d->ic;
     d->ic = context;
-- 
cgit v0.12


From afe3c2e741b372f88bf37c1df95ad30b468931e8 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Tue, 25 May 2010 17:49:43 +0200
Subject: Fix the compilation for tst_qabstractprintdialog and tst_qprinter on
 symbian.

---
 tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp |  8 ++++++++
 tests/auto/qprinter/tst_qprinter.cpp                         | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
index 15f427c..0700e9e 100644
--- a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
+++ b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
@@ -50,6 +50,8 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG)
+
 class tst_QAbstractPrintDialog : public QObject
 {
 Q_OBJECT
@@ -141,3 +143,9 @@ void tst_QAbstractPrintDialog::setFromTo()
 
 QTEST_MAIN(tst_QAbstractPrintDialog)
 #include "tst_qabstractprintdialog.moc"
+
+#else
+
+QTEST_NOOP_MAIN
+
+#endif
diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp
index b1ff425..e52e1b5 100644
--- a/tests/auto/qprinter/tst_qprinter.cpp
+++ b/tests/auto/qprinter/tst_qprinter.cpp
@@ -64,11 +64,13 @@
 
 Q_DECLARE_METATYPE(QRect)
 
-
+QT_FORWARD_DECLARE_CLASS(QPrinter)
 
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#ifndef QT_NO_PRINTER
+
 class tst_QPrinter : public QObject
 {
     Q_OBJECT
@@ -215,7 +217,6 @@ tst_QPrinter::tst_QPrinter()
 
 tst_QPrinter::~tst_QPrinter()
 {
-
 }
 
 // initTestCase will be executed once before the first testfunction is executed.
@@ -1007,3 +1008,9 @@ void tst_QPrinter::taskQTBUG4497_reusePrinterOnDifferentFiles()
 
 QTEST_MAIN(tst_QPrinter)
 #include "tst_qprinter.moc"
+
+#else //QT_NO_PRINTER
+
+QTEST_NOOP_MAIN
+
+#endif //QT_NO_PRINTER
-- 
cgit v0.12


From 70ae881499ec329e6fdf96d56a6189f77641b3b0 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Tue, 25 May 2010 17:49:43 +0200
Subject: Fix the compilation for tst_qabstractprintdialog and tst_qprinter on
 symbian.

---
 tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp |  8 ++++++++
 tests/auto/qprinter/tst_qprinter.cpp                         | 11 +++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
index 15f427c..0700e9e 100644
--- a/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
+++ b/tests/auto/qabstractprintdialog/tst_qabstractprintdialog.cpp
@@ -50,6 +50,8 @@
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG)
+
 class tst_QAbstractPrintDialog : public QObject
 {
 Q_OBJECT
@@ -141,3 +143,9 @@ void tst_QAbstractPrintDialog::setFromTo()
 
 QTEST_MAIN(tst_QAbstractPrintDialog)
 #include "tst_qabstractprintdialog.moc"
+
+#else
+
+QTEST_NOOP_MAIN
+
+#endif
diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp
index 8b79533..e908961 100644
--- a/tests/auto/qprinter/tst_qprinter.cpp
+++ b/tests/auto/qprinter/tst_qprinter.cpp
@@ -64,11 +64,13 @@
 
 Q_DECLARE_METATYPE(QRect)
 
-
+QT_FORWARD_DECLARE_CLASS(QPrinter)
 
 //TESTED_CLASS=
 //TESTED_FILES=
 
+#ifndef QT_NO_PRINTER
+
 class tst_QPrinter : public QObject
 {
     Q_OBJECT
@@ -217,7 +219,6 @@ tst_QPrinter::tst_QPrinter()
 
 tst_QPrinter::~tst_QPrinter()
 {
-
 }
 
 // initTestCase will be executed once before the first testfunction is executed.
@@ -1056,3 +1057,9 @@ void tst_QPrinter::testPdfTitle()
 
 QTEST_MAIN(tst_QPrinter)
 #include "tst_qprinter.moc"
+
+#else //QT_NO_PRINTER
+
+QTEST_NOOP_MAIN
+
+#endif //QT_NO_PRINTER
-- 
cgit v0.12


From 3955a8d51f951b3c8cc7a6ceb565370391f83294 Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Tue, 25 May 2010 16:58:10 +0100
Subject: My 4.6.3 changes

---
 dist/changes-4.6.3 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3
index 6a81f6a..c1ace7b 100644
--- a/dist/changes-4.6.3
+++ b/dist/changes-4.6.3
@@ -233,6 +233,12 @@ Third party components
 
  - Updated bar to the latest version from baz.org.
 
+Demos
+-----
+
+ - QtMultimedia
+    * Spectrum analyzer application
+
 
 ****************************************************************************
 *                      Platform Specific Changes                           *
-- 
cgit v0.12


From d0e1e7c1249348eeba128c71681cfa916c9e5ae1 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Wed, 26 May 2010 09:43:11 +1000
Subject: Fix build when snap functionality is not available.

---
 src/plugins/bearer/symbian/qnetworksession_impl.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.h b/src/plugins/bearer/symbian/qnetworksession_impl.h
index 9767293..b045ff1 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.h
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.h
@@ -73,9 +73,9 @@ QT_BEGIN_NAMESPACE
 class ConnectionProgressNotifier;
 class SymbianEngine;
 
-class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate, public CActive,
+class QNetworkSessionPrivateImpl : public QNetworkSessionPrivate, public CActive
 #ifdef SNAP_FUNCTIONALITY_AVAILABLE
-                                   public MMobilityProtocolResp
+                                 , public MMobilityProtocolResp
 #endif
 {
     Q_OBJECT
-- 
cgit v0.12


From aa936799f1fad4d51fee84b320943de6dff49380 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Tue, 25 May 2010 16:52:47 +0300
Subject: My 4.6.3 changes

Reviewed-by: TrustMe
---
 dist/changes-4.6.3 | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 84 insertions(+), 4 deletions(-)

diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3
index c1ace7b..05cb6ea 100644
--- a/dist/changes-4.6.3
+++ b/dist/changes-4.6.3
@@ -226,6 +226,15 @@ Qt Plugins
  - foo
     * bar
 
+Examples & demos
+----------------
+  - Added exit softkey to Wiggly example
+  - Added close button to Anomaly demo
+  - [QTBUG-10635]: Fixed Anomaly demo controlstrip icon placement for very
+                   small screens
+
+
+
 Third party components
 ----------------------
 
@@ -301,10 +310,77 @@ Qt for Windows CE
 Qt for Symbian
 --------------
 
- - [QT-567] Implementation of QtMultimedia QAudio* APIs
- - [QTBUG-8919] Modified Phonon MMF backend to support video playback on
-   platforms which use graphics surfaces (i.e. platforms using the
-   New Graphics Architecture a.k.a. ScreenPlay)
+ - multimedia
+   * [QT-567] Implementation of QtMultimedia QAudio* APIs
+   * [QTBUG-8919] Modified Phonon MMF backend to support video playback on
+     platforms which use graphics surfaces (i.e. platforms using the
+     New Graphics Architecture a.k.a. ScreenPlay)
+
+ - mkspecs
+   * Changed pkg_prerules to not use default_deployment for vendor ID
+   * Added forwarding headers for qplatformdefs.h in Symbian mkspecs
+   * Added some missing IBY export paths to platform_path.prf
+   * Fixed libstdcpp.dll version autodetection for Symbian
+   * [QTBUG-7836]: Removed unnecessary dependency to moc.exe from Symbian
+     builds.
+   * [QT-1171]: Fixed libstdcpp.dll version autodetection
+   * [QTBUG-8513]: Fixed misc FLM issues
+   * [QT-2909]: Support for adding conditional MMP_RULES
+   * [QT-3253]: Export .flm files always if they are different
+   * [QTBUG-9279]: Made it possible to define more than one language using
+                   pkg_prerules
+   * [QTBUG-6795]: Made sure target path exists in
+                   qmake_extra_pre_targetdep.flm
+   * [QTBUG-7883]: Only use unix-like tools when not building for Symbian
+                   in Windows
+
+ - configure
+   * [QTBUG-7942]: Fix QT_BUILD_KEY for Symbian in Windows builds.
+
+     IMPORTANT NOTE: The build key change causes all Qt for Symbian plugins
+                     made with Qt 4.6.2 or earlier version incompatible with
+                     Qt 4.6.3 and later.
+
+   * [QTBUG-9065]: Support for -qtlibinfix parameter in Symbian
+
+ - qmake
+   * Changed canonical paths to absolute paths in symmake.
+   * Basic deployment support for ROM in Symbian.
+   * Add '.' dir as the first include directory in Symbian
+   * [QT-3017]: Support for conditional subdirs
+   * [QT-3083]: Expanded support for RSS_RULES
+   * [QTBUG-8685]: RVCT 4 support to Symbian builds
+   * [QT-3147]: Changed Symbian pkg files to deploy from under epoc32
+   * [QT-2985]: Fix extensions section in bld.inf when CONFIG contains
+                symbian_test
+
+ - S60installs
+   * Export qtdemoapps.iby to proper location
+   * [QT-3163]: Removed QtDeclarative.dll deployment from qt.iby
+
+ - QProcess
+   * [QTBUG-7735]: Fixed crash at application exit when QProcess was used in
+                   Symbian
+   * [QTBUG-8906]: Removed extra space from the command line passed to
+                   QProcess in Symbian
+
+ - QtGui
+   * QUnixPrintWidget is no longer declared in Symbian
+   * [QTBUG-10207]: Fixed long menu item texts causing crash
+
+ - Examples & demos:
+   * Enabled more examples by default in Symbian builds
+
+ - Documentation
+   * [QTBUG-9277]: Clarified pkg_prerules usage documentation
+
+ - Plugins:
+   * Fixed sqlite3_v9.2.zip to export sqlite3.iby to correct location.
+
+ - General
+   * [QT-3055]: Fixed filename cases to support building Qt for Symbian in
+                Linux
+
 
 ****************************************************************************
 *                          Tools                                           *
@@ -319,6 +395,10 @@ Qt for Symbian
  - Linguist
    * baz
 
+ - qmake
+    * Fixed qmake.pro for using with mingw
+
+
 ****************************************************************************
 * Important Behavior Changes *
 ****************************************************************************
-- 
cgit v0.12


From 155734c796c99fefa7106b89c9af79eb408ce4d2 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Wed, 26 May 2010 17:37:38 +1000
Subject: Tidy changes file for 4.6.3.

Reviewed-by: Trust Me
---
 dist/changes-4.6.3 | 356 +++++++++++++++++++++--------------------------------
 1 file changed, 137 insertions(+), 219 deletions(-)

diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3
index 05cb6ea..6ac0c7e 100644
--- a/dist/changes-4.6.3
+++ b/dist/changes-4.6.3
@@ -20,17 +20,14 @@ Merge Request:  http://qt.gitorious.org
 *                           General                                        *
 ****************************************************************************
 
-New features
-------------
+Examples and Demos
+------------------
 
- - SomeClass, SomeOtherClass
-    * New classes for foo, bar and baz
-
-Optimizations
--------------
-
- - Optimized foo in QSomeClass
-    * See list of Important Behavior Changes below
+ - Added Spectrum analyzer demo application.
+ - Added exit softkey to Wiggly example.
+ - Added close button to Anomaly demo.
+ - [QTBUG-10635]: Fixed Anomaly demo controlstrip icon placement for very
+   small screens.
 
 
 ****************************************************************************
@@ -42,43 +39,94 @@ QtCore
 
  - QStateMachine
     * [QTBUG-8842] Ensure history configuration is cleared when a state
-      machine is restarted
+      machine is restarted.
+
  - QXmlStreamReader
-    * [QTBUG-9196] fixed crash when parsing
+    * [QTBUG-9196] Fixed crash when parsing.
 
 QtGui
 -----
 
+ - QCommonStyle
+    * [QTBUG-7137] Fixed a bug that led to missing text pixels in QTabBar when
+      using small font sizes.
+
+ - QCUPSSupport
+    * [QTBUG-10512] Fixed a potential crash with misconfigured CUPS printers.
+    * [QTBUG-6419] Make QCUPSSupport::printerHasPPD() release temporary file
+      handles.
+
+ - qDrawPixmaps()
+    * [QTBUG-8455] Fixed qDrawPixmaps() to draw on integer coordinates under
+      Mac OS X.
+
+ - QFontEngine
+    * [QTBUG-3976] Fixed a leak for QFont objects used in threads.
+
+ - QGifHandler
+    * [QTBUG-7037] Fixed QGifHandler::loopCount().
+    * [QTBUG-6696] Cache the sizes of images in an animated GIF.
+
  - QGraphicsEffect
-    * [QTBUG-5358] Fixed warnings and crash when painting graphics effects outside scene.
+    * [QTBUG-5358] Fixed warnings and crash when painting graphics effects
+      outside scene.
 
  - QGraphicsItem
     * [QTBUG-9391] Avoid a useless repaint when setting the cache mode to
       DeviceCoordinateMode while already using that mode.
-    * [QTBUG-8475] Fixed crash and loss of focus when deleting a child of a focus scope.
+    * [QTBUG-8475] Fixed crash and loss of focus when deleting a child of a
+      focus scope.
 
  - QGraphicsProxyWidget
     * [QTBUG-5349] Fixed tooltips not being shown for QGraphicsProxyWidget.
     * [QTBUG-2883] Fixed tooltips appearing at wrong location.
-    * [QTBUG-7296] Fixed painting artifacts on a scaled proxy when the view is scrolled.
+    * [QTBUG-7296] Fixed painting artifacts on a scaled proxy when the view
+      is scrolled.
 
  - QGraphicsScene
-    * [QTBUG-7863] Fixed incorrect blending when using QGraphicsItem:DeviceCoordinateCache
-    and when the item is semi-transparent. If the item is transformed, the cache is now
-    always fully repainted to avoid artifacts.
+    * [QTBUG-7863] Fixed incorrect blending when using
+      QGraphicsItem::DeviceCoordinateCache and when the item is semi-
+      transparent. If the item is transformed, the cache is now always fully
+      repainted to avoid artifacts.
 
  - QGraphicsView
     * Item tooltips are not clipped by the view anymore.
 
+ - QImageReader
+    * [QTBUG-7980] Fixed QImageReader::setAutoDetectImageFormat() to work with
+      plugins.
+
  - QPainter
-	* [QTBUG-10421] Fixed WebKit-specific justification bug for text containing
-       more than one script.
+    * [QTBUG-8140] Speed up custom bitmap brushes under X11 without Xrender
+      support.
+    * [QTBUG-8032] Fixed drawing pixmaps onto bitmaps on X11 without Xrender
+      support.
+    * [QTBUG-10421] Fixed WebKit-specific justification bug for text containing
+      more than one script.
+
+ - QPDFBaseEngine
+    * [QTBUG-8451] Fixed line and point drawing in the PS and PDF generators.
+
+ - QPixmap
+    * [QTBUG-8606] Fixed QPixmap::load() to not modify referenced copies.
+
+ - QPSPrintEngine
+    * [QTBUG-10121] Fixed incorrect version setting for EPS files.
+    * [QTBUG-10140] Fixed generation of the %%BoundingBox operator to output
+      integer values instead of floating point values.
+
+ - QRasterPaintEngine
+    * [QTBUG-9036] Fixed ClearType text rendering on translucent surfaces under
+      Windows.
 
  - QRegion
     * [QTBUG-7699] Prevented crash on large x-coordinates.
 
+ - QTextDocument
+    * [QTBUG-10301] Fixed a leak in QTextDocument::print().
+
  - QTextEdit
-	* [QTBUG-9599] Fixed crash when copying the current text cursor  as a result
+    * [QTBUG-9599] Fixed crash when copying the current text cursor as a result
       of deleting a character.
 
  - QTextEngine
@@ -92,82 +140,35 @@ QtGui
     * [QTBUG-8557] Fixed bug in QTransform::type() potentially occuring
       after using operator/ or operator* or their overloads.
 
- - Improved scrolling horizontally with a mouse wheel over sliders.
- - [QTBUG-7451] Gestures respect panels on QGraphicsView.
-
- - QCUPSSupport
-    * [QTBUG-10512] Fixed a potential crash with misconfigured CUPS printers.
-    * [QTBUG-6419] Make QCUPSSupport::printerHasPPD() release temporary file
-      handles.
-
- - QPDFBaseEngine
-    * [QTBUG-8451] Fixed line and point drawing in the PS and PDF generators.
-
- - QTextDocument
-    * [QTBUG-10301] Fixed a leak in QTextDocument::print().
-
- - QFontEngine
-    * [QTBUG-3976] Fixed a leak for QFont objects used in threads.
-
- - QPSPrintEngine
-    * [QTBUG-10121] Fixed incorrect version setting for EPS files.
-    * [QTBUG-10140] Fixed generation of the %%BoundingBox operator to output
-      integer values instead of floating point values.
+ - QTriangulatingStroker
+    * [QTBUG-9548] Fixed possible data corruption when certain paths were
+      triangulated.
 
  - QWin32PrintEngine
     * [QTBUG-9938] Fixed a crash on Windows 7 systems with invalid PrinterPorts
       registry entries.
 
- - QTriangulatingStroker
-    * [QTBUG-9548] Fixed possible data corruption when certain paths were triangulated.
-
- - QRasterPaintEngine
-    * [QTBUG-9036] Fixed ClearType text rendering on translucent surfaces under Windows.
-
- - QPixmap
-    * [QTBUG-8606] Fixed QPixmap::load() to not modify referenced copies.
-
- - QPainter
-    * [QTBUG-8140] Speed up custom bitmap brushes under X11 without Xrender support.
-    * [QTBUG-8032] Fixed drawing pixmaps onto bitmaps on X11 without Xrender support.
-
- - QImageReader
-    * [QTBUG-7980] Fixed QImageReader::setAutoDetectImageFormat() to work with plugins.
-
- - QGifHandler
-    * [QTBUG-7037] Fixed QGifHandler::loopCount().
-    * [QTBUG-6696] Cache the sizes of images in an animated GIF.
-
- - qDrawPixmaps()
-    * [QTBUG-8455] Fixed qDrawPixmaps() to draw on integer coordinates under Mac OS X.
-
- - QCommonStyle
-    * [QTBUG-7137] Fixed a bug that led to missing text pixels in QTabBar when using
-      small font sizes.
-
-
-QtDBus
-------
-
- - foo
-    * bar
-
-QtNetwork
----------
-
- - foo
-    * bar
+ - Improved scrolling horizontally with a mouse wheel over sliders.
+ - [QTBUG-7451] Gestures respect panels on QGraphicsView.
 
 QtOpenGL
 --------
 
  - QOpenGLPaintEngine
-    * [QTBUG-10529] Fixed an issue where bound pixmaps were not released correctly
-      in the GL 1 engine.
+    * [QTBUG-10529] Fixed an issue where bound pixmaps were not released
+      correctly in the GL 1 engine.
 
  - QGL2PaintEngineEx
-    * [QTBUG-8681] Fixed an application exit crash that could occur in
-      the GL2 engine under X11.
+    * [QTBUG-8681] Fixed an application exit crash that could occur in the GL2
+      engine under X11.
+
+ - QGLContext
+    * [QTBUG-5732] Fixed a GLX warning that occured with some Intel chipsets
+      under X11.
+
+ - QGLPixelBuffer
+    * [QTBUG-8047] Fixed usage of QGLPixelBuffer with share widgets on other
+      X11 screens.
 
  - QGLWidget
     * [QTBUG-7545] Fixed QGLWidget::grabFrameBuffer() to honor the 'withAlpha' flag.
@@ -177,87 +178,38 @@ QtOpenGL
     * [QTBUG-8753] Worked around driver bug causing clipping errors on the N900.
     * [QTBUG-10510] Workaround ATI driver bug when using QGraphicsEffect with GL.
 
- - QGLContext
-    * [QTBUG-5732] Fixed a GLX warning that occured with some Intel chipsets under X11.
-
- - QGLPixelBuffer
-    * [QTBUG-8047] Fixed usage of QGLPixelBuffer with share widgets on other X11 screens.
-
 QtScript
 --------
 
- - [QTBUG-7066] Fixed regression introduced in 4.6.0 that made it not
-   possible to change the prototype of the global object
- - [QTBUG-8366] Fixed regression introduced in 4.6.0 that caused the
-   instanceof operator to throw an error when the right-hand-side is
-   generated by QScriptEngine::newQMetaObject()
- - [QTBUG-8400] Fixed memory leak when lazily binding QScriptValue to an
-   engine
- - [QTBUG-9775] Fixed regression introduced in 4.6.0 that caused the
-   qsTr() function not to resolve the translation context correctly when
-   invoked in the global scope
- - QScriptClass
-   * [QTBUG-8364] Fixed regression introduced in 4.6.0 that could cause
-     the Callable extension to crash
- - QScriptEngine
-   * [QTBUG-6437] Fixed regression introduced in 4.6.0 that made
-     installTranslatorFunctions() not work with custom global object
-
-QtSql
------
-
- - foo
-    * bar
+ - [QTBUG-7066] Fixed regression introduced in 4.6.0 that made it impossible to
+   change the prototype of the global object.
+ - [QTBUG-8366] Fixed regression introduced in 4.6.0 that caused the instanceof
+   operator to throw an error when the right-hand-side is generated by
+   QScriptEngine::newQMetaObject().
+ - [QTBUG-8400] Fixed memory leak when lazily binding QScriptValue to an engine.
+ - [QTBUG-9775] Fixed regression introduced in 4.6.0 that caused the qsTr()
+   function not to resolve the translation context correctly when invoked in
+   the global scope.
+ - [QTBUG-8364] Fixed regression introduced in QScriptclass in 4.6.0 that could
+   cause the Callable extension to crash.
+ - [QTBUG-6437] Fixed regression introduced in QScriptEngine in 4.6.0 that made
+   installTranslatorFunctions() not work with custom global object.
 
 QtXml
 -----
 
- - [QTBUG-8398] QDom: prevent infinite loop when cloning a DTD
+ - [QTBUG-8398] QDom: prevent infinite loop when cloning a DTD.
 
 QtXmlPatterns
 -------------
-- [QTBUG-8920] fixed crash with anonymous types in XsdSchemaChecker
-- [QTBUG-8394] include/import/redefine schemas only once
-- QXmlSchema: fix crash with referencing elements
-
-Qt Plugins
-----------
-
- - foo
-    * bar
-
-Examples & demos
-----------------
-  - Added exit softkey to Wiggly example
-  - Added close button to Anomaly demo
-  - [QTBUG-10635]: Fixed Anomaly demo controlstrip icon placement for very
-                   small screens
-
-
-
-Third party components
-----------------------
-
- - Updated foo to version 2.3.9.
-
- - Updated bar to the latest version from baz.org.
-
-Demos
------
-
- - QtMultimedia
-    * Spectrum analyzer application
-
+  - [QTBUG-8920] fixed crash with anonymous types in XsdSchemaChecker.
+  - [QTBUG-8394] include/import/redefine schemas only once.
+  - QXmlSchema: fix crash with referencing elements.
 
 ****************************************************************************
 *                      Platform Specific Changes                           *
 ****************************************************************************
 
-Qt for Unix (X11 and Mac OS X)
-------------------------------
-
- -
-
 Qt for Linux/X11
 ----------------
 
@@ -272,26 +224,10 @@ Qt for Windows
  - [QTBUG-6007] On Windows we query if there is a touch screen and do not try
    to enable gestures otherwise.
  - QLocalSocket
-    * [QTBUG-7815] Pipe handle leak fixed, when closing a QLocalSocket that still has
-      unwritten data.
+    * [QTBUG-7815] Pipe handle leak fixed, when closing a QLocalSocket that
+      still has unwritten data.
     * [QTBUG-9681] Fixed closing state for local sockets with unwritten data.
-    * [QTBUG-8418] Detection of Windows mobile 6.5 fixed.
-
-
-Qt for Mac OS X
----------------
-
- -
-
-Qt for Embedded Linux
----------------------
-
- -
-
-DirectFB
---------
-
- -
+    * [QTBUG-8418] Detection of Windows Mobile 6.5 fixed.
 
 Qt for Windows CE
 -----------------
@@ -303,36 +239,34 @@ Qt for Windows CE
 
 - QWindowsMobileStyle
    * [QTBUG-8419] Huge performance penalty for QTabWidget fixed for
-     Windows mobile 6.5.
+     Windows Mobile 6.5.
    * [QTBUG-8757] QTabBar scroll button size has been fixed.
 
-
 Qt for Symbian
 --------------
 
- - multimedia
-   * [QT-567] Implementation of QtMultimedia QAudio* APIs
+ - Multimedia
+   * [QT-567] Implementation of QtMultimedia QAudio* APIs.
    * [QTBUG-8919] Modified Phonon MMF backend to support video playback on
      platforms which use graphics surfaces (i.e. platforms using the
-     New Graphics Architecture a.k.a. ScreenPlay)
+     New Graphics Architecture a.k.a. ScreenPlay).
 
  - mkspecs
-   * Changed pkg_prerules to not use default_deployment for vendor ID
-   * Added forwarding headers for qplatformdefs.h in Symbian mkspecs
-   * Added some missing IBY export paths to platform_path.prf
-   * Fixed libstdcpp.dll version autodetection for Symbian
+   * Changed pkg_prerules to not use default_deployment for vendor ID.
+   * Added forwarding headers for qplatformdefs.h in Symbian mkspecs.
+   * Added some missing IBY export paths to platform_path.prf.
+   * Fixed libstdcpp.dll version autodetection for Symbian.
    * [QTBUG-7836]: Removed unnecessary dependency to moc.exe from Symbian
      builds.
-   * [QT-1171]: Fixed libstdcpp.dll version autodetection
-   * [QTBUG-8513]: Fixed misc FLM issues
-   * [QT-2909]: Support for adding conditional MMP_RULES
-   * [QT-3253]: Export .flm files always if they are different
+   * [QT-1171]: Fixed libstdcpp.dll version autodetection.
+   * [QTBUG-8513]: Fixed misc FLM issues.
+   * [QT-2909]: Support for adding conditional MMP_RULES.
+   * [QT-3253]: Export .flm files always if they are different.
    * [QTBUG-9279]: Made it possible to define more than one language using
-                   pkg_prerules
-   * [QTBUG-6795]: Made sure target path exists in
-                   qmake_extra_pre_targetdep.flm
+     pkg_prerules.
+   * [QTBUG-6795]: Made sure target path exists in qmake_extra_pre_targetdep.flm.
    * [QTBUG-7883]: Only use unix-like tools when not building for Symbian
-                   in Windows
+     in Windows.
 
  - configure
    * [QTBUG-7942]: Fix QT_BUILD_KEY for Symbian in Windows builds.
@@ -341,67 +275,51 @@ Qt for Symbian
                      made with Qt 4.6.2 or earlier version incompatible with
                      Qt 4.6.3 and later.
 
-   * [QTBUG-9065]: Support for -qtlibinfix parameter in Symbian
+   * [QTBUG-9065]: Support for -qtlibinfix parameter in Symbian.
 
  - qmake
    * Changed canonical paths to absolute paths in symmake.
    * Basic deployment support for ROM in Symbian.
-   * Add '.' dir as the first include directory in Symbian
-   * [QT-3017]: Support for conditional subdirs
-   * [QT-3083]: Expanded support for RSS_RULES
-   * [QTBUG-8685]: RVCT 4 support to Symbian builds
-   * [QT-3147]: Changed Symbian pkg files to deploy from under epoc32
+   * Add '.' dir as the first include directory in Symbian.
+   * [QT-3017]: Support for conditional subdirs.
+   * [QT-3083]: Expanded support for RSS_RULES.
+   * [QTBUG-8685]: RVCT 4 support to Symbian builds.
+   * [QT-3147]: Changed Symbian pkg files to deploy from under epoc32.
    * [QT-2985]: Fix extensions section in bld.inf when CONFIG contains
-                symbian_test
+     symbian_test.
 
  - S60installs
-   * Export qtdemoapps.iby to proper location
-   * [QT-3163]: Removed QtDeclarative.dll deployment from qt.iby
+   * Export qtdemoapps.iby to proper location.
+   * [QT-3163]: Removed QtDeclarative.dll deployment from qt.iby.
 
  - QProcess
    * [QTBUG-7735]: Fixed crash at application exit when QProcess was used in
-                   Symbian
+     Symbian.
    * [QTBUG-8906]: Removed extra space from the command line passed to
-                   QProcess in Symbian
+     QProcess in Symbian.
 
  - QtGui
-   * QUnixPrintWidget is no longer declared in Symbian
-   * [QTBUG-10207]: Fixed long menu item texts causing crash
+   * QUnixPrintWidget is no longer declared in Symbian.
+   * [QTBUG-10207]: Fixed long menu item texts causing crash.
 
  - Examples & demos:
-   * Enabled more examples by default in Symbian builds
+   * Enabled more examples by default in Symbian builds.
 
  - Documentation
-   * [QTBUG-9277]: Clarified pkg_prerules usage documentation
+   * [QTBUG-9277]: Clarified pkg_prerules usage documentation.
 
  - Plugins:
    * Fixed sqlite3_v9.2.zip to export sqlite3.iby to correct location.
 
  - General
    * [QT-3055]: Fixed filename cases to support building Qt for Symbian in
-                Linux
+     Linux.
 
 
 ****************************************************************************
 *                          Tools                                           *
 ****************************************************************************
 
- - Designer
-   * foo
-
- - qdoc3
-   * bar
-
- - Linguist
-   * baz
-
  - qmake
     * Fixed qmake.pro for using with mingw
 
-
-****************************************************************************
-* Important Behavior Changes *
-****************************************************************************
-
- -
-
-- 
cgit v0.12


From 1829a8e4ef69ba7c155b72bc9c5622a864265891 Mon Sep 17 00:00:00 2001
From: Sami Merila <sami.merila@nokia.com>
Date: Wed, 26 May 2010 11:34:14 +0300
Subject: My 4.6.3 changes

---
 dist/changes-4.6.3 | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3
index 6ac0c7e..a332580 100644
--- a/dist/changes-4.6.3
+++ b/dist/changes-4.6.3
@@ -301,6 +301,51 @@ Qt for Symbian
  - QtGui
    * QUnixPrintWidget is no longer declared in Symbian.
    * [QTBUG-10207]: Fixed long menu item texts causing crash.
+   * [QTBUG-9910] Fixed incorrect dialog position when native AVKON combined
+     status-and-control pane is in use.
+   * [QTBUG-4875] Made QMessageBox match size with native Symbian messageBox.
+   * [QTBUG-5539] Fixed QMessageBox to stretch to screen width with very small
+     content.
+   * [QTBUG-7828] Fixed Virtual keyboard closing issue with Sym^3.
+   * [QTBUG-9480] Use focus widget palette colors to show T9 suggested or
+     autocompletion words in QCoeFepInputContext.
+   * [QTBUG-10006] Changed default supported text modes to all, instead of just
+     lower and upper cases in QCoeFepInputContext.
+   * [QT-3277] Support text selection in QCoeFepInputContext for Sym^3.
+   * [QT-3008] Fixed crash in QGraphicsScenePrivate::setFocusItemHelper.
+
+ - QS60Style
+    * [QTBUG-10697] Support native-like selection in item views.
+    * [QTBUG-10454] Made styled sliders match in size to native sliders.
+    * [QTBUG-10073] Fixed QMenu with a lot of menu items.
+    * [QTBUG-3102] Fixed QTabWidget icon size issue.
+    * [QTBUG-5001] Show combobox list as a popup instead of dropdown list.
+    * [QTBUG-7258] Fixed calculations of PM_FocusFrameVMargin and
+      PM_FocusFrameHMargin pixel metrics.
+    * [QTBUG-7996] Fixed squeezed scrollbar handle and groove ends.
+    * [QTBUG-8193] Fixed drag-n-drop drop area drawing issue.
+    * [QTBUG-8194] Removed scrollbar context menu support.
+    * [QTBUG-8704] Fixed palette issues when drawing highlighted text.
+    * [QTBUG-9212] Fixed itemview multiselection issues.
+    * [QTBUG-9321] Fixed very large spinboxes drawing issues.
+    * [QTBUG-9837] Fixed text cutting issues with narrow QComboBoxes.
+    * [QTBUG-9844] Fixed QTreeView branch drawing issues in right to left
+      UI layout.
+    * [QTBUG-9927] Fixed transparent list higlight to show up correctly for
+      S60 3rd edition FP1 devices.
+    * [QTBUG-10064] Removed focus frame drawing for context menus and popups.
+    * [QTBUG-10487] Fixed QToolButton to be drawn pressed when context menu
+      for that button is open.
+    * [QTBUG-10549] Fixed style to honor stylesheet when drawing focus frame
+      for QPushButtons.
+    * [QT-3295] Made QMenu to look more native-like.
+    * [QT-3185] Fixed border frames to be drawn transparent for Sym^3 devices.
+    * [QT-3148] Draw application background correctly when animated wallpaper
+      is used in Sym^3 device.
+    * [QT-3137] Launch virtual keyboard with single tap.
+    * [QT-3104] Re-locate QTabWidget's scrollbuttons to either side of widget.
+    * [QT-2179] Fixed QPushButton with text and QPushButton with standard icon
+      to be of same size.
 
  - Examples & demos:
    * Enabled more examples by default in Symbian builds.
-- 
cgit v0.12


From 058fa44c7aba859c3383f912da4f976c896f921d Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Wed, 26 May 2010 11:43:39 +0200
Subject: Update the state of the keyboard modifiers on drop events.

In the case of drag-n-drop between processes we do not get key events
for the pressed modifiers, so we need to update the state of the modifiers
(using XQueryPointer) to get a correct value of QApplication::keyboardModifiers()
and QDropEvent::keyboardModifiers() at drop time.

This is necessary for fixing KDE bug 178679.

Merge-request: 590
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
---
 src/gui/kernel/qdnd_x11.cpp | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index 2b12317..92dd0a1 100644
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -64,6 +64,7 @@
 #include "qtextcodec.h"
 
 #include "qdnd_p.h"
+#include "qapplication_p.h"
 #include "qt_x11_p.h"
 #include "qx11info_x11.h"
 
@@ -1111,7 +1112,20 @@ void qt_xdnd_send_leave()
     waiting_for_status = false;
 }
 
-
+// TODO: remove and use QApplication::currentKeyboardModifiers() in Qt 4.8.
+static Qt::KeyboardModifiers currentKeyboardModifiers()
+{
+    Window root;
+    Window child;
+    int root_x, root_y, win_x, win_y;
+    uint keybstate;
+    for (int i = 0; i < ScreenCount(X11->display); ++i) {
+        if (XQueryPointer(X11->display, QX11Info::appRootWindow(i), &root, &child,
+                          &root_x, &root_y, &win_x, &win_y, &keybstate))
+            return X11->translateModifiers(keybstate & 0x00ff);
+    }
+    return 0;
+}
 
 void QX11Data::xdndHandleDrop(QWidget *, const XEvent * xe, bool passive)
 {
@@ -1159,6 +1173,11 @@ void QX11Data::xdndHandleDrop(QWidget *, const XEvent * xe, bool passive)
         if (!dropData)
             dropData = (manager->object) ? manager->dragPrivate()->data : manager->dropData;
 
+        // Drop coming from another app? Update keyboard modifiers.
+        if (!qt_xdnd_dragging) {
+            QApplicationPrivate::modifier_buttons = currentKeyboardModifiers();
+        }
+
         QDropEvent de(qt_xdnd_current_position, possible_actions, dropData,
                       QApplication::mouseButtons(), QApplication::keyboardModifiers());
         QApplication::sendEvent(qt_xdnd_current_widget, &de);
-- 
cgit v0.12


From e0dc3b88abc9c4bcd6c3710c458c4948e5b8a912 Mon Sep 17 00:00:00 2001
From: Jakub Wieczorek <faw217@gmail.com>
Date: Wed, 26 May 2010 11:50:57 +0200
Subject: QXmlStreamWriter: Auto-formatting does not behave properly with
 processing instructions.

When writing a processing instruction with auto-formatting enabled, it should
put it in a new line for readability and apply the indentation properly.

Merge-request: 620
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
---
 src/corelib/xml/qxmlstream.cpp           |  3 ++-
 tests/auto/qxmlstream/tst_qxmlstream.cpp | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/corelib/xml/qxmlstream.cpp b/src/corelib/xml/qxmlstream.cpp
index 1bf00b8..ae12007 100644
--- a/src/corelib/xml/qxmlstream.cpp
+++ b/src/corelib/xml/qxmlstream.cpp
@@ -3716,7 +3716,8 @@ void QXmlStreamWriter::writeProcessingInstruction(const QString &target, const Q
 {
     Q_D(QXmlStreamWriter);
     Q_ASSERT(!data.contains(QLatin1String("?>")));
-    d->finishStartElement();
+    if (!d->finishStartElement(false) && d->autoFormatting)
+        d->indent(d->tagStack.size());
     d->write("<?");
     d->write(target);
     if (!data.isNull()) {
diff --git a/tests/auto/qxmlstream/tst_qxmlstream.cpp b/tests/auto/qxmlstream/tst_qxmlstream.cpp
index 3c5358c..f93d4fc 100644
--- a/tests/auto/qxmlstream/tst_qxmlstream.cpp
+++ b/tests/auto/qxmlstream/tst_qxmlstream.cpp
@@ -546,6 +546,7 @@ private slots:
     void writerHangs() const;
     void writerAutoFormattingWithComments() const;
     void writerAutoFormattingWithTabs() const;
+    void writerAutoFormattingWithProcessingInstructions() const;
     void writerAutoEmptyTags() const;
     void writeAttributesWithSpace() const;
     void addExtraNamespaceDeclarations();
@@ -1030,6 +1031,22 @@ void tst_QXmlStream::writerAutoFormattingWithTabs() const
     QCOMPARE(buffer.buffer().data(), str);
 }
 
+void tst_QXmlStream::writerAutoFormattingWithProcessingInstructions() const
+{
+    QBuffer buffer;
+    buffer.open(QIODevice::WriteOnly);
+
+    QXmlStreamWriter writer(&buffer);
+    writer.setAutoFormatting(true);
+    writer.writeStartDocument();
+    writer.writeProcessingInstruction("B", "C");
+    writer.writeStartElement("A");
+    writer.writeEndElement();
+    writer.writeEndDocument();
+    const char *str = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<?B C?>\n<A/>\n";
+    QCOMPARE(buffer.buffer().data(), str);
+}
+
 /*!
   Task 204822
 */
-- 
cgit v0.12


From 2eedb392048fdebbb29615345ea3716cebabd451 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Wed, 26 May 2010 11:59:48 +0200
Subject: tst_qxmlstream: fix in shadowbuild

---
 tests/auto/qxmlstream/qxmlstream.pro     | 5 ++++-
 tests/auto/qxmlstream/tst_qxmlstream.cpp | 9 ++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/auto/qxmlstream/qxmlstream.pro b/tests/auto/qxmlstream/qxmlstream.pro
index ac03d42..f82a7b3 100644
--- a/tests/auto/qxmlstream/qxmlstream.pro
+++ b/tests/auto/qxmlstream/qxmlstream.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-SOURCES += tst_qxmlstream.cpp 
+SOURCES += tst_qxmlstream.cpp
 
 QT = core xml network
 
@@ -8,4 +8,7 @@ wince*|symbian*: {
    addFiles.sources = data XML-Test-Suite
    addFiles.path = .
    DEPLOYMENT += addFiles
+   DEFINES += SRCDIR=\\\"\\\"
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
 }
diff --git a/tests/auto/qxmlstream/tst_qxmlstream.cpp b/tests/auto/qxmlstream/tst_qxmlstream.cpp
index f93d4fc..7d5e3b7 100644
--- a/tests/auto/qxmlstream/tst_qxmlstream.cpp
+++ b/tests/auto/qxmlstream/tst_qxmlstream.cpp
@@ -57,7 +57,7 @@
 
 Q_DECLARE_METATYPE(QXmlStreamReader::ReadElementTextBehaviour)
 
-static const char *const catalogFile = "XML-Test-Suite/xmlconf/finalCatalog.xml";
+static const char *const catalogFile = SRCDIR "XML-Test-Suite/xmlconf/finalCatalog.xml";
 static const int expectedRunCount = 1646;
 static const int expectedSkipCount = 532;
 
@@ -527,8 +527,7 @@ class tst_QXmlStream: public QObject
 {
     Q_OBJECT
 public:
-    tst_QXmlStream() : m_handler(QUrl::fromLocalFile(QDir::currentPath()  + QLatin1Char('/'))
-                                .resolved(QUrl(QLatin1String(catalogFile))))
+    tst_QXmlStream() : m_handler(QUrl::fromLocalFile(QLatin1String(catalogFile)))
     {
     }
 
@@ -806,7 +805,7 @@ void tst_QXmlStream::testReader_data() const
     QTest::addColumn<QString>("xml");
     QTest::addColumn<QString>("ref");
     QDir dir;
-    dir.cd("data/");
+    dir.cd(SRCDIR "data/");
     foreach(QString filename , dir.entryList(QStringList() << "*.xml")) {
         QString reference =  QFileInfo(filename).baseName() + ".ref";
         QTest::newRow(dir.filePath(filename).toLatin1().data()) << dir.filePath(filename) << dir.filePath(reference);
@@ -1201,7 +1200,7 @@ void tst_QXmlStream::crashInUTF16Codec() const
     QEventLoop eventLoop;
 
     QNetworkAccessManager networkManager;
-    QNetworkRequest request(QUrl::fromLocalFile(QLatin1String("data/051reduced.xml")));
+    QNetworkRequest request(QUrl::fromLocalFile(QLatin1String(SRCDIR "data/051reduced.xml")));
     QNetworkReply *const reply = networkManager.get(request);
     eventLoop.connect(reply, SIGNAL(finished()), SLOT(quit()));
 
-- 
cgit v0.12


From f777fccd2db2d2dccd32fe42d0a0cd5c65c6347c Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Wed, 26 May 2010 12:09:53 +0200
Subject: Improve gradient docs

---
 src/declarative/graphicsitems/qdeclarativerectangle.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index 4f7a722..301ca00 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -116,6 +116,10 @@ void QDeclarativeGradientStop::updateGradient()
 
     \snippet doc/src/snippets/declarative/gradient.qml code
 
+    Note that this item is not a visual representation of a gradient. To display a
+    gradient use a visual item (like rectangle) which supports having a gradient set
+    on it for display.
+
     \sa GradientStop
 */
 
-- 
cgit v0.12


From fb9a87d80a3a1418195ae3c5258d894d9217e83b Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Wed, 26 May 2010 11:50:53 +0100
Subject: Added missing PlatSec capabilities to spectrum demo DLL

On Symbian, spectrum.exe has UserEnvironment capability in order to
allow it to use QAudioInput.  This means that the capabilities of
any DLL which it loads must include UserEnvironment.  Prior to this
patch, fftreal.dll was built without any capabilities, causing
startup of the application to fail.

Although granting only UserEnvironment to fftreal.dll would fix the
bug, the usual pattern on Symbian OS is to grant 'all -tcb'
capabilities to DLLs.  The capabilities with which the DLL actually
runs are inherited from its parent process.

Task-number: QTBUG-10964
Reviewed-by: Liang Qi
---
 demos/spectrum/3rdparty/fftreal/fftreal.pro | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro
index 5dd02a4..75b5519 100644
--- a/demos/spectrum/3rdparty/fftreal/fftreal.pro
+++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro
@@ -30,6 +30,7 @@ DEFINES  += FFTREAL_LIBRARY
 symbian {
     # Provide unique ID for the generated binary, required by Symbian OS
     TARGET.UID3 = 0xA000E3FB
+    TARGET.CAPABILITY = All -Tcb
 } else {
     macx {
         CONFIG += lib_bundle
-- 
cgit v0.12


From f835a5bcdd75ed8d18dac4de3e68983725c7ea83 Mon Sep 17 00:00:00 2001
From: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Date: Wed, 26 May 2010 13:09:49 +0200
Subject: Make test work with shadow builds again.

Broken by 0cdf33e9acb00b8f3654e8268253a3fb7c5db92c, which assumes the
binary and sources are in the same directory. The fix reverts the code
back to how it was in 4.5 (where it still works with shadow builds).

Reviewed-by: Denis Dzyubenko
---
 tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
index dac631b..1f65ae7 100644
--- a/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
+++ b/tests/auto/qtipc/qsharedmemory/tst_qsharedmemory.cpp
@@ -56,7 +56,7 @@
 #elif defined(Q_OS_WINCE)
 #define LACKEYDIR SRCDIR
 #else
-#define LACKEYDIR SRCDIR "../lackey"
+#define LACKEYDIR "../lackey"
 #endif
 
 Q_DECLARE_METATYPE(QSharedMemory::SharedMemoryError)
@@ -421,7 +421,7 @@ void tst_QSharedMemory::readOnly()
     QString program = LACKEYDIR "/lackey";
     QStringList arguments;
     rememberKey("readonly_segfault");
-    arguments << LACKEYDIR "/scripts/readonly_segfault.js";
+    arguments << SRCDIR "../lackey/scripts/readonly_segfault.js";
 
     // ### on windows disable the popup somehow
     QProcess p;
@@ -734,7 +734,7 @@ void tst_QSharedMemory::simpleProcessProducerConsumer()
 
     rememberKey("market");
 
-    QStringList arguments = QStringList() << LACKEYDIR "/scripts/producer.js";
+    QStringList arguments = QStringList() << SRCDIR "../lackey/scripts/producer.js";
     QProcess producer;
     producer.setProcessChannelMode(QProcess::ForwardedChannels);
     producer.start( LACKEYDIR "/lackey", arguments);
@@ -744,7 +744,7 @@ void tst_QSharedMemory::simpleProcessProducerConsumer()
     QList<QProcess*> consumers;
     unsigned int failedProcesses = 0;
     for (int i = 0; i < processes; ++i) {
-        QStringList arguments = QStringList() << LACKEYDIR  "/scripts/consumer.js";
+        QStringList arguments = QStringList() << SRCDIR  "../lackey/scripts/consumer.js";
         QProcess *p = new QProcess;
         p->setProcessChannelMode(QProcess::ForwardedChannels);
 #ifdef Q_OS_WINCE
-- 
cgit v0.12


From ccc37850ddedba6f70b02919074097b3a716a243 Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Wed, 26 May 2010 13:49:44 +0200
Subject: qdoc: Improved the address book tutorial

I think this is not the final solution,
but I need to decide how to handle \example
commands.
---
 doc/src/getting-started/examples.qdoc   |   2 +-
 doc/src/tutorials/addressbook.qdoc      | 235 +++++++++++++++-----------------
 doc/src/tutorials/widgets-tutorial.qdoc |   2 +-
 3 files changed, 112 insertions(+), 127 deletions(-)

diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index a3393dd..643e42b 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -560,7 +560,7 @@
     \page examples-multimedia.html
     \ingroup all-examples
     \title Multimedia Examples
-    \brief Accessing audio support from Qt
+    \brief Audio, video, and Phonon with Qt
 
     \image phonon-examples.png
 
diff --git a/doc/src/tutorials/addressbook.qdoc b/doc/src/tutorials/addressbook.qdoc
index 04410eb..e5cb448a 100644
--- a/doc/src/tutorials/addressbook.qdoc
+++ b/doc/src/tutorials/addressbook.qdoc
@@ -42,15 +42,11 @@
 /*!
     \page tutorials-addressbook.html
 
-    \startpage {index.html}{Qt Reference Documentation}
-    \contentspage Tutorials
-    \nextpage {tutorials/addressbook/part1}{Chapter 1}
-
     \title Address Book Tutorial
     \brief An introduction to GUI programming, showing how to put together a
     simple yet fully-functioning application.
 
-    This tutorial gives an introduction to GUI programming using the Qt
+    This tutorial is an introduction to GUI programming with the Qt
     cross-platform framework.
 
     \image addressbook-tutorial-screenshot.png
@@ -61,8 +57,8 @@
     Some commonly used features are never used in this tutorial.
     \endomit
 
-    In the process, we will learn about some basic technologies provided by Qt,
-    such as
+    In this tutorial, you will learn about some of the basic
+    components of Qt, including:
 
     \list
     \o Widgets and layout managers
@@ -71,13 +67,9 @@
     \o Input and output devices
     \endlist
 
-    If you are completely new to Qt, please read \l{How to Learn Qt} if you
-    have not already done so.
-
-    The tutorial's source code is located in Qt's \c examples/tutorials/addressbook
-    directory.
+    If you are new to Qt, we recommend reading \l{How to Learn Qt} first.
 
-    Tutorial chapters:
+    Tutorial contents:
 
     \list 1
     \o \l{tutorials/addressbook/part1}{Designing the User Interface}
@@ -89,28 +81,30 @@
     \o \l{tutorials/addressbook/part7}{Additional Features}
     \endlist
 
-    Although this little application does not look much like a fully-fledged
-    modern GUI application, it uses many of the basic techniques that are used
-    in more complex applications. After you have worked through it, we
-    recommend checking out the \l{mainwindows/application}{Application}
-    example, which presents a small GUI application, with menus, toolbars, a
-    status bar, and so on.
+    The tutorial source code is located in \c{examples/tutorials/addressbook}.
+
+    Although this little application does not look much like a
+    fully-fledged modern GUI application, it uses many of the basic
+    elements that are used in more complex applications. After you
+    have worked through this tutorial, we recommend reading the
+    \l{mainwindows/application}{Application} example, which presents a
+    small GUI application, with menus, toolbars, a status bar, and so
+    on.  
 */
 
 /*!
     \page tutorials-addressbook-part1.html
-    \contentspage {Address Book Tutorial}{Contents}
-    \nextpage {tutorials/addressbook/part2}{Chapter 2}
+
     \example tutorials/addressbook/part1
-    \title Address Book 1 - Designing the User Interface
+    \title Part 1 - Designing the User Interface
 
-    The first part of this tutorial covers the design of the basic graphical
-    user interface (GUI) we use for the Address Book application.
+    This first part covers the design of the basic graphical user
+    interface (GUI) for our address book application.
 
-    The first step to creating a GUI program is to design the user interface.
-    In this chapter, our goal is to set up the labels and input fields needed
-    to implement a basic address book application. The figure below is a
-    screenshot of our expected output.
+    The first step in creating a GUI program is to design the user
+    interface.  Here the our goal is to set up the labels and input
+    fields to implement a basic address book. The figure below is a
+    screenshot of the expected output.
 
     \image addressbook-tutorial-part1-screenshot.png
 
@@ -169,14 +163,15 @@
 
     \snippet tutorials/addressbook/part1/addressbook.h class definition
 
-    The class holds declarations of \c nameLine and \c addressText, the
-    private instances of QLineEdit and QTextEdit mentioned earlier.
-    You will see, in the coming chapters, that data stored in \c nameLine and
-    \c addressText is needed for many of the address book's functions.
+    The class holds declarations of \c nameLine and \c addressText,
+    the private instances of QLineEdit and QTextEdit mentioned
+    earlier.  The data stored in \c nameLine and \c addressText will
+    be needed for many of the address book functions.
 
-    We do not need to include declarations of the QLabel objects we will use
-    because we will not need to reference them once they have been created.
-    The way Qt tracks the ownership of objects is explained in the next section.
+    We don't include declarations of the QLabel objects we will use
+    because we will not need to reference them once they have been
+    created.  The way Qt tracks the ownership of objects is explained
+    in the next section.
 
     The Q_OBJECT macro itself implements some of the more advanced features of Qt.
     For now, it is useful to think of the Q_OBJECT macro as a shortcut which allows
@@ -195,15 +190,14 @@
 
     \snippet tutorials/addressbook/part1/addressbook.cpp constructor and input fields
 
-    Within this constructor, we declare and instantiate two local QLabel objects,
-    \c nameLabel and \c addressLabel, as well as instantiate \c nameLine and
-    \c addressText. The
-    \l{QObject::tr()}{tr()} function returns a translated version of the
-    string, if there is one available; otherwise, it returns the string itself.
-    Think of this function as an \c{<insert translation here>} marker to mark
-    QString objects for translation. You will notice, in the coming chapters as
-    well as in the \l{Qt Examples}, that we include it whenever we use a
-    translatable string.
+    In this constructor, the QLabel objects \c nameLabel and \c
+    addressLabel are instantiated, as well as \c nameLine and \c
+    addressText. The \l{QObject::tr()}{tr()} function returns a
+    translated version of the string, if there is one
+    available. Otherwise it returns the string itself. This function
+    marks its QString parameter as one that should be translated into
+    other languages. It should be used wherever a translatable string
+    appears.
 
     When programming with Qt, it is useful to know how layouts work.
     Qt provides three main layout classes: QHBoxLayout, QVBoxLayout
@@ -254,14 +248,12 @@
 
 /*!
     \page tutorials-addressbook-part2.html
-    \previouspage Address Book 1 - Designing the User Interface
-    \contentspage {Address Book Tutorial}{Contents}
-    \nextpage {tutorials/addressbook/part3}{Chapter 3}
+
     \example tutorials/addressbook/part2
-    \title Address Book 2 - Adding Addresses
+    \title Part 2 - Adding Addresses
 
-    The next step to creating our basic address book application is to allow
-    a little bit of user interaction.
+    The next step in creating the address book is to implement some
+    user interactions.
 
     \image addressbook-tutorial-part2-add-contact.png
 
@@ -283,9 +275,9 @@
     However, for an overview of Qt's signals and slots concept, you can refer
     to the \l{Signals and Slots} document.
 
-    Three QPushButton objects: \c addButton, \c submitButton and
-    \c cancelButton, are now included in our private variable declarations,
-    along with \c nameLine and \c addressText from the last chapter.
+    Three QPushButton objects (\c addButton, \c submitButton, and
+    \c cancelButton) are now included in our private variable declarations,
+    along with \c nameLine and \c addressText.
 
     \snippet tutorials/addressbook/part2/addressbook.h pushbutton declaration
 
@@ -407,20 +399,20 @@
 
 /*!
     \page tutorials-addressbook-part3.html
-    \previouspage Address Book 2 - Adding Addresses
-    \contentspage {Address Book Tutorial}{Contents}
-    \nextpage {tutorials/addressbook/part4}{Chapter 4}
+
     \example tutorials/addressbook/part3
-    \title Address Book 3 - Navigating between Entries
+    \title Part 3 - Navigating between Entries
 
-    The address book application is now half complete. We need to add some
-    functions to navigate between contacts. But first, we have to decide
-    what sort of a data structure we would like to use to hold these contacts.
+    The address book is now about half complete. We should add the
+    capability to navigate among the contacts, but first we must
+    decide what sort of a data structure we need for containing these
+    contacts.
 
-    In Chapter 2, we used a QMap of key-value pairs with the contact's name
-    as the \e key, and the contact's address as the \e value. This works well
-    for our case. However, in order to navigate and display each entry, a
-    little bit of enhancement is needed.
+    In the previous section, we used a QMap of key-value pairs with
+    the contact's name as the \e key, and the contact's address as the
+    \e value. This works well for our case. However, in order to
+    navigate and display each entry, a little bit of enhancement is
+    needed.
 
     We enhance the QMap by making it replicate a data structure similar to a
     circularly-linked list, where all elements are connected, including the
@@ -431,9 +423,9 @@
 
     \section1 Defining the AddressBook Class
 
-    In order to add navigation functions to the address book application, we
-    need to add two more slots to our \c AddressBook class: \c next() and
-    \c previous(). These are added to our \c addressbook.h file:
+    To add navigation functions to the address book, we must add two
+    more slots to the \c AddressBook class: \c next() and \c
+    previous() to the \c addressbook.h file:
 
     \snippet tutorials/addressbook/part3/addressbook.h navigation functions
 
@@ -455,8 +447,7 @@
 
     \snippet tutorials/addressbook/part3/addressbook.cpp connecting navigation signals
 
-    The image below is our expected graphical user interface. Notice that it
-    is getting closer to our final application.
+    The image below is the expected graphical user interface. 
 
     \image addressbook-tutorial-part3-screenshot.png
 
@@ -525,27 +516,26 @@
 
 /*!
     \page tutorials-addressbook-part4.html
-    \previouspage Address Book 3 - Navigating between Entries
-    \contentspage {Address Book Tutorial}{Contents}
-    \nextpage {tutorials/addressbook/part5}{Chapter 5}
+
     \example tutorials/addressbook/part4
-    \title Address Book 4 - Editing and Removing Addresses
+    \title Part 4 - Editing and Removing Addresses
 
-    In this chapter, we look at ways to modify the contents of contacts stored
-    in the address book application.
+    Now we look at ways to modify the contents of contacts stored in
+    the address book.
 
     \image addressbook-tutorial-screenshot.png
 
-    We now have an address book that not only holds contacts in an organized
-    manner, but also allows navigation. It would be convenient to include
-    edit and remove functions so that a contact's details can be changed
-    when needed. However, this requires a little improvement, in the form of
-    enums. In our previous chapters, we had two modes: \c{AddingMode} and
-    \c{NavigationMode} - but they were not defined as enums. Instead, we
-    enabled and disabled the corresponding buttons manually, resulting in
-    multiple lines of repeated code.
+    We now have an address book that not only holds contacts in an
+    organized manner, but also allows navigation. It would be
+    convenient to include edit and remove functions so that a
+    contact's details can be changed when needed. However, this
+    requires a little improvement, in the form of enums. We defined
+    two modes: \c{AddingMode} and \c{NavigationMode}, but they were
+    not defined as enum values. Instead, we enabled and disabled the
+    corresponding buttons manually, resulting in multiple lines of
+    repeated code.
 
-    In this chapter, we define the \c Mode enum with three different values:
+    Here we define the \c Mode enum with three different values:
 
     \list
         \o \c{NavigationMode},
@@ -579,10 +569,10 @@
 
     \section1 Implementing the AddressBook Class
 
-    We now have to implement the mode-changing features of the address book
-    application. The \c editButton and \c removeButton are instantiated and
-    disabled by default, as the address book starts up with zero contacts in
-    memory.
+    We now implement the mode-changing features of the address
+    book. The \c editButton and \c removeButton are instantiated and
+    disabled by default. The address book starts with zero contacts
+    in memory.
 
     \snippet tutorials/addressbook/part4/addressbook.cpp edit and remove buttons
 
@@ -653,33 +643,31 @@
 
     \snippet tutorials/addressbook/part4/addressbook.cpp update interface() part 2
 
-    By performing the task of setting the mode and updating the user interface in
-    the same function, we avoid the possibility of the user interface getting "out
-    of sync" with the internal state of the application.
-*/
+    By setting the mode and updating the user interface in the same
+    function, we avoid the possibility of the user interface getting
+    out of sync with the internal state of the application.
+  */
 
 /*!
     \page tutorials-addressbook-part5.html
-    \previouspage Address Book 4 - Editing and Removing Addresses
-    \contentspage {Address Book Tutorial}{Contents}
-    \nextpage {tutorials/addressbook/part6}{Chapter 6}
+
     \example tutorials/addressbook/part5
-    \title Address Book 5 - Adding a Find Function
+    \title Part 5 - Adding a Find Function
 
-    In this chapter, we look at ways to locate contacts and addresses in
-    the address book application.
+    Here we look at ways to locate contacts and addresses in the
+    address book.
 
     \image addressbook-tutorial-part5-screenshot.png
 
-    As we keep adding contacts to our address book application, it becomes
-    tedious to navigate them with the \e Next and \e Previous buttons. In this
-    case, a \e Find function would be more efficient in looking up contacts.
-    The screenshot above shows the \e Find button and its position on the panel
-    of buttons.
+    As we add contacts to our address book, it becomes tedious to
+    navigate the list with the \e Next and \e Previous buttons. A \e
+    Find function would be more efficient.  The screenshot above shows
+    the \e Find button and its position on the panel of buttons.
 
-    When the user clicks on the \e Find button, it is useful to display a
-    dialog that can prompt the user for a contact's name. Qt provides QDialog,
-    which we subclass in this chapter, to implement a \c FindDialog class.
+    When the user clicks on the \e Find button, it is useful to
+    display a dialog that prompts for a contact's name. Qt provides
+    QDialog, which we subclass here to implement a \c FindDialog
+    class.
 
     \section1 Defining the FindDialog Class
 
@@ -806,20 +794,18 @@
 
 /*!
     \page tutorials-addressbook-part6.html
-    \previouspage Address Book 5 - Adding a Find Function
-    \contentspage {Address Book Tutorial}{Contents}
-    \nextpage {tutorials/addressbook/part7}{Chapter 7}
+
     \example tutorials/addressbook/part6
-    \title Address Book 6 - Loading and Saving
+    \title Part 6 - Loading and Saving
 
-    This chapter covers the file handling features of Qt that we use to write
-    loading and saving routines for the address book application.
+    This part covers the Qt file handling features we use to write
+    loading and saving routines for the address book.
 
     \image addressbook-tutorial-part6-screenshot.png
 
-    Although browsing and searching for contacts are useful features, our
-    address book is not ready for use until we can save existing contacts and
-    load them again at a later time.
+    Although browsing and searching the contact list are useful
+    features, our address book is not complete until we can save
+    existing contacts and load them again at a later time.
 
     Qt provides a number of classes for \l{Input/Output and Networking}
     {input and output}, but we have chosen to use two which are simple to use
@@ -930,21 +916,20 @@
 
 /*!
     \page tutorials-addressbook-part7.html
-    \previouspage Address Book 6 - Loading and Saving
-    \contentspage {Address Book Tutorial}{Contents}
+
     \example tutorials/addressbook/part7
-    \title Address Book 7 - Additional Features
+    \title Part 7 - Additional Features
 
-    This chapter covers some additional features that make the address book
-    application more convenient for everyday use.
+    This part covers some additional features that make the address
+    book more convenient for the frequent user.
 
     \image addressbook-tutorial-part7-screenshot.png
 
-    Although our address book application is useful in its own right, it would
-    be useful if we could exchange contact data with other applications.
-    The vCard format is a popular file format that can be used for this purpose.
-    In this chapter, we extend our address book client to allow contacts to
-    be exported to vCard \c{.vcf} files.
+    Although our address book is useful in isolation, it would be
+    better if we could exchange contact data with other applications.
+    The vCard format is a popular file format that can be used for
+    this purpose.  Here we extend our address book client to allow
+    contacts to be exported to vCard \c{.vcf} files.
 
     \section1 Defining the AddressBook Class
 
diff --git a/doc/src/tutorials/widgets-tutorial.qdoc b/doc/src/tutorials/widgets-tutorial.qdoc
index 0422e1a..2b5f8cc 100644
--- a/doc/src/tutorials/widgets-tutorial.qdoc
+++ b/doc/src/tutorials/widgets-tutorial.qdoc
@@ -102,7 +102,7 @@
 
     \section1 Real world widget examples
 
-    In these \l{Widgets examples} {more advanced examples}, the code
+    In these \l{Widget examples} {more advanced examples}, the code
     that creates the widgets and layouts is stored in other files. For
     example, the GUI for a main window may be created in the
     constructor of a QMainWindow subclass.
-- 
cgit v0.12


From 80dcdd160e5468e38558d2df570df38235b18e71 Mon Sep 17 00:00:00 2001
From: Gareth Stockwell <ext-gareth.stockwell@nokia.com>
Date: Wed, 26 May 2010 12:59:03 +0100
Subject: Removed unnecessary PlatSec capabilities from spectrum demo DLL

Task-number: QTBUG-10964
Reviewed-by: Miikka Heikkinen
---
 demos/spectrum/3rdparty/fftreal/fftreal.pro | 2 +-
 demos/spectrum/app/app.pro                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/demos/spectrum/3rdparty/fftreal/fftreal.pro b/demos/spectrum/3rdparty/fftreal/fftreal.pro
index 75b5519..8d9f46e 100644
--- a/demos/spectrum/3rdparty/fftreal/fftreal.pro
+++ b/demos/spectrum/3rdparty/fftreal/fftreal.pro
@@ -30,7 +30,7 @@ DEFINES  += FFTREAL_LIBRARY
 symbian {
     # Provide unique ID for the generated binary, required by Symbian OS
     TARGET.UID3 = 0xA000E3FB
-    TARGET.CAPABILITY = All -Tcb
+    TARGET.CAPABILITY = UserEnvironment
 } else {
     macx {
         CONFIG += lib_bundle
diff --git a/demos/spectrum/app/app.pro b/demos/spectrum/app/app.pro
index 92398ac..db9a144 100644
--- a/demos/spectrum/app/app.pro
+++ b/demos/spectrum/app/app.pro
@@ -45,7 +45,7 @@ RESOURCES = spectrum.qrc
 
 symbian {
     # Platform security capability required to record audio on Symbian
-    TARGET.CAPABILITY += UserEnvironment
+    TARGET.CAPABILITY = UserEnvironment
 
     # Provide unique ID for the generated binary, required by Symbian OS
     TARGET.UID3 = 0xA000E3FA
-- 
cgit v0.12


From 01483b3d921eea7c4e3c8fa159ab60a3ca32f1ee Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Wed, 26 May 2010 14:18:31 +0200
Subject: qdoc: Fixed the French version of the address book tutorial

---
 doc/src/tutorials/addressbook-fr.qdoc | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/doc/src/tutorials/addressbook-fr.qdoc b/doc/src/tutorials/addressbook-fr.qdoc
index 98c44a3..85a9acf 100644
--- a/doc/src/tutorials/addressbook-fr.qdoc
+++ b/doc/src/tutorials/addressbook-fr.qdoc
@@ -42,10 +42,6 @@
 /*!
     \page tutorials-addressbook-fr.html
 
-    \startpage {index.html}{Qt Reference Documentation}
-    \contentspage Tutorials
-    \nextpage {tutorials/addressbook-fr/part1}{Chapitre 1}
-
     \title Tutoriel "Carnet d'adresses"
     \brief Une introduction à la programation d'interface graphique montrant comment construire une application simple avec Qt.
 
@@ -93,8 +89,7 @@
 
 /*!
     \page tutorials-addressbook-fr-part1.html
-    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
-    \nextpage {tutorials/addressbook-fr/part2}{Chapitre 2}
+
     \example tutorials/addressbook-fr/part1
     \title Carnet d'adresses 1 - Conception de l'interface utilisateur
 
@@ -252,9 +247,7 @@
 
 /*!
     \page tutorials-addressbook-fr-part2.html
-    \previouspage {tutorials/addressbook-fr/part1}{Chapitre 1}
-    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
-    \nextpage {tutorials/addressbook-fr/part3}{Chapitre 3}
+
     \example tutorials/addressbook-fr/part2
     \title Carnet d'adresses 2 - Ajouter des adresses
 
@@ -414,9 +407,7 @@
 
 /*!
     \page tutorials-addressbook-fr-part3.html
-    \previouspage {tutorials/addressbook-fr/part2}{Chapitre 2}
-    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
-    \nextpage {tutorials/addressbook-fr/part4}{Chapitre 4}
+
     \example tutorials/addressbook-fr/part3
     \title Carnet d'adresses 3 - Navigation entre les éléments
 
@@ -536,9 +527,7 @@
 /*!
 
     \page tutorials-addressbook-fr-part4.html
-    \previouspage {tutorials/addressbook-fr/part3}{Chapitre 3}
-    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
-    \nextpage {tutorials/addressbook-fr/part5}{Chapitre 5}
+
     \example tutorials/addressbook-fr/part4
     \title Carnet d'Adresses 4 - éditer et supprimer des adresses
 
@@ -688,9 +677,7 @@
 
 /*!
     \page tutorials-addressbook-fr-part5.html
-    \previouspage {tutorials/addressbook-fr/part4}{Chapitre 4}
-    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
-    \nextpage {tutorials/addressbook-fr/part6}{Chapitre 6}
+
     \example tutorials/addressbook-fr/part5
     \title Carnet d'adresse 5 - Ajout d'une fonction de recherche
 
@@ -839,9 +826,7 @@
 
 /*!
     \page tutorials-addressbook-part6.html
-    \previouspage {tutorials/addressbook-fr/part5}{Chapitre 5}
-    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
-    \nextpage {tutorials/addressbook-fr/part7}{Chapitre 7}
+
     \example tutorials/addressbook-fr/part6
     \title Carnet d'Adresses 6 - Sauvegarde et chargement
 
@@ -978,8 +963,7 @@
 
 /*!
     \page tutorials-addressbook-fr-part7.html
-    \previouspage {tutorials/addressbook-fr/part6}{Chapitre 6}
-    \contentspage {Tutoriel "Carnet d'adresses"}{Sommaire}
+
     \example tutorials/addressbook-fr/part7
     \title Carnet d'adresse 7 - Fonctionnalités avancées
 
-- 
cgit v0.12


From 44e33b3c8d776b66b2122eb3757177dfbd7baa4c Mon Sep 17 00:00:00 2001
From: Carlos Manuel Duclos Vergara <carlos.duclos@nokia.com>
Date: Wed, 26 May 2010 14:29:40 +0200
Subject: qaccessibility::eventTest(...) was failing.

The problem here is the fact that to test the mouse click the test
depended on some "magical" coordinates which are not valid anymore.
But since QTest::mouseClick(...) will target the center of the button,
there is no need to calculate coordinates.

Reviewed-by: Richard Moe Gustavsen
---
 tests/auto/qaccessibility/tst_qaccessibility.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index e5a332a..cea259c 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -475,7 +475,7 @@ void tst_QAccessibility::eventTest()
     QVERIFY_EVENT(button, 0, QAccessible::ObjectShow);
     button->setFocus(Qt::MouseFocusReason);
     QTestAccessibility::clearEvents();
-    QTest::mouseClick(button, Qt::LeftButton, 0, QPoint(button->width()-7,button->height()-5));
+    QTest::mouseClick(button, Qt::LeftButton, 0);
     QVERIFY_EVENT(button, 0, QAccessible::StateChanged);
     QVERIFY_EVENT(button, 0, QAccessible::StateChanged);
 
-- 
cgit v0.12


From cf1e3150247d6694e8c00b924627c66e798f2382 Mon Sep 17 00:00:00 2001
From: Pierre Rossi <pierre.rossi@nokia.com>
Date: Tue, 6 Apr 2010 19:59:08 +0200
Subject: Fixes a proxymodel sorting odity.

Sort order was modified when sorted according to an empty column always
in the same order

Reviewed-by: Thierry
---
 src/gui/itemviews/qsortfilterproxymodel.cpp        |  2 +-
 .../tst_qsortfilterproxymodel.cpp                  | 36 ++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp
index b12cd45..f9b6b94 100644
--- a/src/gui/itemviews/qsortfilterproxymodel.cpp
+++ b/src/gui/itemviews/qsortfilterproxymodel.cpp
@@ -2392,7 +2392,7 @@ bool QSortFilterProxyModel::lessThan(const QModelIndex &left, const QModelIndex
     QVariant r = (right.model() ? right.model()->data(right, d->sort_role) : QVariant());
     switch (l.userType()) {
     case QVariant::Invalid:
-        return (r.type() == QVariant::Invalid);
+        return (r.type() != QVariant::Invalid);
     case QVariant::Int:
         return l.toInt() < r.toInt();
     case QVariant::UInt:
diff --git a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 992c95e..53fefee 100644
--- a/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -127,6 +127,8 @@ private slots:
     void sortColumnTracking1();
     void sortColumnTracking2();
 
+    void sortStable();
+
     void task236755_hiddenColumns();
     void task247867_insertRowsSort();
     void task248868_staticSorting();
@@ -2442,6 +2444,40 @@ void tst_QSortFilterProxyModel::sortColumnTracking2()
     QCOMPARE(proxyModel.data(proxyModel.index(strings.count()-1,0)).toString(),QString::fromLatin1("zz"));
 }
 
+void tst_QSortFilterProxyModel::sortStable()
+{
+    QStandardItemModel* model = new QStandardItemModel(5, 2);
+    for (int r=0; r<5; r++) {
+        for (int c=0; c<2; c++)  {
+            QStandardItem* item = new QStandardItem(
+                    QString("Row:%0, Column:%1").arg(r).arg(c) );
+            for( int i=0; i<3; i++ ) {
+                QStandardItem* child = new QStandardItem(
+                        QString("Item %0").arg(i) );
+                item->appendRow( child );
+            }
+            model->setItem(r, c, item);
+        }
+    }
+    model->setHorizontalHeaderItem( 0, new QStandardItem( "Name" ));
+    model->setHorizontalHeaderItem( 1, new QStandardItem( "Value" ) );
+
+
+    QSortFilterProxyModel *filterModel = new QSortFilterProxyModel(model);
+    filterModel->setSourceModel(model);
+
+    QTreeView *view = new QTreeView;
+    view->setModel(filterModel);
+    QModelIndex firstRoot = filterModel->index(0,0);
+    view->expand(firstRoot);
+    view->setSortingEnabled(true);
+
+    view->model()->sort(1, Qt::DescendingOrder);
+    QVariant lastItemData =filterModel->index(2,0, firstRoot).data();
+    view->model()->sort(1, Qt::DescendingOrder);
+    QCOMPARE(lastItemData, filterModel->index(2,0, firstRoot).data());
+}
+
 void tst_QSortFilterProxyModel::task236755_hiddenColumns()
 {
     class MyStandardItemModel : public QStandardItemModel
-- 
cgit v0.12


From 11a8c52498e8dc74fdfef48e953055338c8f18d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Nilsen?= <bjorn.nilsen@nokia.com>
Date: Wed, 26 May 2010 15:53:06 +0200
Subject: Redraw issues when removing a fully transparent QGraphicsItem from
 the scene.

This only happened with fully transparent ancestors (item's
effectiveOpacity() == 0.0). Problem was that we didn't take into
account the ancestors' opacity when removing an item from the scene.
More specifically: The calculated effective opacity for the item was
zero and we ignored update requests. We have to ignore the opacity if
any of the ancestors' ignoreOpacity bit is 1, which means the opacity
is set to 0 and the update request has not yet been processed.

Auto test included.

Task-number: QTBUG-10778
---
 src/gui/graphicsview/qgraphicsscene.cpp          | 18 ++++++++++
 tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp | 43 ++++++++++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index ae0abf9..22c3f92 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -4889,6 +4889,24 @@ void QGraphicsScenePrivate::markDirty(QGraphicsItem *item, const QRectF &rect, b
     if (updateAll)
         return;
 
+    if (removingItemFromScene && !ignoreOpacity && !item->d_ptr->ignoreOpacity) {
+        // If any of the item's ancestors ignore opacity, it means that the opacity
+        // was set to 0 (and the update request has not yet been processed). That
+        // also means that we have to ignore the opacity for the item itself; otherwise
+        // things like: parent->setOpacity(0); scene->removeItem(child) won't work.
+        // Note that we only do this when removing items from the scene. In all other
+        // cases the ignoreOpacity bit propagates properly in processDirtyItems, but
+        // since the item is removed immediately it won't be processed there.
+        QGraphicsItem *p = item->d_ptr->parent;
+        while (p) {
+            if (p->d_ptr->ignoreOpacity) {
+                item->d_ptr->ignoreOpacity = true;
+                break;
+            }
+            p = p->d_ptr->parent;
+        }
+    }
+
     if (item->d_ptr->discardUpdateRequest(/*ignoreVisibleBit=*/force,
                                           /*ignoreDirtyBit=*/removingItemFromScene || invalidateChildren,
                                           /*ignoreOpacity=*/ignoreOpacity)) {
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index a155222..67a41ca 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -275,6 +275,7 @@ private slots:
     void polishItems2();
     void isActive();
     void siblingIndexAlwaysValid();
+    void removeFullyTransparentItem();
 
     // task specific tests below me
     void task139710_bspTreeCrash();
@@ -4333,6 +4334,48 @@ void tst_QGraphicsScene::siblingIndexAlwaysValid()
 
 }
 
+void tst_QGraphicsScene::removeFullyTransparentItem()
+{
+    QGraphicsScene scene;
+
+    QGraphicsItem *parent = scene.addRect(0, 0, 100, 100);
+    parent->setFlag(QGraphicsItem::ItemHasNoContents);
+
+    QGraphicsItem *child = scene.addRect(0, 0, 100, 100);
+    child->setParentItem(parent);
+
+    CustomView view;
+    view.setScene(&scene);
+    view.show();
+    QTest::qWaitForWindowShown(&view);
+
+    // NB! The parent has the ItemHasNoContents flag set, which means
+    // the parent itself doesn't generate any update requests, only the
+    // child can possibly trigger an update. Also note that the child
+    // is removed before processing events.
+    view.repaints = 0;
+    parent->setOpacity(0);
+    QVERIFY(qFuzzyIsNull(child->effectiveOpacity()));
+    scene.removeItem(child);
+    QVERIFY(!scene.items().contains(child));
+    QTRY_VERIFY(view.repaints > 0);
+
+    // Re-add child. There's nothing new to display (child is still
+    // effectively hidden), so it shouldn't trigger an update.
+    view.repaints = 0;
+    child->setParentItem(parent);
+    QVERIFY(scene.items().contains(child));
+    QVERIFY(qFuzzyIsNull(child->effectiveOpacity()));
+    QApplication::processEvents();
+    QCOMPARE(view.repaints, 0);
+
+    // Nothing is visible on the screen, removing child item shouldn't trigger an update.
+    scene.removeItem(child);
+    QApplication::processEvents();
+    QCOMPARE(view.repaints, 0);
+    delete child;
+}
+
 void tst_QGraphicsScene::taskQTBUG_5904_crashWithDeviceCoordinateCache()
 {
     QGraphicsScene scene;
-- 
cgit v0.12


From f1ba0329a90fe62a850e4b00bf3bd13011dbe4fa Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Wed, 26 May 2010 17:54:35 +0200
Subject: Add key event handling to the declarative web view

This is a very simple approach, I don't know if a more nuanced system
would be appropriate.

Task-number: QTBUG-11025
---
 src/imports/webkit/qdeclarativewebview.cpp | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp
index 36a25f6..050e2b7 100644
--- a/src/imports/webkit/qdeclarativewebview.cpp
+++ b/src/imports/webkit/qdeclarativewebview.cpp
@@ -150,6 +150,9 @@ public:
     The item includes no scrolling, scaling,
     toolbars, etc., those must be implemented around WebView. See the WebBrowser example
     for a demonstration of this.
+
+    When this item has keyboard focus, all keyboard input will be sent directly to the
+    web page within.
 */
 
 /*!
@@ -701,20 +704,12 @@ void QDeclarativeWebView::hoverMoveEvent (QGraphicsSceneHoverEvent * event)
         QDeclarativeItem::hoverMoveEvent(event);
 }
 
-bool QDeclarativeWebView::sceneEvent(QEvent *event) 
-{ 
-    if (event->type() == QEvent::KeyPress) { 
-        QKeyEvent *k = static_cast<QKeyEvent *>(event); 
-        if (k->key() == Qt::Key_Tab || k->key() == Qt::Key_Backtab) { 
-            if (!(k->modifiers() & (Qt::ControlModifier | Qt::AltModifier))) { //### Add MetaModifier? 
-                page()->event(event); 
-                if (event->isAccepted()) 
-                    return true; 
-            } 
-        } 
-    } 
+bool QDeclarativeWebView::sceneEvent(QEvent *event)
+{
+    if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease)//Key events go to the page
+                return page()->event(event);
     return QDeclarativeItem::sceneEvent(event);
-} 
+}
 
 
 /*!
-- 
cgit v0.12


From c22dc63d5333c85afd167944675bfebec6b5c9a3 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 26 May 2010 13:54:40 +0200
Subject: complain about unescaped backslashes

---
 qmake/project.cpp | 6 ++++++
 qmake/project.h   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 2be68be..9cf6a6f 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -671,6 +671,7 @@ QMakeProject::reset()
     scope_blocks.push(ScopeBlock());
     iterator = 0;
     function = 0;
+    backslashWarned = false;
 }
 
 bool
@@ -2933,6 +2934,11 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QMap<QString, QStringL
                     break;
                 }
             }
+            if(!escape && !backslashWarned) {
+                backslashWarned = true;
+                warn_msg(WarnDeprecated, "%s:%d: Unescaped backslashes are deprecated.",
+                         parser.file.toLatin1().constData(), parser.line_no);
+            }
             if(escape || !replaced)
                 unicode =0;
         } else if(!quote && (unicode == SINGLEQUOTE || unicode == DOUBLEQUOTE)) {
diff --git a/qmake/project.h b/qmake/project.h
index 0c542db..fd8ced1 100644
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -80,6 +80,7 @@ class QMakeProject
 
     bool recursive;
     bool own_prop;
+    bool backslashWarned;
     QString pfile, cfile;
     QMakeProperty *prop;
     void reset();
-- 
cgit v0.12


From 724ed689cdec252ffb33b496fceb6ce4f81125dd Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 26 May 2010 14:05:58 +0200
Subject: escape backslashes

this makes windows-style path specs *ugly*. that's intentional. :-P
---
 demos/embedded/desktopservices/desktopservices.pro |  4 +--
 examples/painting/svgviewer/svgviewer.pro          |  6 ++--
 examples/xml/dombookmarks/dombookmarks.pro         |  2 +-
 examples/xml/saxbookmarks/saxbookmarks.pro         |  2 +-
 mkspecs/common/symbian/symbian-makefile.conf       |  2 +-
 mkspecs/common/wince/qmake.conf                    |  6 ++--
 mkspecs/features/dbusadaptors.prf                  |  2 +-
 mkspecs/features/dbusinterfaces.prf                |  2 +-
 mkspecs/features/incredibuild_xge.prf              |  4 +--
 mkspecs/features/lex.prf                           |  6 ++--
 mkspecs/features/moc.prf                           |  6 ++--
 mkspecs/features/sis_targets.prf                   |  2 +-
 mkspecs/features/symbian/add_mmp_rules.prf         |  2 +-
 mkspecs/features/symbian/application_icon.prf      |  4 +--
 mkspecs/features/symbian/def_files.prf             |  2 +-
 mkspecs/features/symbian/moc.prf                   |  6 ++--
 mkspecs/features/symbian/symbian_building.prf      | 14 ++++-----
 mkspecs/features/uic.prf                           |  8 ++---
 mkspecs/features/win32/embed_manifest_dll.prf      |  6 ++--
 mkspecs/features/win32/embed_manifest_exe.prf      |  6 ++--
 mkspecs/features/win32/qaxserver.prf               |  6 ++--
 mkspecs/features/yacc.prf                          | 10 +++---
 mkspecs/win32-borland/qmake.conf                   |  8 ++---
 mkspecs/win32-icc/qmake.conf                       |  6 ++--
 mkspecs/win32-msvc2003/qmake.conf                  |  6 ++--
 mkspecs/win32-msvc2005/qmake.conf                  |  6 ++--
 mkspecs/win32-msvc2008/qmake.conf                  |  6 ++--
 mkspecs/win32-msvc2010/qmake.conf                  |  6 ++--
 projects.pro                                       | 36 +++++++++++-----------
 src/3rdparty/webkit/WebCore/WebCore.pro            |  2 +-
 .../webkit/WebKit/qt/Api/DerivedSources.pro        |  6 ++--
 src/3rdparty/webkit/WebKit/qt/docs/docs.pri        |  2 +-
 src/activeqt/control/control.pro                   |  2 +-
 .../auto/declarative/parserstress/parserstress.pro |  2 +-
 .../lupdate/testdata/good/backslashes/project.pro  |  4 +--
 .../auto/patternistexamples/patternistexamples.pro |  2 +-
 tests/auto/qaccessibility/qaccessibility.pro       |  2 +-
 tests/auto/qdesktopservices/qdesktopservices.pro   | 22 ++++++-------
 tests/auto/qdirmodel/qdirmodel.pro                 |  6 ++--
 tests/auto/qfile/test/test.pro                     |  8 ++---
 tests/auto/qfileinfo/qfileinfo.pro                 |  2 +-
 tests/auto/qgraphicsscene/qgraphicsscene.pro       |  4 +--
 tests/auto/qimagewriter/qimagewriter.pro           |  4 +--
 tests/auto/qlibrary/lib2/lib2.pro                  |  6 ++--
 tests/auto/qlocale/test/test.pro                   |  2 +-
 tests/auto/qlocalsocket/test/test.pro              |  2 +-
 tests/auto/qmainwindow/qmainwindow.pro             |  2 +-
 tests/auto/qmake/testdata/functions/functions.pro  |  2 +-
 tests/auto/qmovie/qmovie.pro                       |  4 +--
 tests/auto/qnetworkreply/test/test.pro             |  2 +-
 tests/auto/qobject/tst_qobject.pro                 |  2 +-
 tests/auto/qprocess/test/test.pro                  |  2 +-
 .../qsocks5socketengine/qsocks5socketengine.pro    |  2 +-
 tests/auto/solutions.pri                           |  4 +--
 tests/auto/windowsmobile/test/test.pro             |  2 +-
 .../lib/fulltextsearch/fulltextsearch.pro          |  2 +-
 56 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/demos/embedded/desktopservices/desktopservices.pro b/demos/embedded/desktopservices/desktopservices.pro
index bff7c46..94ddedd 100644
--- a/demos/embedded/desktopservices/desktopservices.pro
+++ b/demos/embedded/desktopservices/desktopservices.pro
@@ -24,8 +24,8 @@ symbian {
 }
 
 wince*{
-    music.path = "\My Documents\My Music"
-    image.path = "\My Documents\My Pictures"
+    music.path = "\\My Documents\\My Music"
+    image.path = "\\My Documents\\My Pictures"
     DEPLOYMENT += music image
 }
 
diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro
index 5af8731..4809b91 100644
--- a/examples/painting/svgviewer/svgviewer.pro
+++ b/examples/painting/svgviewer/svgviewer.pro
@@ -17,15 +17,15 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/painting/svgviewer
 INSTALLS += target sources
 
 wince*: {
-     addFiles.sources = files\*.svg
-     addFiles.path = \My Documents
+     addFiles.sources = files\\*.svg
+     addFiles.path = "\\My Documents"
      DEPLOYMENT += addFiles
 }
 
 symbian: {
      TARGET.UID3 = 0xA000A64E
      include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-     addFiles.sources = files\*.svg
+     addFiles.sources = files\\*.svg
      addFiles.path = .
      DEPLOYMENT += addFiles
 }
diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro
index 25e21cd..f906d2f 100644
--- a/examples/xml/dombookmarks/dombookmarks.pro
+++ b/examples/xml/dombookmarks/dombookmarks.pro
@@ -15,6 +15,6 @@ symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 
 wince*: {
      addFiles.sources = frank.xbel jennifer.xbel
-     addFiles.path = \My Documents
+     addFiles.path = "\\My Documents"
      DEPLOYMENT += addFiles
 }
diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro
index 4af3ddd..7293bd1 100644
--- a/examples/xml/saxbookmarks/saxbookmarks.pro
+++ b/examples/xml/saxbookmarks/saxbookmarks.pro
@@ -15,7 +15,7 @@ INSTALLS += target sources
 
 wince*: {
      addFiles.sources = frank.xbel jennifer.xbel
-     addFiles.path = \My Documents
+     addFiles.path = "\\My Documents"
      DEPLOYMENT += addFiles
 }
 
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
index 66b3d7f..a3aade7 100644
--- a/mkspecs/common/symbian/symbian-makefile.conf
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -32,7 +32,7 @@ QMAKE_PREFIX_STATICLIB =
 QMAKE_EXTENSION_STATICLIB = lib
 QMAKE_SYMBIAN_SHLIB   = 1
 
-DEFINES *= __PRODUCT_INCLUDE__=\<$${EPOCROOT}epoc32/include/variant/symbian_os.hrh\> \
+DEFINES *= __PRODUCT_INCLUDE__=\\<$${EPOCROOT}epoc32/include/variant/symbian_os.hrh\\> \
     __SYMBIAN32__ \
     __MARM_INTERWORK__ \
     _UNICODE \
diff --git a/mkspecs/common/wince/qmake.conf b/mkspecs/common/wince/qmake.conf
index 705cdc3..57b89b9 100644
--- a/mkspecs/common/wince/qmake.conf
+++ b/mkspecs/common/wince/qmake.conf
@@ -70,9 +70,9 @@ QMAKE_LIBS_OPENGL_ES2 = libGLESv2.lib
 
 QMAKE_LIBS_QT_ENTRY	= -lqtmain
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]\moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]\uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]\idc.exe
+QMAKE_MOC		= $$[QT_INSTALL_BINS]\\moc.exe
+QMAKE_UIC		= $$[QT_INSTALL_BINS]\\uic.exe
+QMAKE_IDC		= $$[QT_INSTALL_BINS]\\idc.exe
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= lib
diff --git a/mkspecs/features/dbusadaptors.prf b/mkspecs/features/dbusadaptors.prf
index 17dffa5..3463d58 100644
--- a/mkspecs/features/dbusadaptors.prf
+++ b/mkspecs/features/dbusadaptors.prf
@@ -2,7 +2,7 @@ qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp)
 
 for(DBUS_ADAPTOR, $$list($$unique(DBUS_ADAPTORS))) {
 
-    !contains(DBUS_ADAPTOR, .*\w\.xml$) {
+    !contains(DBUS_ADAPTOR, .*\\w\\.xml$) {
         warning("Invalid D-BUS adaptor: '$${DBUS_ADAPTOR}', please use 'com.mydomain.myinterface.xml' instead.")
         next()
     }
diff --git a/mkspecs/features/dbusinterfaces.prf b/mkspecs/features/dbusinterfaces.prf
index 412e80f..1828802 100644
--- a/mkspecs/features/dbusinterfaces.prf
+++ b/mkspecs/features/dbusinterfaces.prf
@@ -4,7 +4,7 @@ qtPrepareTool(QMAKE_QDBUSXML2CPP, qdbusxml2cpp)
 
 for(DBUS_INTERFACE, $$list($$unique(DBUS_INTERFACES))) {
 
-    !contains(DBUS_INTERFACE, .*\w\.xml$) {
+    !contains(DBUS_INTERFACE, .*\\w\\.xml$) {
         warning("Invalid D-BUS interface : '$${DBUS_INTERFACE}', please use 'com.mydomain.myinterface.xml' instead.")
         next()
     }
diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf
index e241ca4..b8ca571 100644
--- a/mkspecs/features/incredibuild_xge.prf
+++ b/mkspecs/features/incredibuild_xge.prf
@@ -1,9 +1,9 @@
 contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc") {
-    EOC = \$\$escape_expand(\n\t)
+    EOC = \$\$escape_expand(\\\\n\\\\t)
 
     # The VCPROJ generator will replace the \r\h with the coded \r\n: &#x0d;&#x0a;
     # No other generator understands the \h
-    win32-msvc2*|wince*msvc*: EOC = \$\$escape_expand(\r\h)
+    win32-msvc2*|wince*msvc*: EOC = \$\$escape_expand(\\\\r\\\\h)
 
     for(xge, INCREDIBUILD_XGE) {
         eval($${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$replace($${xge}.output,/,\\) $$EOC $$eval($${xge}.commands))
diff --git a/mkspecs/features/lex.prf b/mkspecs/features/lex.prf
index df76a68..43d8fbd 100644
--- a/mkspecs/features/lex.prf
+++ b/mkspecs/features/lex.prf
@@ -14,9 +14,9 @@
     QMAKE_LEXEXTRAFLAGS = $$QMAKE_LEXFLAGS
     !yacc_no_name_mangle:QMAKE_LEXEXTRAFLAGS += $$QMAKE_LEXFLAGS_MANGLE
 
-    lex.commands = $$QMAKE_LEX $$QMAKE_LEXEXTRAFLAGS ${QMAKE_FILE_IN}$$escape_expand(\n\t) \
-                   $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\n\t) \
-                   $$QMAKE_MOVE lex.${QMAKE_FILE_BASE}.c $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\n\t)
+    lex.commands = $$QMAKE_LEX $$QMAKE_LEXEXTRAFLAGS ${QMAKE_FILE_IN}$$escape_expand(\\n\\t) \
+                   $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t) \
+                   $$QMAKE_MOVE lex.${QMAKE_FILE_BASE}.c $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t)
     lex.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}
 
     silent:lex.commands = @echo Lex ${QMAKE_FILE_IN} && $$lex.commands
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index e1032fd..abda78f 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -14,13 +14,13 @@ win32:count($$list($$INCLUDEPATH), 40, >) {
 
     WIN_INCLUDETEMP=$$INCLUDETEMP
 
-    EOC = $$escape_expand(\n\t)
+    EOC = $$escape_expand(\\n\\t)
 
     if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) {
         # the VCPROJ generator will replace the \r\h with the coded \r\n: &#x0d;&#x0a;
         # No other generator understands the \h
-        if(win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\r\h)
-        else: EOC = $$escape_expand(\\)$$escape_expand(\n\t)
+        if(win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\\r\\h)
+        else: EOC = $$escape_expand(\\\\\\n\\t)
     }
 
     unset(INCFILELIST)
diff --git a/mkspecs/features/sis_targets.prf b/mkspecs/features/sis_targets.prf
index da2d250..13ee1ad 100644
--- a/mkspecs/features/sis_targets.prf
+++ b/mkspecs/features/sis_targets.prf
@@ -96,7 +96,7 @@ contains(TEMPLATE, app)|!count(DEPLOYMENT, 1) {
         }
     } else {
         sis_destdir = $$DESTDIR
-        !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\]$"):sis_destdir = $${sis_destdir}/
+        !isEmpty(sis_destdir):!contains(sis_destdir, "[/\\\\]$"):sis_destdir = $${sis_destdir}/
         contains(QMAKE_HOST.os, "Windows"):sis_destdir = $$replace(sis_destdir, "/", "\\")
 
         sis_target.target = sis
diff --git a/mkspecs/features/symbian/add_mmp_rules.prf b/mkspecs/features/symbian/add_mmp_rules.prf
index 5384dbe..7f96b81 100644
--- a/mkspecs/features/symbian/add_mmp_rules.prf
+++ b/mkspecs/features/symbian/add_mmp_rules.prf
@@ -23,7 +23,7 @@ defineTest(addMMPRules) {
                 # No value defined for current condition, so use default
                 varVal = $$eval($${var}.default)
             }
-            !isEmpty(varVal): libBlock += "$$join(varVal,$$escape_expand(\n))"
+            !isEmpty(varVal): libBlock += "$$join(varVal,$$escape_expand(\\n))"
         }
 
         MMP_RULES += $$libBlock
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index 76f9ba1..c5654d9 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -21,11 +21,11 @@ contains( CONFIG, no_icon ) {
         # only uses filename from RSS_RULES.icon_file when referring to icon file name.
         baseTarget = $$basename(TARGET)
         baseTarget = $$replace(baseTarget, /,_)
-        baseTarget = $$replace(baseTarget, \\,_)
+        baseTarget = $$replace(baseTarget, \\\\,_)
         baseTarget = $$replace(baseTarget, " ",_)
         symbian-abld|symbian-sbsv2 {
             baseTarget = $$replace(baseTarget, -,_)
-            baseTarget = $$replace(baseTarget, \.,_)
+            baseTarget = $$replace(baseTarget, \\.,_)
             baseTarget = $$replace(baseTarget, :,_)
         }
 
diff --git a/mkspecs/features/symbian/def_files.prf b/mkspecs/features/symbian/def_files.prf
index 8bcd096..eb17402 100644
--- a/mkspecs/features/symbian/def_files.prf
+++ b/mkspecs/features/symbian/def_files.prf
@@ -63,7 +63,7 @@ symbian-abld|symbian-sbsv2 {
     freeze_target.target = freeze
     freeze_target.depends = first
     # The perl part is to convert to unix line endings and remove comments, which the s60 tools refuse to do.
-    freeze_target.commands = perl -n -e \'next if (/; NEW/); s/\r//g; if (/MISSING:(.*)/x) { print(\"\$\$1 ABSENT\\n\"); } else { print; }\' < $$symbianObjdir/$${TARGET}.def >  $$elf2e32FileToAdd
+    freeze_target.commands = perl -n -e \'next if (/; NEW/); s/\\r//g; if (/MISSING:(.*)/x) { print(\"\$\$1 ABSENT\\n\"); } else { print; }\' < $$symbianObjdir/$${TARGET}.def >  $$elf2e32FileToAdd
     QMAKE_EXTRA_TARGETS += freeze_target
 } else:contains(TEMPLATE, subdirs) {
     freeze_target.target = freeze
diff --git a/mkspecs/features/symbian/moc.prf b/mkspecs/features/symbian/moc.prf
index 29e0d8d..6030944 100644
--- a/mkspecs/features/symbian/moc.prf
+++ b/mkspecs/features/symbian/moc.prf
@@ -1,17 +1,17 @@
 load(moc)
 
 symbian-abld|symbian-sbsv2 {
-    RET = $$find(MOC_DIR, "(/|^)\.[^/]+/?$")
+    RET = $$find(MOC_DIR, "(/|^)\\.[^/]+/?$")
     !isEmpty(RET):{
         error("Symbian does not support directories starting with a dot. Please set MOC_DIR to a different value in your profile. MOC_DIR: $$MOC_DIR")
     }
 
-    RET = $$find(RCC_DIR, "(/|^)\.[^/]+/?$")
+    RET = $$find(RCC_DIR, "(/|^)\\.[^/]+/?$")
     !isEmpty(RET):{
         error("Symbian does not support directories starting with a dot. Please set RCC_DIR to a different value in your profile. RCC_DIR: $$RCC_DIR")
     }
 
-    RET = $$find(OBJECTS_DIR, "(/|^)\.[^/]+/?$")
+    RET = $$find(OBJECTS_DIR, "(/|^)\\.[^/]+/?$")
     !isEmpty(RET):{
         error("Symbian does not support directories starting with a dot. Please set OBJECTS_DIR to a different value in your profile. OBJECTS_DIR: $$OBJECTS_DIR")
     }
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 802adde..c230272 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -22,16 +22,16 @@ contains(QMAKE_CFLAGS, "--thumb")|contains(QMAKE_CXXFLAGS, "--thumb")|contains(Q
 }
 
 defineReplace(processSymbianLibraries) {
-    library = $$replace(1, "\.dll$", ".dso")
+    library = $$replace(1, "\\.dll$", ".dso")
     library = $$replace(library, "^-l", "")
-    isFullName = $$find(library, \.)
+    isFullName = $$find(library, \\.)
     isEmpty(isFullName):library="$${library}.dso"
     linux-gcce {
         newLIB = "-l:$${library}"
     } else {
         newLIB = "$${library}"
     }
-    contains(library, "\.dso$")|contains(library, ".lib$"):PRE_TARGETDEPS += $$library
+    contains(library, "\\.dso$")|contains(library, "\\.lib$"):PRE_TARGETDEPS += $$library
     return($$newLIB)
 }
 
@@ -55,7 +55,7 @@ isEmpty(VERSION) {
 }
 
 # Check for version validity.
-!isEmpty(VERSION):!contains(VERSION, "[0-9]+"):!contains(VERSION, "[0-9]+\.[0-9]+")!contains(VERSION, "[0-9]+(\.[0-9]+){2}") {
+!isEmpty(VERSION):!contains(VERSION, "[0-9]+"):!contains(VERSION, "[0-9]+\\.[0-9]+")!contains(VERSION, "[0-9]+(\\.[0-9]+){2}") {
     error("Invalid VERSION for Symbian: $$VERSION")
 }
 
@@ -86,7 +86,7 @@ isEmpty(TARGET.UID2):TARGET.UID2 = 0x00000000
 
 capability = $$replace(TARGET.CAPABILITY, " ", "+")
 capability = $$join(capability, "+")
-capability = $$replace(capability, "\+-", "-")
+capability = $$replace(capability, "\\+-", "-")
 isEmpty(capability): capability = "None"
 capability = "--capability=$$capability"
 
@@ -214,9 +214,9 @@ symbian_resources_INCLUDES += "-I $$symbian_resources_RCC_DIR"
 
 for(symbian_resource, SYMBIAN_RESOURCES) {
     symbian_resource = $$basename(symbian_resource)
-    symbian_resource_clean = $$replace(symbian_resource, "\.rss$", ".rsc")
+    symbian_resource_clean = $$replace(symbian_resource, "\\.rss$", ".rsc")
     QMAKE_DISTCLEAN += $${symbianDestdir}/$${symbian_resource_clean}
-    symbian_resource_clean = $$replace(symbian_resource, "\.rss$", ".rpp")
+    symbian_resource_clean = $$replace(symbian_resource, "\\.rss$", ".rpp")
     QMAKE_CLEAN += $${symbian_resources_RCC_DIR}/$${symbian_resource_clean}
 }
 
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf
index c87372d..5324e65 100644
--- a/mkspecs/features/uic.prf
+++ b/mkspecs/features/uic.prf
@@ -86,14 +86,14 @@ defineReplace(imageCollectionCmd) {
     for(image, $$list($$split(1))) {
            EMBEDDED_IMAGES += $$image
            count(EMBEDDED_IMAGES, 5) {
-                isEmpty(RET): RET += echo $$EMBEDDED_IMAGES > images.tmp $$escape_expand(\n\t)
-                else:         RET += echo $$EMBEDDED_IMAGES >> images.tmp $$escape_expand(\n\t)
+                isEmpty(RET): RET += echo $$EMBEDDED_IMAGES > images.tmp $$escape_expand(\\n\\t)
+                else:         RET += echo $$EMBEDDED_IMAGES >> images.tmp $$escape_expand(\\n\\t)
                 unset(EMBEDDED_IMAGES)
            }
     }
-    !isEmpty(EMBEDDED_IMAGES):RET += echo $$EMBEDDED_IMAGES >> images.tmp $$escape_expand(\n\t)
+    !isEmpty(EMBEDDED_IMAGES):RET += echo $$EMBEDDED_IMAGES >> images.tmp $$escape_expand(\\n\\t)
     !isEmpty(RET) {
-        RET += $$QMAKE_UIC3 -embed $$TARGET -f images.tmp -o $$2 $$escape_expand(\n\t)
+        RET += $$QMAKE_UIC3 -embed $$TARGET -f images.tmp -o $$2 $$escape_expand(\\n\\t)
         return($$RET)
     }
     return($$QMAKE_UIC3 -embed $$TARGET $$1 -o $$2)
diff --git a/mkspecs/features/win32/embed_manifest_dll.prf b/mkspecs/features/win32/embed_manifest_dll.prf
index 60a55ce..7305c04 100644
--- a/mkspecs/features/win32/embed_manifest_dll.prf
+++ b/mkspecs/features/win32/embed_manifest_dll.prf
@@ -2,12 +2,12 @@ MANIFEST_DIR = $$OBJECTS_DIR
 isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
 !if(plugin:no_plugin_manifest):if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!static:!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "lib") {
     NOPATH_TARGET = $$TARGET
-    NOPATH_TARGET ~= s,\\ , ,q      # Remove space escaping (NOPATH_TARGET is quoted)
-    NOPATH_TARGET ~= s,\\,/,g       # Change to single type separators
+    NOPATH_TARGET ~= s,\\\\ , ,q    # Remove space escaping (NOPATH_TARGET is quoted)
+    NOPATH_TARGET ~= s,\\\\,/,g     # Change to single type separators
     NOPATH_TARGET ~= s,^(.*/)+,,    # Remove all paths
     QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\")
     QMAKE_PREV_POST_LINK = $$QMAKE_POST_LINK
-    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2$$escape_expand(\n\t))
+    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);2$$escape_expand(\\n\\t))
     QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK
     QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"
 }
diff --git a/mkspecs/features/win32/embed_manifest_exe.prf b/mkspecs/features/win32/embed_manifest_exe.prf
index 169134d..5b37a6d 100644
--- a/mkspecs/features/win32/embed_manifest_exe.prf
+++ b/mkspecs/features/win32/embed_manifest_exe.prf
@@ -2,12 +2,12 @@ MANIFEST_DIR = $$OBJECTS_DIR
 isEmpty(MANIFEST_DIR):MANIFEST_DIR = .
 if(win32-msvc2005*|win32-msvc2008*|win32-msvc2010*):!equals(TEMPLATE_PREFIX, "vc"):equals(TEMPLATE, "app") {
     NOPATH_TARGET = $$TARGET
-    NOPATH_TARGET ~= s,\\ , ,q      # Remove space escaping (NOPATH_TARGET is quoted)
-    NOPATH_TARGET ~= s,\\,/,g       # Change to single type separators
+    NOPATH_TARGET ~= s,\\\\ , ,q    # Remove space escaping (NOPATH_TARGET is quoted)
+    NOPATH_TARGET ~= s,\\\\,/,g     # Change to single type separators
     NOPATH_TARGET ~= s,^(.*/)+,,    # Remove all paths
     QMAKE_LFLAGS += /MANIFEST $$quote(/MANIFESTFILE:\"$${MANIFEST_DIR}\\$${NOPATH_TARGET}.intermediate.manifest\")
     QMAKE_PREV_POST_LINK = $$QMAKE_POST_LINK
-    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\n\t))
+    QMAKE_POST_LINK = $$quote(mt.exe -nologo -manifest \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\" -outputresource:$(DESTDIR_TARGET);1$$escape_expand(\\n\\t))
     QMAKE_POST_LINK += $$QMAKE_PREV_POST_LINK
     QMAKE_CLEAN += \"$$replace(MANIFEST_DIR,/,\\)\\$${NOPATH_TARGET}.intermediate.manifest\"
 }
diff --git a/mkspecs/features/win32/qaxserver.prf b/mkspecs/features/win32/qaxserver.prf
index 1ff6825..2899976 100644
--- a/mkspecs/features/win32/qaxserver.prf
+++ b/mkspecs/features/win32/qaxserver.prf
@@ -19,10 +19,10 @@ equals(ACTIVEQT_IDE, "VisualStudio") {
     ACTIVEQT_IDL = $${QMAKE_IDL}
     ACTIVEQT_TARGET = "$(TargetPath)"
     win32-msvc {
-        ACTIVEQT_NEWLINE = $$escape_expand(\t)
+        ACTIVEQT_NEWLINE = $$escape_expand(\\t)
         ACTIVEQT_OUTPUT = $(IntDir)/$${TARGET}
     } else {
-        ACTIVEQT_NEWLINE = $$escape_expand(\n\t)
+        ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t)
         ACTIVEQT_OUTPUT = $(IntDir)$${TARGET}
     }
     ACTIVEQT_TLBOUT = "$(TargetDir)/$${TARGET}.tlb"
@@ -31,7 +31,7 @@ equals(ACTIVEQT_IDE, "VisualStudio") {
 equals(ACTIVEQT_IDE, "makefile") {
     ACTIVEQT_IDC = -$(IDC)
     ACTIVEQT_IDL = -$(IDL)
-    ACTIVEQT_NEWLINE = $$escape_expand(\n\t)
+    ACTIVEQT_NEWLINE = $$escape_expand(\\n\\t)
     ACTIVEQT_TARGET = $(DESTDIR_TARGET)
     ACTIVEQT_OUTPUT = $(OBJECTS_DIR)/$${TARGET}
     isEmpty(DESTDIR) {
diff --git a/mkspecs/features/yacc.prf b/mkspecs/features/yacc.prf
index c078e09..4d7e0a3 100644
--- a/mkspecs/features/yacc.prf
+++ b/mkspecs/features/yacc.prf
@@ -21,10 +21,10 @@
     !yacc_no_name_mangle:QMAKE_YACCDECLFLAGS += $$QMAKE_YACCFLAGS_MANGLE
 
     yacc_decl.commands = \
-        $$QMAKE_YACC $$QMAKE_YACCDECLFLAGS ${QMAKE_FILE_IN}$$escape_expand(\n\t) \
-        $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\n\t) \
-        $$QMAKE_MOVE $${QMAKE_YACC_HEADER} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)}$$escape_expand(\n\t) \
-        $$QMAKE_MOVE $${QMAKE_YACC_SOURCE} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\n\t)
+        $$QMAKE_YACC $$QMAKE_YACCDECLFLAGS ${QMAKE_FILE_IN}$$escape_expand(\\n\\t) \
+        $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t) \
+        $$QMAKE_MOVE $${QMAKE_YACC_HEADER} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)}$$escape_expand(\\n\\t) \
+        $$QMAKE_MOVE $${QMAKE_YACC_SOURCE} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t)
     yacc_decl.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)}
 
     silent:yacc_decl.commands = @echo Yacc ${QMAKE_FILE_IN} && $$yacc_decl.commands
@@ -35,7 +35,7 @@
     yacc_impl.name = source for ${QMAKE_FILE_IN}
     yacc_impl.input = YACCSOURCES
     yacc_impl.variable_out = GENERATED_SOURCES
-    yacc_impl.commands = $$escape_expand(\n)        # We don't want any commands where, but if command is empty no rules are created
+    yacc_impl.commands = $$escape_expand(\\n)        # We don't want any commands where, but if command is empty no rules are created
     yacc_impl.depends = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)}    # Make sure we depend on the step above
     yacc_impl.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}   # Faked output from this step, output really created in step above
     QMAKE_EXTRA_COMPILERS += yacc_impl
diff --git a/mkspecs/win32-borland/qmake.conf b/mkspecs/win32-borland/qmake.conf
index 63bf07a..2ba742c 100644
--- a/mkspecs/win32-borland/qmake.conf
+++ b/mkspecs/win32-borland/qmake.conf
@@ -41,7 +41,7 @@ QMAKE_CXXFLAGS_EXCEPTIONS_ON =
 QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -x-
 
 QMAKE_INCDIR		=
-QMAKE_LIBDIR		= $(BCB)\lib
+QMAKE_LIBDIR		= $(BCB)\\lib
 QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
 QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 
@@ -69,9 +69,9 @@ QMAKE_LIBS_QT_ENTRY	= -lqtmain
 #QMAKE_LIBS_OPENGL	=
 #QMAKE_LFLAGS_OPENGL	= /dopengl32.dll
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]\moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]\uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]\idc.exe
+QMAKE_MOC		= $$[QT_INSTALL_BINS]\\moc.exe
+QMAKE_UIC		= $$[QT_INSTALL_BINS]\\uic.exe
+QMAKE_IDC		= $$[QT_INSTALL_BINS]\\idc.exe
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= tlib /C /P256
diff --git a/mkspecs/win32-icc/qmake.conf b/mkspecs/win32-icc/qmake.conf
index fcc7691..acff5e1 100644
--- a/mkspecs/win32-icc/qmake.conf
+++ b/mkspecs/win32-icc/qmake.conf
@@ -67,9 +67,9 @@ QMAKE_LIBS_OPENGL       = opengl32.lib glu32.lib gdi32.lib user32.lib delayimp.l
 QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32.lib ws2_32.lib
 QMAKE_LIBS_QT_ENTRY	= -lqtmain
 
-QMAKE_MOC		= $$[QT_INSTALL_BINS]\moc.exe
-QMAKE_UIC		= $$[QT_INSTALL_BINS]\uic.exe
-QMAKE_IDC		= $$[QT_INSTALL_BINS]\idc.exe
+QMAKE_MOC		= $$[QT_INSTALL_BINS]\\moc.exe
+QMAKE_UIC		= $$[QT_INSTALL_BINS]\\uic.exe
+QMAKE_IDC		= $$[QT_INSTALL_BINS]\\idc.exe
 
 QMAKE_IDL		= midl
 QMAKE_LIB		= lib /NOLOGO
diff --git a/mkspecs/win32-msvc2003/qmake.conf b/mkspecs/win32-msvc2003/qmake.conf
index e92df12..5344331 100644
--- a/mkspecs/win32-msvc2003/qmake.conf
+++ b/mkspecs/win32-msvc2003/qmake.conf
@@ -64,9 +64,9 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
+QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
+QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
+QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
 
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 5ed8e01..84e831f 100644
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -67,9 +67,9 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
+QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
+QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
+QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
 
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 373a36d..3e0bfb5 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -67,9 +67,9 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
+QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
+QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
+QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
 
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 2a48938..d9fe711 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -67,9 +67,9 @@ QMAKE_LIBS_COMPAT       = advapi32.lib shell32.lib comdlg32.lib user32.lib gdi32
 
 QMAKE_LIBS_QT_ENTRY     = -lqtmain
 
-QMAKE_MOC               = $$[QT_INSTALL_BINS]\moc.exe
-QMAKE_UIC               = $$[QT_INSTALL_BINS]\uic.exe
-QMAKE_IDC               = $$[QT_INSTALL_BINS]\idc.exe
+QMAKE_MOC               = $$[QT_INSTALL_BINS]\\moc.exe
+QMAKE_UIC               = $$[QT_INSTALL_BINS]\\uic.exe
+QMAKE_IDC               = $$[QT_INSTALL_BINS]\\idc.exe
 
 QMAKE_IDL               = midl
 QMAKE_LIB               = lib /NOLOGO
diff --git a/projects.pro b/projects.pro
index 45fb8da..373b049 100644
--- a/projects.pro
+++ b/projects.pro
@@ -104,33 +104,33 @@ unix:!symbian {
  			(cd qmake && $(MAKE) distclean);
 }
 win32 {
-  confclean.commands += -$(DEL_FILE) src\core\global\qconfig.h $$escape_expand(\n\t) \
-			-$(DEL_FILE) src\core\global\qconfig.cpp $$escape_expand(\n\t) \
-			-$(DEL_FILE) mkspecs\qconfig.pri $$escape_expand(\n\t) \
-			-$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \
+  confclean.commands += -$(DEL_FILE) src\\core\\global\\qconfig.h $$escape_expand(\\n\\t) \
+			-$(DEL_FILE) src\\core\\global\\qconfig.cpp $$escape_expand(\\n\\t) \
+			-$(DEL_FILE) mkspecs\\qconfig.pri $$escape_expand(\\n\\t) \
+			-$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \
 			(cd qmake && $(MAKE) distclean)
 }
 symbian {
   confclean.depends += distclean
   contains(QMAKE_HOST.os, "Windows") {
     confclean.commands += \
-            (cd src\tools\moc && $(MAKE) distclean) $$escape_expand(\n\t) \
-            (cd src\tools\rcc && $(MAKE) distclean) $$escape_expand(\n\t) \
-            (cd src\tools\uic && $(MAKE) distclean) $$escape_expand(\n\t) \
-            -$(DEL_FILE) src\corelib\global\qconfig.h $$escape_expand(\n\t) \
-            -$(DEL_FILE) src\corelib\global\qconfig.cpp $$escape_expand(\n\t) \
-            -$(DEL_FILE) mkspecs\qconfig.pri $$escape_expand(\n\t) \
-            -$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \
+            (cd src\\tools\\moc && $(MAKE) distclean) $$escape_expand(\\n\\t) \
+            (cd src\\tools\\rcc && $(MAKE) distclean) $$escape_expand(\\n\\t) \
+            (cd src\\tools\\uic && $(MAKE) distclean) $$escape_expand(\\n\\t) \
+            -$(DEL_FILE) src\\corelib\\global\\qconfig.h $$escape_expand(\\n\\t) \
+            -$(DEL_FILE) src\\corelib\\global\\qconfig.cpp $$escape_expand(\\n\\t) \
+            -$(DEL_FILE) mkspecs\\qconfig.pri $$escape_expand(\\n\\t) \
+            -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \
             (cd qmake && $(MAKE) distclean)
   } else {
     confclean.commands += \
-            (cd src/tools/moc && $(MAKE) distclean) $$escape_expand(\n\t) \
-            (cd src/tools/rcc && $(MAKE) distclean) $$escape_expand(\n\t) \
-            (cd src/tools/uic && $(MAKE) distclean) $$escape_expand(\n\t) \
-            -$(DEL_FILE) src/corelib/global/qconfig.h $$escape_expand(\n\t) \
-            -$(DEL_FILE) src/corelib/global/qconfig.cpp $$escape_expand(\n\t) \
-            -$(DEL_FILE) mkspecs/qconfig.pri $$escape_expand(\n\t) \
-            -$(DEL_FILE) .qmake.cache $$escape_expand(\n\t) \
+            (cd src/tools/moc && $(MAKE) distclean) $$escape_expand(\\n\\t) \
+            (cd src/tools/rcc && $(MAKE) distclean) $$escape_expand(\\n\\t) \
+            (cd src/tools/uic && $(MAKE) distclean) $$escape_expand(\\n\\t) \
+            -$(DEL_FILE) src/corelib/global/qconfig.h $$escape_expand(\\n\\t) \
+            -$(DEL_FILE) src/corelib/global/qconfig.cpp $$escape_expand(\\n\\t) \
+            -$(DEL_FILE) mkspecs/qconfig.pri $$escape_expand(\\n\\t) \
+            -$(DEL_FILE) .qmake.cache $$escape_expand(\\n\\t) \
             (cd qmake && $(MAKE) distclean)
   }
 }
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 5def728..63e78a7 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -159,7 +159,7 @@ defineTest(addExtraCompiler) {
 
     for(file,input) {
         base = $$basename(file)
-        base ~= s/\..+//
+        base ~= s/\\..+//
         newfile=$$replace(outputRule,\\$\\{QMAKE_FILE_BASE\\},$$base)
         SOURCES += $$newfile
     }
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro b/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
index 389fb5f..22d4c8d 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
+++ b/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
@@ -28,7 +28,7 @@ qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}define QT_QTWEBKIT_MOD
 qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}include $${ESCAPE}<QtNetwork/QtNetwork$${ESCAPE}>$${QUOTE} >> $${qtheader_module.target} &&
 WEBKIT_CLASS_HEADERS = $${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}PWD/QtWebKit
 
-regex = ".*\sclass\sQWEBKIT_EXPORT\s(\w+)\s(.*)"
+regex = ".*\\sclass\\sQWEBKIT_EXPORT\\s(\\w+)\\s(.*)"
 
 for(HEADER, WEBKIT_API_HEADERS) {
     # 1. Append to QtWebKit header that includes all other header files
@@ -70,7 +70,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
         res = $$find(src, $$regex)
         isEmpty(res):break()
 
-        exp = $$replace(src, $$regex, "EXPORTED_CLASS = \1")
+        exp = $$replace(src, $$regex, "EXPORTED_CLASS = \\1")
         eval($$exp)
 
         CLASS_TARGET = "qtheader_$${EXPORTED_CLASS}"
@@ -87,7 +87,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
 
         # Qt's QRegExp does not support inline non-greedy matching,
         # so we'll have to work around it by updating the haystack
-        src = $$replace(src, $$regex, "\2")
+        src = $$replace(src, $$regex, "\\2")
         src_words = $$join(src, $${LITERAL_WHITESPACE})
     }
 }
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/docs.pri b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
index 804817b..a56ddb4 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
+++ b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
@@ -3,7 +3,7 @@ include(../../../WebKit.pri)
 unix {
     QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/bin/qdoc3
 } else {
-    QDOC = $$(QTDIR)\bin\qdoc3.exe
+    QDOC = $$(QTDIR)\\bin\\qdoc3.exe
 }
 
 unix {
diff --git a/src/activeqt/control/control.pro b/src/activeqt/control/control.pro
index bf3647e..44eb928 100644
--- a/src/activeqt/control/control.pro
+++ b/src/activeqt/control/control.pro
@@ -15,7 +15,7 @@ TARGET   = QAxServer
 }
 
 CONFIG  += qt warn_off staticlib
-QTDIR_build:DESTDIR  = $$QT_BUILD_TREE\lib
+QTDIR_build:DESTDIR  = $$QT_BUILD_TREE\\lib
 
 DEFINES	+= QAX_SERVER
 win32-g++:DEFINES += QT_NEEDS_QMAIN
diff --git a/tests/auto/declarative/parserstress/parserstress.pro b/tests/auto/declarative/parserstress/parserstress.pro
index a95a855..3a675e4 100644
--- a/tests/auto/declarative/parserstress/parserstress.pro
+++ b/tests/auto/declarative/parserstress/parserstress.pro
@@ -6,7 +6,7 @@ SOURCES += tst_parserstress.cpp
 
 symbian: {
     DEFINES += SRCDIR=\".\"
-    importFiles.sources = ..\..\qscriptjstestsuite\tests
+    importFiles.sources = ..\\..\\qscriptjstestsuite\\tests
     importFiles.path = 
     DEPLOYMENT = importFiles
 } else {
diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
index 4698b2b..d4dcda8 100644
--- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
+++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.pro
@@ -1,3 +1,3 @@
-SOURCES += src\main.cpp
+SOURCES += src\\main.cpp
 
-TRANSLATIONS = ts\project.ts
+TRANSLATIONS = ts\\project.ts
diff --git a/tests/auto/patternistexamples/patternistexamples.pro b/tests/auto/patternistexamples/patternistexamples.pro
index 4092fc8..c528c93 100644
--- a/tests/auto/patternistexamples/patternistexamples.pro
+++ b/tests/auto/patternistexamples/patternistexamples.pro
@@ -13,7 +13,7 @@ wince*|symbian*: {
 	recipes.sources = $$QT_SOURCE_TREE/examples/xmlpatterns/recipes/*
 	recipes.path = recipes
 	files.sources = $$QT_SOURCE_TREE/examples/xmlpatterns/recipes/files/*
-	files.path = recipes\files
+	files.path = recipes\\files
 
 	DEPLOYMENT += snippets widgetRen globVar filetree recipes files
 	# take care of dependency
diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro
index e33c04d..1b30beb 100644
--- a/tests/auto/qaccessibility/qaccessibility.pro
+++ b/tests/auto/qaccessibility/qaccessibility.pro
@@ -5,7 +5,7 @@ unix:!mac:LIBS+=-lm
 contains(QT_CONFIG, qt3support): QT += qt3support
 
 wince*: {
-	accessneeded.sources = $$QT_BUILD_TREE\plugins\accessible\*.dll
+	accessneeded.sources = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll
 	accessneeded.path = accessible
 	DEPLOYMENT += accessneeded
 }
\ No newline at end of file
diff --git a/tests/auto/qdesktopservices/qdesktopservices.pro b/tests/auto/qdesktopservices/qdesktopservices.pro
index 9ef557d..d32ed4c 100644
--- a/tests/auto/qdesktopservices/qdesktopservices.pro
+++ b/tests/auto/qdesktopservices/qdesktopservices.pro
@@ -3,23 +3,23 @@ CONFIG += qttest_p4
 SOURCES		+= tst_qdesktopservices.cpp
 TARGET		= tst_qdesktopservices
 symbian: {
-   dummy.sources = text\testfile.txt
+   dummy.sources = text\\testfile.txt
    dummy.path = .
 
-   text.sources = text\*
-   text.path = \data\others\
+   text.sources = text\\*
+   text.path = \\data\\others
 
-   image.sources = image\*
-   image.path = \data\images\
+   image.sources = image\\*
+   image.path = \\data\\images
 
-   audio.sources = audio\*
-   audio.path = \data\sounds\
+   audio.sources = audio\\*
+   audio.path = \\data\\sounds
 
-   video.sources = video\*
-   video.path = \data\videos\
+   video.sources = video\\*
+   video.path = \\data\\videos
 
-   install.sources = install\*
-   install.path = \data\installs\
+   install.sources = install\\*
+   install.path = \\data\\installs
 
    DEPLOYMENT += image audio video install
 
diff --git a/tests/auto/qdirmodel/qdirmodel.pro b/tests/auto/qdirmodel/qdirmodel.pro
index 5a66883..36929b9 100644
--- a/tests/auto/qdirmodel/qdirmodel.pro
+++ b/tests/auto/qdirmodel/qdirmodel.pro
@@ -2,9 +2,9 @@ load(qttest_p4)
 SOURCES         += tst_qdirmodel.cpp
 
 wince*|symbian {
-	addit.sources = dirtest\test1\*
-	addit.path = dirtest\test1
-	tests.sources = test\*
+	addit.sources = dirtest\\test1\\*
+	addit.path = dirtest\\test1
+	tests.sources = test\\*
 	tests.path = test
         sourceFile.sources = tst_qdirmodel.cpp
         sourceFile.path = .
diff --git a/tests/auto/qfile/test/test.pro b/tests/auto/qfile/test/test.pro
index faaa927..70c93ce 100644
--- a/tests/auto/qfile/test/test.pro
+++ b/tests/auto/qfile/test/test.pro
@@ -3,11 +3,11 @@ SOURCES  += ../tst_qfile.cpp
 
 wince*|symbian {
     QT = core gui
-    files.sources += ..\dosfile.txt ..\noendofline.txt ..\testfile.txt \
-                     ..\testlog.txt ..\two.dots.file ..\tst_qfile.cpp \
-                     ..\Makefile ..\forCopying.txt ..\forRenaming.txt
+    files.sources += ..\\dosfile.txt ..\\noendofline.txt ..\\testfile.txt \
+                     ..\\testlog.txt ..\\two.dots.file ..\\tst_qfile.cpp \
+                     ..\\Makefile ..\\forCopying.txt ..\\forRenaming.txt
     files.path = .
-    resour.sources += ..\resources\file1.ext1
+    resour.sources += ..\\resources\\file1.ext1
     resour.path = resources
 
     DEPLOYMENT = files resour
diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro
index 93599f4..2038514 100644
--- a/tests/auto/qfileinfo/qfileinfo.pro
+++ b/tests/auto/qfileinfo/qfileinfo.pro
@@ -8,7 +8,7 @@ RESOURCES      += qfileinfo.qrc
 
 wince*:|symbian*: {
     deploy.sources += qfileinfo.qrc tst_qfileinfo.cpp
-    res.sources = resources\file1 resources\file1.ext1 resources\file1.ext1.ext2
+    res.sources = resources\\file1 resources\\file1.ext1 resources\\file1.ext1.ext2
     res.path = resources
     DEPLOYMENT = deploy res
 }
diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro
index 31bb769..401c9eb 100644
--- a/tests/auto/qgraphicsscene/qgraphicsscene.pro
+++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro
@@ -9,8 +9,8 @@ DEFINES += QT_NO_CAST_TO_ASCII
 wince*|symbian*: {
    rootFiles.sources = Ash_European.jpg graphicsScene_selection.data
    rootFiles.path = .
-   renderFiles.sources = testData\render\*
-   renderFiles.path = testData\render
+   renderFiles.sources = testData\\render\\*
+   renderFiles.path = testData\\render
    DEPLOYMENT += rootFiles renderFiles
 }
 wince*:{
diff --git a/tests/auto/qimagewriter/qimagewriter.pro b/tests/auto/qimagewriter/qimagewriter.pro
index 8da2942..2171c3e 100644
--- a/tests/auto/qimagewriter/qimagewriter.pro
+++ b/tests/auto/qimagewriter/qimagewriter.pro
@@ -6,12 +6,12 @@ win32-msvc:QMAKE_CXXFLAGS -= -Zm200
 win32-msvc:QMAKE_CXXFLAGS += -Zm800
 
 wince*: {
-   addFiles.sources = images\*.*
+   addFiles.sources = images\\*.*
    addFiles.path = images
    DEPLOYMENT += addFiles
    DEFINES += SRCDIR=\\\".\\\"
 } else:symbian* {
-   addFiles.sources = images\*.*
+   addFiles.sources = images\\*.*
    addFiles.path = images
    DEPLOYMENT += addFiles
    qt_not_deployed {
diff --git a/tests/auto/qlibrary/lib2/lib2.pro b/tests/auto/qlibrary/lib2/lib2.pro
index 4654f4d..b441569 100644
--- a/tests/auto/qlibrary/lib2/lib2.pro
+++ b/tests/auto/qlibrary/lib2/lib2.pro
@@ -38,9 +38,9 @@ symbian-abld: {
     TARGET.CAPABILITY=ALL -TCB
     FIXEDROOT = $$replace(EPOCROOT,/,\\)
 	QMAKE_POST_LINK = \
-    copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dl2 && \
-    copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\system.trolltech.test.mylib.dll && \
-    IF NOT "$(PLATFORM)==WINSCW" copy /Y $${FIXEDROOT}epoc32\release\\$(PLATFORM)\\$(CFG)\mylib.dll  ..\tst\mylib.dl2
+    copy /Y $${FIXEDROOT}epoc32\\release\\$(PLATFORM)\\$(CFG)\\mylib.dll  $${FIXEDROOT}epoc32\\release\\$(PLATFORM)\\$(CFG)\\mylib.dl2 && \
+    copy /Y $${FIXEDROOT}epoc32\\release\\$(PLATFORM)\\$(CFG)\\mylib.dll  $${FIXEDROOT}epoc32\\release\\$(PLATFORM)\\$(CFG)\\system.trolltech.test.mylib.dll && \
+    IF NOT "$(PLATFORM)==WINSCW" copy /Y $${FIXEDROOT}epoc32\\release\\$(PLATFORM)\\$(CFG)\\mylib.dll  ..\\tst\\mylib.dl2
 }
 
 symbian-sbsv2: {
diff --git a/tests/auto/qlocale/test/test.pro b/tests/auto/qlocale/test/test.pro
index 7bc9f59..d57f2d1 100644
--- a/tests/auto/qlocale/test/test.pro
+++ b/tests/auto/qlocale/test/test.pro
@@ -25,7 +25,7 @@ wince*: {
    addFiles.sources = \
         ../syslocaleapp
 
-   addFiles.path = \Program Files\tst_qlocale
+   addFiles.path = "\\Program Files\\tst_qlocale"
    DEPLOYMENT += addFiles
 }
 
diff --git a/tests/auto/qlocalsocket/test/test.pro b/tests/auto/qlocalsocket/test/test.pro
index cfdc89b..687aae2 100644
--- a/tests/auto/qlocalsocket/test/test.pro
+++ b/tests/auto/qlocalsocket/test/test.pro
@@ -34,7 +34,7 @@ wince* {
 
 symbian {
     additionalFiles.sources = lackey.exe
-    additionalFiles.path = \sys\bin
+    additionalFiles.path = \\sys\\bin
     TARGET.UID3 = 0xE0340005
     DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
 }
diff --git a/tests/auto/qmainwindow/qmainwindow.pro b/tests/auto/qmainwindow/qmainwindow.pro
index 43d73ae..e015f95 100644
--- a/tests/auto/qmainwindow/qmainwindow.pro
+++ b/tests/auto/qmainwindow/qmainwindow.pro
@@ -2,5 +2,5 @@ load(qttest_p4)
 SOURCES += tst_qmainwindow.cpp
 
 # Symbian toolchain does not support correct include semantics
-symbian:INCPATH+=..\..\..\include\QtGui\private
+symbian:INCPATH+=..\\..\\..\\include\\QtGui\\private
 
diff --git a/tests/auto/qmake/testdata/functions/functions.pro b/tests/auto/qmake/testdata/functions/functions.pro
index 5e089e4..ad66ee8 100644
--- a/tests/auto/qmake/testdata/functions/functions.pro
+++ b/tests/auto/qmake/testdata/functions/functions.pro
@@ -53,7 +53,7 @@ include( infiletest.pro, "", true )
 
 #replace
 VERSION=1.0.0
-VERSION_replaced=$$replace(VERSION,\.,_)
+VERSION_replaced=$$replace(VERSION,\\.,_)
 !isEqual(VERSION_replaced, 1_0_0) {
    message( "FAILED: replace function: $$VERSION_replaced" )
 }
diff --git a/tests/auto/qmovie/qmovie.pro b/tests/auto/qmovie/qmovie.pro
index 30e5901..a8ec478 100644
--- a/tests/auto/qmovie/qmovie.pro
+++ b/tests/auto/qmovie/qmovie.pro
@@ -7,14 +7,14 @@ MOC_DIR=tmp
 !contains(QT_CONFIG, no-mng):DEFINES += QTEST_HAVE_MNG
 
 wince*: {
-   addFiles.sources = animations\*
+   addFiles.sources = animations\\*
    addFiles.path = animations
    DEPLOYMENT += addFiles
 }
 
 
 symbian*: {
-   addFiles.sources = animations\*
+   addFiles.sources = animations\\*
    addFiles.path = animations
    DEPLOYMENT += addFiles
 
diff --git a/tests/auto/qnetworkreply/test/test.pro b/tests/auto/qnetworkreply/test/test.pro
index 7bf3852..b9ece38 100644
--- a/tests/auto/qnetworkreply/test/test.pro
+++ b/tests/auto/qnetworkreply/test/test.pro
@@ -31,7 +31,7 @@ symbian:{
     DEPLOYMENT += certFiles
 
     # Symbian toolchain does not support correct include semantics
-    INCPATH+=..\..\..\..\include\QtNetwork\private
+    INCPATH+=..\\..\\..\\..\\include\\QtNetwork\\private
     # bigfile test case requires more heap
     TARGET.EPOCHEAPSIZE="0x100 0x1000000"
     TARGET.CAPABILITY="ALL -TCB"
diff --git a/tests/auto/qobject/tst_qobject.pro b/tests/auto/qobject/tst_qobject.pro
index 0200f3e..1d6993a 100644
--- a/tests/auto/qobject/tst_qobject.pro
+++ b/tests/auto/qobject/tst_qobject.pro
@@ -16,6 +16,6 @@ wince*: {
 }
 symbian: { 
     addFiles.sources = signalbug.exe
-    addFiles.path = \sys\bin
+    addFiles.path = \\sys\\bin
     DEPLOYMENT += addFiles
 }
diff --git a/tests/auto/qprocess/test/test.pro b/tests/auto/qprocess/test/test.pro
index e1afd22..d555067 100644
--- a/tests/auto/qprocess/test/test.pro
+++ b/tests/auto/qprocess/test/test.pro
@@ -118,7 +118,7 @@ symbian: {
         testProcessOutput.exe \
         nospace.exe \
         testSpaceInName.exe
-   binDep.path = \sys\bin
+   binDep.path = \\sys\\bin
 
    DEPLOYMENT += binDep
 }
diff --git a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
index cd5e6e7..62c0c87 100644
--- a/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
+++ b/tests/auto/qsocks5socketengine/qsocks5socketengine.pro
@@ -10,7 +10,7 @@ MOC_DIR=tmp
 QT = core network
 
 # Symbian toolchain does not support correct include semantics
-symbian:INCPATH+=..\..\..\include\QtNetwork\private
+symbian:INCPATH+=..\\..\\..\\include\\QtNetwork\\private
 symbian: TARGET.CAPABILITY = NetworkServices
 
 
diff --git a/tests/auto/solutions.pri b/tests/auto/solutions.pri
index bcffb64..5c069c5 100644
--- a/tests/auto/solutions.pri
+++ b/tests/auto/solutions.pri
@@ -7,10 +7,10 @@
 SOLUTIONBASEDIR = $$(SOLUTIONBASEDIR)
 
 # strip the trailing "..."
-# SOLUTIONBASEDIR ~= s/\.\.\.$//
+# SOLUTIONBASEDIR ~= s/\\.\\.\\.$//
 
 # replace \ with /
-# win32:SOLUTIONBASEDIR ~= s.\\./.g
+# win32:SOLUTIONBASEDIR ~= s.\\\\./.g
 
 isEmpty(SOLUTIONBASEDIR):DEFINES += QT_NO_SOLUTIONS
 
diff --git a/tests/auto/windowsmobile/test/test.pro b/tests/auto/windowsmobile/test/test.pro
index 61e275d..f3124a3 100644
--- a/tests/auto/windowsmobile/test/test.pro
+++ b/tests/auto/windowsmobile/test/test.pro
@@ -11,7 +11,7 @@ wincewm*: {
    addFiles.sources = $$OUT_PWD/../testQMenuBar/*.exe
                 
 
-   addFiles.path = "\Program Files\tst_windowsmobile"
+   addFiles.path = "\\Program Files\\tst_windowsmobile"
    DEPLOYMENT += addFiles
 }
 
diff --git a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro
index e0cd13a..fb1a0dd 100644
--- a/tools/assistant/lib/fulltextsearch/fulltextsearch.pro
+++ b/tools/assistant/lib/fulltextsearch/fulltextsearch.pro
@@ -46,5 +46,5 @@ win32-msvc.net | win32-msvc2* {
 
 # the following define could be set globally in case we need it elsewhere
 solaris* {
-    DEFINES += Q_SOLARIS_VERSION=$$system(uname -r | sed -e 's/5\.//')
+    DEFINES += Q_SOLARIS_VERSION=$$system(uname -r | sed -e 's/5\\.//')
 }
-- 
cgit v0.12


From 487c05895751985a695f117fd984d1ecfe7b1252 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Wed, 26 May 2010 14:06:27 +0200
Subject: escape quotes meant for the shell

---
 mkspecs/features/unix/separate_debug_info.prf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mkspecs/features/unix/separate_debug_info.prf b/mkspecs/features/unix/separate_debug_info.prf
index c675828..40d52cb 100644
--- a/mkspecs/features/unix/separate_debug_info.prf
+++ b/mkspecs/features/unix/separate_debug_info.prf
@@ -1,7 +1,7 @@
 
 !separate_debug_info_nocopy:!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) {
     QMAKE_SEPARATE_DEBUG_INFO = (test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; targ=`basename $(TARGET)`; $$QMAKE_OBJCOPY --only-keep-debug \"\$\$targ\" \"\$\$targ.debug\" && $$QMAKE_OBJCOPY --strip-debug \"\$\$targ\" && $$QMAKE_OBJCOPY --add-gnu-debuglink=\"\$\$targ.debug\" \"\$\$targ\" && chmod -x \"\$\$targ.debug\" ) ;
-    QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z "$(DESTDIR)" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/
+    QMAKE_INSTALL_SEPARATE_DEBUG_INFO = test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\" ; $(INSTALL_FILE) `basename $(TARGET)`.debug $(INSTALL_ROOT)/\$\$target_path/
 
     QMAKE_POST_LINK = $$QMAKE_SEPARATE_DEBUG_INFO $$QMAKE_POST_LINK
     silent:QMAKE_POST_LINK = @echo creating $@.debug && $$QMAKE_POST_LINK
-- 
cgit v0.12


From 8060094144d6104659b8ce3b88d6f8b1e53cfb59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao.abecasis@nokia.com>
Date: Wed, 26 May 2010 20:04:57 +0200
Subject: Fix regression in QVarLengthArray::operator=

There was a serious regression wherei, under certain conditions,
assignment would be treated as an append. This was due to poor tracking
of container invariants inside realloc.

From now on, after the allocation decision, s shall contain the number
of elements in the array to be kept. Deleting extra elements in the old
array needn't update this value. Instead, it needs to be updated once
and if new elements are created afterwards.

Auto-test greatly expanded to avoid future embarassments.

Task-number: QTBUG-10978
Reviewed-by: Olivier Goffart
Reviewed-by: Fabien Freling

Olivier reviewed the patch, Fabien the auto-test.
---
 src/corelib/tools/qvarlengtharray.h                |  15 +-
 tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp | 297 +++++++++++++++++++++
 2 files changed, 304 insertions(+), 8 deletions(-)

diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h
index aecb66e..a70488f 100644
--- a/src/corelib/tools/qvarlengtharray.h
+++ b/src/corelib/tools/qvarlengtharray.h
@@ -128,9 +128,9 @@ private:
     friend class QPodList<T, Prealloc>;
     void realloc(int size, int alloc);
 
-    int a;
-    int s;
-    T *ptr;
+    int a;      // capacity
+    int s;      // size
+    T *ptr;     // data
     union {
         // ### Qt 5: Use 'Prealloc * sizeof(T)' as array size
         char array[sizeof(qint64) * (((Prealloc * sizeof(T)) / sizeof(qint64)) + 1)];
@@ -193,8 +193,8 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a
     Q_ASSERT(aalloc >= asize);
     T *oldPtr = ptr;
     int osize = s;
-    // s = asize;
 
+    const int copySize = qMin(asize, osize);
     if (aalloc != a) {
         ptr = reinterpret_cast<T *>(qMalloc(aalloc * sizeof(T)));
         Q_CHECK_PTR(ptr);
@@ -205,7 +205,6 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a
             if (QTypeInfo<T>::isStatic) {
                 QT_TRY {
                     // copy all the old elements
-                    const int copySize = qMin(asize, osize);
                     while (s < copySize) {
                         new (ptr+s) T(*(oldPtr+s));
                         (oldPtr+s)->~T();
@@ -221,19 +220,19 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray<T, Prealloc>::realloc(int asize, int a
                     QT_RETHROW;
                 }
             } else {
-                qMemCopy(ptr, oldPtr, qMin(asize, osize) * sizeof(T));
+                qMemCopy(ptr, oldPtr, copySize * sizeof(T));
             }
         } else {
             ptr = oldPtr;
             return;
         }
     }
+    s = copySize;
 
     if (QTypeInfo<T>::isComplex) {
+        // destroy remaining old objects
         while (osize > asize)
             (oldPtr+(--osize))->~T();
-        if (!QTypeInfo<T>::isStatic)
-            s = osize;
     }
 
     if (oldPtr != reinterpret_cast<T *>(array) && oldPtr != ptr)
diff --git a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
index 1c43069..0b7dc13 100644
--- a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -63,6 +63,7 @@ private slots:
     void oldTests();
     void task214223();
     void QTBUG6718_resize();
+    void QTBUG10978_realloc();
 };
 
 int fooCtor = 0;
@@ -291,5 +292,301 @@ void tst_QVarLengthArray::QTBUG6718_resize()
     }
 }
 
+struct MyBase
+{
+    MyBase()
+        : data(this)
+        , isCopy(false)
+    {
+        ++liveCount;
+    }
+
+    MyBase(MyBase const &)
+        : data(this)
+        , isCopy(true)
+    {
+        ++copyCount;
+        ++liveCount;
+    }
+
+    MyBase & operator=(MyBase const &)
+    {
+        if (!isCopy) {
+            isCopy = true;
+            ++copyCount;
+        } else {
+            ++errorCount;
+        }
+
+        return *this;
+    }
+
+    ~MyBase()
+    {
+        if (isCopy) {
+            if (!copyCount)
+                ++errorCount;
+            else
+                --copyCount;
+        }
+
+        if (!liveCount)
+            ++errorCount;
+        else
+            --liveCount;
+    }
+
+    bool hasMoved() const
+    {
+        return this != data;
+    }
+
+protected:
+    MyBase const * const data;
+    bool isCopy;
+
+public:
+    static int errorCount;
+    static int liveCount;
+    static int copyCount;
+};
+
+int MyBase::errorCount = 0;
+int MyBase::liveCount = 0;
+int MyBase::copyCount = 0;
+
+struct MyPrimitive
+    : MyBase
+{
+    MyPrimitive()
+    {
+        ++errorCount;
+    }
+
+    ~MyPrimitive()
+    {
+        ++errorCount;
+    }
+
+    MyPrimitive(MyPrimitive const &other)
+        : MyBase(other)
+    {
+        ++errorCount;
+    }
+};
+
+Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE);
+
+struct MyMovable
+    : MyBase
+{
+};
+
+Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
+
+struct MyComplex
+    : MyBase
+{
+};
+
+Q_DECLARE_TYPEINFO(MyComplex, Q_COMPLEX_TYPE);
+
+
+bool QTBUG10978_proceed = true;
+
+template <class T, int PreAlloc>
+int countMoved(QVarLengthArray<T, PreAlloc> const &c)
+{
+    int result = 0;
+    for (int i = 0; i < c.size(); ++i)
+        if (c[i].hasMoved())
+            ++result;
+
+    return result;
+}
+
+template <class T>
+void QTBUG10978_test()
+{
+    QTBUG10978_proceed = false;
+
+    typedef QVarLengthArray<T, 16> Container;
+    enum {
+        isStatic = QTypeInfo<T>::isStatic,
+        isComplex = QTypeInfo<T>::isComplex,
+
+        isPrimitive = !isComplex && !isStatic,
+        isMovable = !isStatic
+    };
+
+    // Constructors
+    Container a;
+    QCOMPARE( MyBase::liveCount, 0 );
+    QCOMPARE( MyBase::copyCount, 0 );
+
+    QVERIFY( a.capacity() >= 16 );
+    QCOMPARE( a.size(), 0 );
+
+    Container b_real(8);
+    Container const &b = b_real;
+    QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 8 );
+    QCOMPARE( MyBase::copyCount, 0 );
+
+    QVERIFY( b.capacity() >= 16 );
+    QCOMPARE( b.size(), 8 );
+
+    // Assignment
+    a = b;
+    QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 16 );
+    QCOMPARE( MyBase::copyCount, isComplex ? 8 : 0 );
+    QVERIFY( a.capacity() >= 16 );
+    QCOMPARE( a.size(), 8 );
+
+    QVERIFY( b.capacity() >= 16 );
+    QCOMPARE( b.size(), 8 );
+
+    // append
+    a.append(b.data(), b.size());
+    QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 24 );
+    QCOMPARE( MyBase::copyCount, isComplex ? 16 : 0 );
+
+    QVERIFY( a.capacity() >= 16 );
+    QCOMPARE( a.size(), 16 );
+
+    QVERIFY( b.capacity() >= 16 );
+    QCOMPARE( b.size(), 8 );
+
+    // removeLast
+    a.removeLast();
+    QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 23 );
+    QCOMPARE( MyBase::copyCount, isComplex ? 15 : 0 );
+
+    QVERIFY( a.capacity() >= 16 );
+    QCOMPARE( a.size(), 15 );
+
+    QVERIFY( b.capacity() >= 16 );
+    QCOMPARE( b.size(), 8 );
+
+    // Movable types
+    const int capacity = a.capacity();
+    if (!isPrimitive)
+        QCOMPARE( countMoved(a), 0 );
+
+    // Reserve, no re-allocation
+    a.reserve(capacity);
+    if (!isPrimitive)
+        QCOMPARE( countMoved(a), 0 );
+    QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 23 );
+    QCOMPARE( MyBase::copyCount, isComplex ? 15 : 0 );
+
+    QCOMPARE( a.capacity(), capacity );
+    QCOMPARE( a.size(), 15 );
+
+    QVERIFY( b.capacity() >= 16 );
+    QCOMPARE( b.size(), 8 );
+
+    // Reserve, force re-allocation
+    a.reserve(capacity * 2);
+    if (!isPrimitive)
+        QCOMPARE( countMoved(a), isMovable ? 15 : 0 );
+    QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 23 );
+    QCOMPARE( MyBase::copyCount, isComplex ? 15 : 0 );
+
+    QVERIFY( a.capacity() >= capacity * 2 );
+    QCOMPARE( a.size(), 15 );
+
+    QVERIFY( b.capacity() >= 16 );
+    QCOMPARE( b.size(), 8 );
+
+    // resize, grow
+    a.resize(40);
+    if (!isPrimitive)
+        QCOMPARE( countMoved(a), isMovable ? 15 : 0 );
+    QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 48 );
+    QCOMPARE( MyBase::copyCount, isComplex ? 15 : 0 );
+
+    QVERIFY( a.capacity() >= a.size() );
+    QCOMPARE( a.size(), 40 );
+
+    QVERIFY( b.capacity() >= 16 );
+    QCOMPARE( b.size(), 8 );
+
+    // Copy constructor, allocate
+    {
+        Container c(a);
+        if (!isPrimitive)
+            QCOMPARE( countMoved(c), 0 );
+        QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 88 );
+        QCOMPARE( MyBase::copyCount, isComplex ? 55 : 0 );
+
+        QVERIFY( a.capacity() >= a.size() );
+        QCOMPARE( a.size(), 40 );
+
+        QVERIFY( b.capacity() >= 16 );
+        QCOMPARE( b.size(), 8 );
+
+        QVERIFY( c.capacity() >= 40 );
+        QCOMPARE( c.size(), 40 );
+    }
+
+    // resize, shrink
+    a.resize(10);
+    if (!isPrimitive)
+        QCOMPARE( countMoved(a), isMovable ? 10 : 0 );
+    QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 18 );
+    QCOMPARE( MyBase::copyCount, isComplex ? 10 : 0 );
+
+    QVERIFY( a.capacity() >= a.size() );
+    QCOMPARE( a.size(), 10 );
+
+    QVERIFY( b.capacity() >= 16 );
+    QCOMPARE( b.size(), 8 );
+
+    // Copy constructor, don't allocate
+    {
+        Container c(a);
+        if (!isPrimitive)
+            QCOMPARE( countMoved(c), 0 );
+        QCOMPARE( MyBase::liveCount, isPrimitive ? 0 : 28 );
+        QCOMPARE( MyBase::copyCount, isComplex ? 20 : 0 );
+
+        QVERIFY( a.capacity() >= a.size() );
+        QCOMPARE( a.size(), 10 );
+
+        QVERIFY( b.capacity() >= 16 );
+        QCOMPARE( b.size(), 8 );
+
+        QVERIFY( c.capacity() >= 16 );
+        QCOMPARE( c.size(), 10 );
+    }
+
+    a.clear();
+    QCOMPARE( a.size(), 0 );
+
+    b_real.clear();
+    QCOMPARE( b.size(), 0 );
+
+    QCOMPARE(MyBase::errorCount, 0);
+    QCOMPARE(MyBase::liveCount, 0);
+
+    // All done
+    QTBUG10978_proceed = true;
+}
+
+void tst_QVarLengthArray::QTBUG10978_realloc()
+{
+    QTBUG10978_test<MyBase>();
+    QVERIFY(QTBUG10978_proceed);
+
+    QTBUG10978_test<MyPrimitive>();
+    QVERIFY(QTBUG10978_proceed);
+
+    QTBUG10978_test<MyMovable>();
+    QVERIFY(QTBUG10978_proceed);
+
+    QTBUG10978_test<MyComplex>();
+    QVERIFY(QTBUG10978_proceed);
+}
+
 QTEST_APPLESS_MAIN(tst_QVarLengthArray)
 #include "tst_qvarlengtharray.moc"
-- 
cgit v0.12


From 7249e71c722739f35641df35c70a1a5fc5e24a41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Abecasis?= <joao.abecasis@nokia.com>
Date: Thu, 27 May 2010 00:39:48 +0200
Subject: Allow auto-test to compile when using namespaces

Auto-test added in 8060094144d6104659b8ce3b88d6f8b1e53cfb59 does not
compile when using Qt in namespace, because Q_DECLARE_TYPEINFO needs to
be used from inside QT_NAMESPACE.

Wrapper macros added.

Task-number: QTBUG-10978
---
 tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp b/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
index 0b7dc13..39805e1 100644
--- a/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
+++ b/tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp
@@ -375,22 +375,23 @@ struct MyPrimitive
     }
 };
 
-Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE);
-
 struct MyMovable
     : MyBase
 {
 };
 
-Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
-
 struct MyComplex
     : MyBase
 {
 };
 
+QT_BEGIN_NAMESPACE
+
+Q_DECLARE_TYPEINFO(MyPrimitive, Q_PRIMITIVE_TYPE);
+Q_DECLARE_TYPEINFO(MyMovable, Q_MOVABLE_TYPE);
 Q_DECLARE_TYPEINFO(MyComplex, Q_COMPLEX_TYPE);
 
+QT_END_NAMESPACE
 
 bool QTBUG10978_proceed = true;
 
-- 
cgit v0.12


From 7cc8e62f74f66f20c216a8bc8c3187c989a3dcb4 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Thu, 27 May 2010 09:08:14 +0200
Subject: Optimize initialization of QStaticText

Since QStaticText would be created once and used often, not much thought
was put into optimizing its initialization. For simplicity, the code
would do two drawText() passes. Since this was an unnecessary overhead,
the extra pass has been removed and replaced by memmoves instead.
Initialization is now twice as fast.

Reviewed-by: Samuel
---
 src/gui/text/qstatictext.cpp | 163 +++++++++++++++++++++++--------------------
 src/gui/text/qstatictext_p.h |  19 +++--
 2 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index c7817c6..2889a96 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -363,23 +363,24 @@ QSizeF QStaticText::size() const
 }
 
 QStaticTextPrivate::QStaticTextPrivate()
-        : textWidth(-1.0), items(0), itemCount(0), glyphPool(0), positionPool(0),
+        : textWidth(-1.0), items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0),
           needsRelayout(true), useBackendOptimizations(false), textFormat(Qt::AutoText)
 {
 }
 
 QStaticTextPrivate::QStaticTextPrivate(const QStaticTextPrivate &other)
     : text(other.text), font(other.font), textWidth(other.textWidth), matrix(other.matrix),
-      items(0), itemCount(0), glyphPool(0), positionPool(0), needsRelayout(true),
+      items(0), itemCount(0), glyphPool(0), positionPool(0), charPool(0), needsRelayout(true),
       useBackendOptimizations(other.useBackendOptimizations), textFormat(other.textFormat)
 {
 }
 
 QStaticTextPrivate::~QStaticTextPrivate()
 {
-    delete[] items;    
+    delete[] items;
     delete[] glyphPool;
     delete[] positionPool;
+    delete[] charPool;
 }
 
 QStaticTextPrivate *QStaticTextPrivate::get(const QStaticText *q)
@@ -395,15 +396,8 @@ namespace {
     class DrawTextItemRecorder: public QPaintEngine
     {
     public:
-        DrawTextItemRecorder(int expectedItemCount, QStaticTextItem *items,
-                             int expectedGlyphCount, QFixedPoint *positionPool, glyph_t *glyphPool)
-                : m_items(items),
-                  m_itemCount(0), m_glyphCount(0),
-                  m_expectedItemCount(expectedItemCount),
-                  m_expectedGlyphCount(expectedGlyphCount),
-                  m_glyphPool(glyphPool),
-                  m_positionPool(positionPool),
-                  m_dirtyPen(false)
+        DrawTextItemRecorder(bool useBackendOptimizations, int numChars)
+                : m_dirtyPen(false), m_useBackendOptimizations(useBackendOptimizations)
         {
         }
 
@@ -415,26 +409,19 @@ namespace {
 
         virtual void drawTextItem(const QPointF &position, const QTextItem &textItem)
         {
-            const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);          
-
-            m_itemCount++;
-            m_glyphCount += ti.glyphs.numGlyphs;
-            if (m_items == 0)
-                return;
-
-            Q_ASSERT(m_itemCount <= m_expectedItemCount);
-            Q_ASSERT(m_glyphCount <= m_expectedGlyphCount);
-
-            QStaticTextItem *currentItem = (m_items + (m_itemCount - 1));
-            currentItem->fontEngine = ti.fontEngine;
-            currentItem->font = ti.font();
-            currentItem->chars = ti.chars;
-            currentItem->numChars = ti.num_chars;
-            currentItem->numGlyphs = ti.glyphs.numGlyphs;
-            currentItem->glyphs = m_glyphPool;
-            currentItem->glyphPositions = m_positionPool;
+            const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem);
+
+            QStaticTextItem currentItem;
+            currentItem.fontEngine = ti.fontEngine;
+            currentItem.font = ti.font();
+            currentItem.charOffset = m_chars.size();
+            currentItem.numChars = ti.num_chars;
+            currentItem.numGlyphs = ti.glyphs.numGlyphs;
+            currentItem.glyphOffset = m_glyphs.size(); // Store offset into glyph pool
+            currentItem.positionOffset = m_glyphs.size(); // Offset into position pool
+            currentItem.useBackendOptimizations = m_useBackendOptimizations;
             if (m_dirtyPen)
-                currentItem->color = state->pen().color();
+                currentItem.color = state->pen().color();
 
             QTransform matrix = state->transform();
             matrix.translate(position.x(), position.y());
@@ -447,13 +434,21 @@ namespace {
             Q_ASSERT(size == ti.glyphs.numGlyphs);
             Q_ASSERT(size == positions.size());
 
-            memmove(currentItem->glyphs, glyphs.constData(), sizeof(glyph_t) * size);
-            memmove(currentItem->glyphPositions, positions.constData(), sizeof(QFixedPoint) * size);
+            m_glyphs.resize(m_glyphs.size() + size);
+            m_positions.resize(m_glyphs.size());
+            m_chars.resize(m_chars.size() + ti.num_chars);
 
-            m_glyphPool += size;
-            m_positionPool += size;
-        }                
+            glyph_t *glyphsDestination = m_glyphs.data() + currentItem.glyphOffset;
+            memmove(glyphsDestination, glyphs.constData(), sizeof(glyph_t) * currentItem.numGlyphs);
 
+            QFixedPoint *positionsDestination = m_positions.data() + currentItem.positionOffset;
+            memmove(positionsDestination, positions.constData(), sizeof(QFixedPoint) * currentItem.numGlyphs);
+
+            QChar *charsDestination = m_chars.data() + currentItem.charOffset;
+            memmove(charsDestination, ti.chars, sizeof(QChar) * currentItem.numChars);
+
+            m_items.append(currentItem);
+        }                
 
         virtual bool begin(QPaintDevice *)  { return true; }
         virtual bool end() { return true; }
@@ -463,38 +458,42 @@ namespace {
             return User;
         }
 
-        int itemCount() const
+        QVector<QStaticTextItem> items() const
         {
-            return m_itemCount;
+            return m_items;
         }
 
-        int glyphCount() const
+        QVector<QFixedPoint> positions() const
         {
-            return m_glyphCount;
+            return m_positions;
         }
 
-    private:
-        QStaticTextItem *m_items;
-        int m_itemCount;
-        int m_glyphCount;
-        int m_expectedItemCount;
-        int m_expectedGlyphCount;
+        QVector<glyph_t> glyphs() const
+        {
+            return m_glyphs;
+        }
+
+        QVector<QChar> chars() const
+        {
+            return m_chars;
+        }
 
-        glyph_t *m_glyphPool;
-        QFixedPoint *m_positionPool;
+    private:
+        QVector<QStaticTextItem> m_items;
+        QVector<QFixedPoint> m_positions;
+        QVector<glyph_t> m_glyphs;
+        QVector<QChar> m_chars;
 
         bool m_dirtyPen;
+        bool m_useBackendOptimizations;
     };
 
     class DrawTextItemDevice: public QPaintDevice
     {
     public:
-        DrawTextItemDevice(int expectedItemCount = -1,  QStaticTextItem *items = 0,
-                           int expectedGlyphCount = -1, QFixedPoint *positionPool = 0,
-                           glyph_t *glyphPool = 0)
+        DrawTextItemDevice(bool useBackendOptimizations, int numChars)
         {
-            m_paintEngine = new DrawTextItemRecorder(expectedItemCount, items,
-                                                     expectedGlyphCount, positionPool, glyphPool);
+            m_paintEngine = new DrawTextItemRecorder(useBackendOptimizations, numChars);
         }
 
         ~DrawTextItemDevice()
@@ -538,14 +537,24 @@ namespace {
             return m_paintEngine;
         }
 
-        int itemCount() const
+        QVector<glyph_t> glyphs() const
         {
-            return m_paintEngine->itemCount();
+            return m_paintEngine->glyphs();
         }
 
-        int glyphCount() const
+        QVector<QFixedPoint> positions() const
         {
-            return m_paintEngine->glyphCount();
+            return m_paintEngine->positions();
+        }
+
+        QVector<QStaticTextItem> items() const
+        {
+            return m_paintEngine->items();
+        }
+
+        QVector<QChar> chars() const
+        {
+            return m_paintEngine->chars();
         }
 
     private:
@@ -616,42 +625,42 @@ void QStaticTextPrivate::init()
     delete[] items;
     delete[] glyphPool;
     delete[] positionPool;
+    delete[] charPool;
 
     position = QPointF(0, 0);
 
-    // Draw once to count number of items and glyphs, so that we can use as little memory
-    // as possible to store the data
-    DrawTextItemDevice counterDevice;
+    DrawTextItemDevice device(useBackendOptimizations, text.size());
     {
-        QPainter painter(&counterDevice);
+        QPainter painter(&device);
         painter.setFont(font);
         painter.setTransform(matrix);
 
         paintText(QPointF(0, 0), &painter);
-
     }
 
-    itemCount = counterDevice.itemCount();    
+    QVector<QStaticTextItem> deviceItems = device.items();
+    QVector<QFixedPoint> positions = device.positions();
+    QVector<glyph_t> glyphs = device.glyphs();
+    QVector<QChar> chars = device.chars();
+
+    itemCount = deviceItems.size();
     items = new QStaticTextItem[itemCount];
 
-    if (useBackendOptimizations) {
-        for (int i=0; i<itemCount; ++i)
-            items[i].useBackendOptimizations = true;
-    }
+    glyphPool = new glyph_t[glyphs.size()];
+    memmove(glyphPool, glyphs.constData(), glyphs.size() * sizeof(glyph_t));
 
+    positionPool = new QFixedPoint[positions.size()];
+    memmove(positionPool, positions.constData(), positions.size() * sizeof(QFixedPoint));
 
-    int glyphCount = counterDevice.glyphCount();
-    glyphPool = new glyph_t[glyphCount];
-    positionPool = new QFixedPoint[glyphCount];
+    charPool = new QChar[chars.size()];
+    memmove(charPool, chars.constData(), chars.size() * sizeof(QChar));
 
-    // Draw again to actually record the items and glyphs
-    DrawTextItemDevice recorderDevice(itemCount, items, glyphCount, positionPool, glyphPool);
-    {
-        QPainter painter(&recorderDevice);
-        painter.setFont(font);
-        painter.setTransform(matrix);
+    for (int i=0; i<itemCount; ++i) {
+        items[i] = deviceItems.at(i);
 
-        paintText(QPointF(0, 0), &painter);
+        items[i].glyphs = glyphPool + items[i].glyphOffset;
+        items[i].glyphPositions = positionPool + items[i].positionOffset;
+        items[i].chars = charPool + items[i].charOffset;
     }
 
     needsRelayout = false;
diff --git a/src/gui/text/qstatictext_p.h b/src/gui/text/qstatictext_p.h
index f017ed1..2ab5579 100644
--- a/src/gui/text/qstatictext_p.h
+++ b/src/gui/text/qstatictext_p.h
@@ -88,9 +88,18 @@ public:
         userData = newUserData;
     }
 
-    QFixedPoint *glyphPositions;                 // 8 bytes per glyph
-    glyph_t *glyphs;                             // 4 bytes per glyph
-    const QChar *chars;                          // 2 bytes per glyph
+    union {
+        QFixedPoint *glyphPositions;             // 8 bytes per glyph
+        int positionOffset;
+    };
+    union {
+        glyph_t *glyphs;                         // 4 bytes per glyph
+        int glyphOffset;
+    };
+    union {
+        QChar *chars;                            // 2 bytes per glyph
+        int charOffset;
+    };
                                                  // =================
                                                  // 14 bytes per glyph
 
@@ -134,14 +143,16 @@ public:
     QTransform matrix;                   // 80 bytes per text
     QStaticTextItem *items;              // 4 bytes per text
     int itemCount;                       // 4 bytes per text
+
     glyph_t *glyphPool;                  // 4 bytes per text
     QFixedPoint *positionPool;           // 4 bytes per text
+    QChar *charPool;                     // 4 bytes per text
 
     unsigned char needsRelayout : 1;
     unsigned char useBackendOptimizations : 1; // 1 byte per text
     unsigned char textFormat              : 2;
                                          // ================
-                                         // 163 bytes per text
+                                         // 167 bytes per text
 
     static QStaticTextPrivate *get(const QStaticText *q);
 };
-- 
cgit v0.12


From 3de02411c14eb0cb57bc000cee06e90fe510c619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <sroedal@trolltech.com>
Date: Thu, 27 May 2010 09:52:25 +0200
Subject: Fixed compilation of QtOpenGL.

Reviewed-by: Eskil
---
 src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp | 2 +-
 src/opengl/qpaintengine_opengl.cpp                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 4461358..5758b25 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1401,7 +1401,7 @@ void QGL2PaintEngineEx::drawTextItem(const QPointF &p, const QTextItem &textItem
 
         {
             QStaticTextItem staticTextItem;
-            staticTextItem.chars = ti.chars;
+            staticTextItem.chars = const_cast<QChar *>(ti.chars);
             staticTextItem.fontEngine = ti.fontEngine;
             staticTextItem.glyphs = glyphs.data();
             staticTextItem.numChars = ti.num_chars;
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index 28d37bc..12c487d 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -4999,7 +4999,7 @@ void QOpenGLPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte
 
     {
         QStaticTextItem staticTextItem;
-        staticTextItem.chars = ti.chars;
+        staticTextItem.chars = const_cast<QChar *>(ti.chars);
         staticTextItem.fontEngine = ti.fontEngine;
         staticTextItem.glyphs = glyphs.data();
         staticTextItem.numChars = ti.num_chars;
-- 
cgit v0.12


From 1f40fe507e6b6c74144cbb998cc91f88f9e33168 Mon Sep 17 00:00:00 2001
From: Kent Hansen <kent.hansen@nokia.com>
Date: Wed, 26 May 2010 15:11:34 +0200
Subject: Ensure that activation object has been created before popping scope
 of native context

One shouldn't have to call activationObject() or scopeChain() before
calling popScope(); the scope chain should always have 2 items (activation
and global object) before we start popping anything from the internal chain.

Task-number: QTBUG-11020
Reviewed-by: Olivier Goffart
---
 src/script/api/qscriptcontext.cpp                |  1 +
 tests/auto/qscriptcontext/tst_qscriptcontext.cpp | 45 ++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp
index 639af80..3f08e74 100644
--- a/src/script/api/qscriptcontext.cpp
+++ b/src/script/api/qscriptcontext.cpp
@@ -742,6 +742,7 @@ void QScriptContext::pushScope(const QScriptValue &object)
 */
 QScriptValue QScriptContext::popScope()
 {
+    activationObject(); //ensure the creation of the normal scope for native context
     JSC::CallFrame *frame = QScriptEnginePrivate::frameForContext(this);
     JSC::ScopeChainNode *scope = frame->scopeChain();
     Q_ASSERT(scope != 0);
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index 100e195..617c183 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -84,6 +84,7 @@ private slots:
     void jsActivationObject();
     void qobjectAsActivationObject();
     void parentContextCallee_QT2270();
+    void popNativeContextScope();
 };
 
 tst_QScriptContext::tst_QScriptContext()
@@ -539,6 +540,50 @@ void tst_QScriptContext::pushAndPopContext()
     }
 }
 
+void tst_QScriptContext::popNativeContextScope()
+{
+    QScriptEngine eng;
+    QScriptContext *ctx = eng.pushContext();
+    QVERIFY(ctx->popScope().isObject()); // the activation object
+
+    QCOMPARE(ctx->scopeChain().size(), 1);
+    QVERIFY(ctx->scopeChain().at(0).strictlyEquals(eng.globalObject()));
+    // This was different in 4.5: scope and activation were decoupled
+    QVERIFY(ctx->activationObject().strictlyEquals(eng.globalObject()));
+
+    QVERIFY(!eng.evaluate("var foo = 123; function bar() {}").isError());
+    QVERIFY(eng.globalObject().property("foo").isNumber());
+    QVERIFY(eng.globalObject().property("bar").isFunction());
+
+    QScriptValue customScope = eng.newObject();
+    ctx->pushScope(customScope);
+    QCOMPARE(ctx->scopeChain().size(), 2);
+    QVERIFY(ctx->scopeChain().at(0).strictlyEquals(customScope));
+    QVERIFY(ctx->scopeChain().at(1).strictlyEquals(eng.globalObject()));
+    QVERIFY(ctx->activationObject().strictlyEquals(eng.globalObject()));
+    ctx->setActivationObject(customScope);
+    QVERIFY(ctx->activationObject().strictlyEquals(customScope));
+    QCOMPARE(ctx->scopeChain().size(), 2);
+    QVERIFY(ctx->scopeChain().at(0).strictlyEquals(customScope));
+    QEXPECT_FAIL("", "QTBUG-11012", Continue);
+    QVERIFY(ctx->scopeChain().at(1).strictlyEquals(eng.globalObject()));
+
+    QVERIFY(!eng.evaluate("baz = 456; var foo = 789; function barbar() {}").isError());
+    QEXPECT_FAIL("", "QTBUG-11012", Continue);
+    QVERIFY(eng.globalObject().property("baz").isNumber());
+    QVERIFY(customScope.property("foo").isNumber());
+    QVERIFY(customScope.property("barbar").isFunction());
+
+    QVERIFY(ctx->popScope().strictlyEquals(customScope));
+    QCOMPARE(ctx->scopeChain().size(), 1);
+    QEXPECT_FAIL("", "QTBUG-11012", Continue);
+    QVERIFY(ctx->scopeChain().at(0).strictlyEquals(eng.globalObject()));
+
+    // Need to push another object, otherwise we crash in popContext() (QTBUG-11012)
+    ctx->pushScope(customScope);
+    eng.popContext();
+}
+
 void tst_QScriptContext::lineNumber()
 {
     QScriptEngine eng;
-- 
cgit v0.12


From ea68e4ddcf903bde74ded9d588a09863491d1d56 Mon Sep 17 00:00:00 2001
From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Date: Thu, 27 May 2010 10:28:52 +0200
Subject: Replace memmove with memcpy

qMemCopy is faster than memmove, and there's no chance of overlapping
source and destination memory in these cases.

Reviewed-by: Samuel
---
 src/gui/text/qstatictext.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp
index 2889a96..84c1d96 100644
--- a/src/gui/text/qstatictext.cpp
+++ b/src/gui/text/qstatictext.cpp
@@ -439,13 +439,13 @@ namespace {
             m_chars.resize(m_chars.size() + ti.num_chars);
 
             glyph_t *glyphsDestination = m_glyphs.data() + currentItem.glyphOffset;
-            memmove(glyphsDestination, glyphs.constData(), sizeof(glyph_t) * currentItem.numGlyphs);
+            qMemCopy(glyphsDestination, glyphs.constData(), sizeof(glyph_t) * currentItem.numGlyphs);
 
             QFixedPoint *positionsDestination = m_positions.data() + currentItem.positionOffset;
-            memmove(positionsDestination, positions.constData(), sizeof(QFixedPoint) * currentItem.numGlyphs);
+            qMemCopy(positionsDestination, positions.constData(), sizeof(QFixedPoint) * currentItem.numGlyphs);
 
             QChar *charsDestination = m_chars.data() + currentItem.charOffset;
-            memmove(charsDestination, ti.chars, sizeof(QChar) * currentItem.numChars);
+            qMemCopy(charsDestination, ti.chars, sizeof(QChar) * currentItem.numChars);
 
             m_items.append(currentItem);
         }                
@@ -647,13 +647,13 @@ void QStaticTextPrivate::init()
     items = new QStaticTextItem[itemCount];
 
     glyphPool = new glyph_t[glyphs.size()];
-    memmove(glyphPool, glyphs.constData(), glyphs.size() * sizeof(glyph_t));
+    qMemCopy(glyphPool, glyphs.constData(), glyphs.size() * sizeof(glyph_t));
 
     positionPool = new QFixedPoint[positions.size()];
-    memmove(positionPool, positions.constData(), positions.size() * sizeof(QFixedPoint));
+    qMemCopy(positionPool, positions.constData(), positions.size() * sizeof(QFixedPoint));
 
     charPool = new QChar[chars.size()];
-    memmove(charPool, chars.constData(), chars.size() * sizeof(QChar));
+    qMemCopy(charPool, chars.constData(), chars.size() * sizeof(QChar));
 
     for (int i=0; i<itemCount; ++i) {
         items[i] = deviceItems.at(i);
-- 
cgit v0.12


From a38cb0dbec7238903c62e8a08ecd6faecb58e9b2 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Thu, 27 May 2010 10:40:23 +0200
Subject: Fix compilation for tst_qtextcodec with QT_NO_CONCURRENT defined.

---
 tests/auto/qtextcodec/tst_qtextcodec.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index aa97e87..149efae 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -1938,6 +1938,7 @@ static int loadAndConvertMIB(int mib)
 
 void tst_QTextCodec::threadSafety()
 {
+#ifndef QT_NO_CONCURRENT
     QThreadPool::globalInstance()->setMaxThreadCount(12);
 
     QList<QByteArray> codecList = QTextCodec::availableCodecs();
@@ -1948,6 +1949,9 @@ void tst_QTextCodec::threadSafety()
 
     QCOMPARE(res.results(), codecList);
     QCOMPARE(res2.results(), mibList);
+#else
+    QSKIP("This function is not yet supported with QT_NO_CONCURRENT defined.", SkipAll);
+#endif
 }
 
 QTEST_MAIN(tst_QTextCodec)
-- 
cgit v0.12


From fe824f6175ebbeb1940872275b31f9894d056ad0 Mon Sep 17 00:00:00 2001
From: Denis Dzyubenko <denis.dzyubenko@nokia.com>
Date: Wed, 26 May 2010 16:09:49 +0200
Subject: Added support for Indonesian language on Symbian.

We have support for ELangIndonesian, but we also need to support new
ELangIndonesian_Apac which has appeared in Symbian^3.

Task-number: QT-3369
Reviewed-by: trustme
---
 src/corelib/tools/qlocale_symbian.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index 1e674af..458bb2a 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -159,8 +159,9 @@ static const symbianToISO symbian_to_iso_list[] = {
     { ELangEnglish_Prc,         "en_CN" },  // 159 ### Not supported by CLDR
     { ELangEnglish_Japan,       "en_JP"},   // 160 ### Not supported by CLDR
     { ELangEnglish_Thailand,    "en_TH" },  // 161 ### Not supported by CLDR
-    { ELangMalay_Apac,          "ms" }      // 326
+    { ELangMalay_Apac,          "ms" },     // 326
 #endif
+    { 327/*ELangIndonesian_Apac*/,"id_ID" } // 327 - appeared in Symbian^3
 };
 
 /*!
-- 
cgit v0.12


From ddf119a57001edd71eb6b84dffc7cda4a8ca2c0e Mon Sep 17 00:00:00 2001
From: Anders Bakken <agbakken@gmail.com>
Date: Thu, 27 May 2010 10:50:40 +0200
Subject: Fix a bug in QDirectFBPixmapData::fromImage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Every image that was converted with flags & Qt::NoOpaqueDetection would
be considered to have an alpha channel. This patch fixes that and
simplifies the code a little.

Merge-request: 637
Reviewed-by: Samuel Rødal <sroedal@trolltech.com>
---
 .../gfxdrivers/directfb/qdirectfbpixmap.cpp        | 25 +++++++++-------------
 src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h  |  2 +-
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index 80366d1..f704432 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -91,6 +91,7 @@ void QDirectFBPixmapData::resize(int width, int height)
     setSerialNumber(++global_ser_no);
 }
 
+#ifdef QT_DIRECTFB_OPAQUE_DETECTION
 // mostly duplicated from qimage.cpp (QImageData::checkForAlphaPixels)
 static bool checkForAlphaPixels(const QImage &img)
 {
@@ -160,12 +161,16 @@ static bool checkForAlphaPixels(const QImage &img)
 
     return false;
 }
+#endif // QT_DIRECTFB_OPAQUE_DETECTION
 
-bool QDirectFBPixmapData::hasAlphaChannel(const QImage &img)
+bool QDirectFBPixmapData::hasAlphaChannel(const QImage &img, Qt::ImageConversionFlags flags)
 {
-#ifndef QT_NO_DIRECTFB_OPAQUE_DETECTION
-    return checkForAlphaPixels(img);
+    if (img.depth() == 1)
+        return true;
+#ifdef QT_DIRECTFB_OPAQUE_DETECTION
+    return ((flags & Qt::NoOpaqueDetection) ? img.hasAlphaChannel() : checkForAlphaPixels(img));
 #else
+    Q_UNUSED(flags);
     return img.hasAlphaChannel();
 #endif
 }
@@ -287,19 +292,9 @@ bool QDirectFBPixmapData::fromDataBufferDescription(const DFBDataBufferDescripti
 
 #endif
 
-void QDirectFBPixmapData::fromImage(const QImage &img,
-                                    Qt::ImageConversionFlags flags)
+void QDirectFBPixmapData::fromImage(const QImage &img, Qt::ImageConversionFlags flags)
 {
-    if (img.depth() == 1) {
-        alpha = true;
-#ifndef QT_NO_DIRECTFB_OPAQUE_DETECTION
-    } else if (flags & Qt::NoOpaqueDetection || QDirectFBPixmapData::hasAlphaChannel(img)) {
-        alpha = true;
-#else
-    } else if (img.hasAlphaChannel()) {
-        alpha = true;
-#endif
-    }
+    alpha = QDirectFBPixmapData::hasAlphaChannel(img, flags);
     imageFormat = alpha ? screen->alphaPixmapFormat() : screen->pixelFormat();
     QImage image;
     if ((flags & ~Qt::NoOpaqueDetection) != Qt::AutoColor) {
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
index da6edc6..343b26e 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.h
@@ -86,8 +86,8 @@ public:
     virtual int metric(QPaintDevice::PaintDeviceMetric m) const { return QDirectFBPaintDevice::metric(m); }
 
     inline QImage::Format pixelFormat() const { return imageFormat; }
-    static bool hasAlphaChannel(const QImage &img);
     inline bool hasAlphaChannel() const { return alpha; }
+    static bool hasAlphaChannel(const QImage &img, Qt::ImageConversionFlags flags = Qt::AutoColor);
 private:
 #ifdef QT_DIRECTFB_IMAGEPROVIDER
     bool fromDataBufferDescription(const DFBDataBufferDescription &dataBuffer);
-- 
cgit v0.12


From 6a650220f6cf3159bcce3f754e94ea5241c67ea4 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Thu, 27 May 2010 10:53:11 +0200
Subject: Added some changes for 4.6.3

---
 dist/changes-4.6.3 | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3
index a332580..3695f14 100644
--- a/dist/changes-4.6.3
+++ b/dist/changes-4.6.3
@@ -47,6 +47,10 @@ QtCore
 QtGui
 -----
 
+ - QComboBox
+    * [QTBUG-10403] Fixed QComboBox ignoring the item data background role 
+      for some styles.
+
  - QCommonStyle
     * [QTBUG-7137] Fixed a bug that led to missing text pixels in QTabBar when
       using small font sizes.
@@ -217,6 +221,15 @@ Qt for Linux/X11
  - [QTBUG-7063] Changed key bindings (XF86XK_MyComputer, Qt::Key_Launch0,
    Key_Calculator) on X11 back to how it was in Qt 4.5 before MR 1742
    accidentally changed it.
+ - [QTBUG-8666] Fixed a crash when using QIcon::fromTheme with icons declared 
+   static.
+ - QGtkStyle
+   * [QTBUG-9240] Fixed a potensial crash in QGtkStyle when the gtk 
+     theme engine is not unavaliable. 
+   * [QTBUG-8537] Fixed a Glib-GObject-WARNING on application startup with
+     certain versions of GTK+.
+   * [QTBUG-8226] Fixed an atk_object_set_name assertion warning with certain
+     versions of GTK+.
 
 Qt for Windows
 --------------
@@ -229,6 +242,11 @@ Qt for Windows
     * [QTBUG-9681] Fixed closing state for local sockets with unwritten data.
     * [QTBUG-8418] Detection of Windows Mobile 6.5 fixed.
 
+ - [QTBUG-7662] Fixed an issue with clipped icon text.
+ - [QTBUG-7663] QFileIconProvider now show overlays when fetching native 
+   filesystem icons.
+ - [QTBUG-8324] Fixed a potential crash when fetching native icons.
+
 Qt for Windows CE
 -----------------
 
@@ -242,6 +260,12 @@ Qt for Windows CE
      Windows Mobile 6.5.
    * [QTBUG-8757] QTabBar scroll button size has been fixed.
 
+Qt for Mac
+-----------------
+
+ - [QTBUG-8461] Fixed incorrect text rendering with document mode tabs.
+
+
 Qt for Symbian
 --------------
 
-- 
cgit v0.12


From bc5e4da28c1ffbc0da1cbfcaa1e6236ff4c2d4e3 Mon Sep 17 00:00:00 2001
From: Jens Bache-Wiig <jbache@trolltech.com>
Date: Thu, 27 May 2010 12:15:54 +0200
Subject: Fixed a crash when creating QGtkStyle before QApplication

Task-number: QTBUG-10758
Reviewed-by: ogoffart
---
 src/gui/styles/qgtkstyle.cpp   | 2 ++
 src/gui/styles/qgtkstyle_p.cpp | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp
index 6c8d561..9d6dc9a 100644
--- a/src/gui/styles/qgtkstyle.cpp
+++ b/src/gui/styles/qgtkstyle.cpp
@@ -325,6 +325,7 @@ void QGtkStyle::polish(QApplication *app)
             qt_filedialog_save_filename_hook = &QGtkStylePrivate::saveFilename;
             qt_filedialog_open_filenames_hook = &QGtkStylePrivate::openFilenames;
             qt_filedialog_existing_directory_hook = &QGtkStylePrivate::openDirectory;
+            qApp->installEventFilter(&d->filter);
         }
     }
 }
@@ -345,6 +346,7 @@ void QGtkStyle::unpolish(QApplication *app)
         qt_filedialog_save_filename_hook = 0;
         qt_filedialog_open_filenames_hook = 0;
         qt_filedialog_existing_directory_hook = 0;
+        qApp->removeEventFilter(&d->filter);
     }
 }
 
diff --git a/src/gui/styles/qgtkstyle_p.cpp b/src/gui/styles/qgtkstyle_p.cpp
index 3c6a1ef..4ed0fab 100644
--- a/src/gui/styles/qgtkstyle_p.cpp
+++ b/src/gui/styles/qgtkstyle_p.cpp
@@ -285,8 +285,6 @@ void QGtkStylePrivate::init()
 {
     resolveGtk();
     initGtkWidgets();
-    if (isThemeAvailable())
-        qApp->installEventFilter(&filter);
 }
 
 GtkWidget* QGtkStylePrivate::gtkWidget(const QHashableLatin1Literal &path)
-- 
cgit v0.12


From 975dbe047590253e9d4433030d76ab26969f621f Mon Sep 17 00:00:00 2001
From: "Bradley T. Hughes" <bradley.hughes@nokia.com>
Date: Thu, 27 May 2010 13:37:58 +0200
Subject: Update documentation for the -font command line option

This option is ignored when Qt is built with fontconfig support, make
sure it is documented.

Task-number: QTBUG-3671
---
 src/gui/kernel/qapplication.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 57c4c99..0d11b27 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -666,7 +666,8 @@ void QApplicationPrivate::process_cmdline()
         \o  -geometry \e geometry, sets the client geometry of the first window
             that is shown.
         \o  -fn or \c -font \e font, defines the application font. The font
-            should be specified using an X logical font description.
+            should be specified using an X logical font description. Note that
+            this option is ignored when Qt is built with fontconfig support enabled.
         \o  -bg or \c -background \e color, sets the default background color
             and an application palette (light and dark shades are calculated).
         \o  -fg or \c -foreground \e color, sets the default foreground color.
-- 
cgit v0.12


From 773cfe5b87e8f92aba1e5648dc57f559c6e43741 Mon Sep 17 00:00:00 2001
From: kh1 <qt-info@nokia.com>
Date: Thu, 27 May 2010 14:41:12 +0200
Subject: Remove superfluous forward declaration.

Task-number: QTBUG-11049
Reviewed-by: ck
---
 tools/assistant/lib/qhelpsearchindexreader_default_p.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tools/assistant/lib/qhelpsearchindexreader_default_p.h b/tools/assistant/lib/qhelpsearchindexreader_default_p.h
index b30fa4b..27764db 100644
--- a/tools/assistant/lib/qhelpsearchindexreader_default_p.h
+++ b/tools/assistant/lib/qhelpsearchindexreader_default_p.h
@@ -61,9 +61,6 @@
 
 QT_BEGIN_NAMESPACE
 
-struct Entry;
-struct PosEntry;
-
 namespace fulltextsearch {
 namespace std {
 
-- 
cgit v0.12


From 5f66639e069f276a20f27373a0c2e7dd9d94f390 Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Thu, 27 May 2010 15:35:17 +0200
Subject: Tweak aesthetics of QML viewer inside QtDemo

Make the UX more controlled from QML, and tweak the frame to be better.
Blur mechanism has been reworked, but still disabled by default.
---
 demos/qtdemo/MagicAnim.qml   |  60 ---------------
 demos/qtdemo/colors.cpp      |   2 +-
 demos/qtdemo/mainwindow.cpp  |  12 +--
 demos/qtdemo/menumanager.cpp |  35 ++++-----
 demos/qtdemo/menumanager.h   |   3 +-
 demos/qtdemo/qmlShell.qml    | 177 +++++++++++++++++++++++--------------------
 demos/qtdemo/qtdemo.pro      |   3 +-
 demos/qtdemo/qtdemo.qrc      |   1 -
 8 files changed, 118 insertions(+), 175 deletions(-)
 delete mode 100644 demos/qtdemo/MagicAnim.qml

diff --git a/demos/qtdemo/MagicAnim.qml b/demos/qtdemo/MagicAnim.qml
deleted file mode 100644
index 7ac3e1c..0000000
--- a/demos/qtdemo/MagicAnim.qml
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** 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 demonstration applications 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$
-**
-****************************************************************************/
-
-import Qt 4.7
-
-//Emulates the in animation of the menu elements
-SequentialAnimation{
-    id: main;
-    property Item target
-    property int from: 0
-    property int to: 100
-    property int duration: 1000
-    property string properties: "y"
-    PauseAnimation { duration: main.duration*0.20 }
-    NumberAnimation { target: main.target; properties: main.properties; from: main.from; to: main.to + 40; duration: main.duration*0.30 }
-    NumberAnimation { target: main.target; properties: main.properties; from: main.to + 40; to: main.to; duration: main.duration*0.10 }
-    NumberAnimation { target: main.target; properties: main.properties; from: main.to; to: main.to + 20; duration: main.duration*0.10 }
-    NumberAnimation { target: main.target; properties: main.properties; from: main.to + 20; to: main.to; duration: main.duration*0.10 }
-    NumberAnimation { target: main.target; properties: main.properties; from: main.to; to: main.to + 8; duration: main.duration*0.10 }
-    NumberAnimation { target: main.target; properties: main.properties; from: main.to + 8; to: main.to; duration: main.duration*0.10 }
-}
-
diff --git a/demos/qtdemo/colors.cpp b/demos/qtdemo/colors.cpp
index 07cf162..b352e3d 100644
--- a/demos/qtdemo/colors.cpp
+++ b/demos/qtdemo/colors.cpp
@@ -270,7 +270,7 @@ void Colors::parseArgs(int argc, char *argv[])
         else if (s.startsWith("-h") || s.startsWith("-help")){
             QMessageBox::warning(0, "Arguments",
                                  QString("Usage: qtdemo [-verbose] [-no-adapt] [-opengl] [-software] [-fullscreen] [-ticker[0|1]] ")
-                                 + "[-animations[0|1]] [-no-blending] [-no-sync] [-use-timer-update[0|1]] [-pause[0|1]]  "
+                                 + "[-animations[0|1]] [-no-blending] [-use-blur] [-no-sync] [-use-timer-update[0|1]] [-pause[0|1]]  "
                                  + "[-use-window-mask] [-no-rescale] "
                                  + "[-use-pixmaps] [-show-fps] [-show-br] [-8bit[0|1]] [-menu<int>] [-use-loop] [-use-balls] "
                                  + "[-animation-speed<float>] [-fps<int>] "
diff --git a/demos/qtdemo/mainwindow.cpp b/demos/qtdemo/mainwindow.cpp
index 45ec9a6..753014a 100644
--- a/demos/qtdemo/mainwindow.cpp
+++ b/demos/qtdemo/mainwindow.cpp
@@ -266,7 +266,7 @@ void MainWindow::setupSceneItems()
 {
     if (Colors::showFps){
         this->fpsLabel = new DemoTextItem(QString("FPS: --"), Colors::buttonFont(), Qt::white, -1, this->scene, 0, DemoTextItem::DYNAMIC_TEXT);
-        this->fpsLabel->setZValue(100);
+        this->fpsLabel->setZValue(1000);
         this->fpsLabel->setPos(Colors::stageStartX, 600 - QFontMetricsF(Colors::buttonFont()).height() - 5);
     }
 
@@ -311,15 +311,9 @@ void MainWindow::checkAdapt()
         }
 
         //Note: Because we don't adapt later in the program, if blur makes FPS plummet then we won't catch it
-        if (!Colors::noBlur && MenuManager::instance()->mainSceneBlur && this->mainSceneRoot){
+        if (!Colors::noBlur && MenuManager::instance()->declarativeEngine && this->mainSceneRoot){
             Colors::noBlur = true;
-            this->mainSceneRoot->setGraphicsEffect(0);
-            MenuManager::instance()->mainSceneBlur = 0;
-            if(MenuManager::instance()->qmlRoot){
-                MenuManager::instance()->qmlRoot->setGraphicsEffect(0);
-                MenuManager::instance()->declarativeEngine->rootContext()->setContextProperty("realBlur", 0);
-            }
-            MenuManager::instance()->qmlShadow = 0;
+            MenuManager::instance()->declarativeEngine->rootContext()->setContextProperty("useBlur", false);
             if (Colors::verbose)
                qDebug() << "- benchmark adaption: removed blur (fps < 30)";
         }
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
index 9eb5664..9e2ba6b 100644
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
@@ -59,8 +59,6 @@ MenuManager::MenuManager()
     this->tickerInAnim = 0;
     this->upButton = 0;
     this->downButton = 0;
-    this->mainSceneBlur = 0;
-    this->qmlShadow = 0;
     this->helpEngine = 0;
     this->score = new Score();
     this->currentMenu = QLatin1String("[no menu visible]");
@@ -381,8 +379,14 @@ void MenuManager::launchQmlExample(const QString &name)
         }
     }
 
+    QPainter painter(qmlBgImage);
+    this->window->fpsLabel->setOpacity(0);
+    this->window->render(&painter);
+    this->window->fpsLabel->setOpacity(1.0);
+    Qt::ImageConversionFlags convFlags = Qt::AvoidDither | Qt::NoOpaqueDetection;
+    this->declarativeEngine->rootContext()->setContextProperty("bgAppPixmap", QVariant(QPixmap::fromImage(*qmlBgImage, convFlags)));
     qmlRoot->setProperty("show", QVariant(true));
-    qmlRoot->setProperty("source", file.fileName());
+    qmlRoot->setProperty("qmlFile", QUrl::fromLocalFile(file.fileName()));
 }
 
 void MenuManager::exampleFinished()
@@ -401,15 +405,6 @@ void MenuManager::init(MainWindow *window)
 {
     this->window = window;
 
-    //Create blur for later use
-    // Note that blur is DISABLED by default because it's too slow, even on Desktop machines
-    if(!Colors::noBlur){
-        this->mainSceneBlur = new QGraphicsBlurEffect(this);
-        this->mainSceneBlur->setEnabled(false);
-        this->mainSceneBlur->setBlurRadius(0);
-        this->window->mainSceneRoot->setGraphicsEffect(mainSceneBlur);
-    }
-
     // Create div:
     this->createTicker();
     this->createUpnDownButtons();
@@ -439,8 +434,15 @@ void MenuManager::init(MainWindow *window)
 
     // Create QML Loader
     qmlRegisterType<QGraphicsBlurEffect>("Effects", 1, 0, "Blur");
+    qmlRegisterType<QGraphicsDropShadowEffect>("Effects", 1, 0, "DropShadow");
     declarativeEngine = new QDeclarativeEngine(this);
-    MenuManager::instance()->declarativeEngine->rootContext()->setContextProperty("realBlur", this->mainSceneBlur);
+
+    // Note that we paint the background into a static image for a theorized performance improvement when blurring
+    // It has not yet been determined what, if any, speed up this gives (but is left in 'cause the QML expects it now)
+    this->qmlBgImage = new QImage(window->sceneRect().size().toSize(), QImage::Format_ARGB32);
+    this->qmlBgImage->fill(0);
+    declarativeEngine->rootContext()->setContextProperty("useBlur", !Colors::noBlur);
+    declarativeEngine->rootContext()->setContextProperty("bgAppPixmap", QVariant(QPixmap::fromImage(*qmlBgImage)));
     QDeclarativeComponent component(declarativeEngine, QUrl("qrc:qml/qmlShell.qml"), this);
     qmlRoot = 0;
     if(component.isReady())
@@ -450,14 +452,9 @@ void MenuManager::init(MainWindow *window)
     if(qmlRoot){
         qmlRoot->setHeight(this->window->scene->sceneRect().height());
         qmlRoot->setWidth(this->window->scene->sceneRect().width());
-        qmlRoot->setZValue(1000);//Above other items
+        qmlRoot->setZValue(101);//Above other items
         qmlRoot->setCursor(Qt::ArrowCursor);
         window->scene->addItem(qmlRoot);
-        if(!Colors::noBlur){
-            qmlShadow = new QGraphicsDropShadowEffect(this);
-            qmlShadow->setOffset(4);
-            qmlRoot->setGraphicsEffect(qmlShadow);
-        }
 
         //Note that QML adds key handling to the app.
         window->viewport()->setFocusPolicy(Qt::NoFocus);//Correct keyboard focus handling
diff --git a/demos/qtdemo/menumanager.h b/demos/qtdemo/menumanager.h
index 3524081..e90e02c 100644
--- a/demos/qtdemo/menumanager.h
+++ b/demos/qtdemo/menumanager.h
@@ -85,8 +85,7 @@ public:
 
     QDeclarativeEngine* declarativeEngine;
     QDeclarativeItem *qmlRoot;
-    QGraphicsBlurEffect *mainSceneBlur;
-    QGraphicsDropShadowEffect *qmlShadow;
+    QImage *qmlBgImage;
 
 private slots:
     void exampleFinished();
diff --git a/demos/qtdemo/qmlShell.qml b/demos/qtdemo/qmlShell.qml
index eb155c4..b9021e8 100644
--- a/demos/qtdemo/qmlShell.qml
+++ b/demos/qtdemo/qmlShell.qml
@@ -42,117 +42,132 @@
 import Qt 4.7
 import Effects 1.0
 
+/* Vars exposed from C++
+   pixmap bgAppPixmap
+   bool useBlur (to turn on, pass -use-blur on the cmd line. Off by default 'cause it's too slow)
+*/
 Item {
     id: main
-    property alias source: loader.source
+    //height and width set by program to fill window
+    //below properties are sometimes set from C++
+    property url qmlFile: ''
     property bool show: false
-    x: 0
-    y: -500 //height and width set by program
-    opacity: 0
-    property QtObject blurEffect: realBlur == null ? dummyBlur : realBlur //Is there a better way to lose those error messages?
-    Loader{//Automatic FocusScope
-        focus: true
-        clip: true
-        id: loader //source set by program
-        anchors.centerIn: parent
-        onStatusChanged: if(status == Loader.Ready) {
+    Image{
+        id: bg
+        opacity: 0
+        anchors.fill: parent
+        z: -1
+        pixmap: bgAppPixmap
+        effect: Blur { id: blurEffect; enabled: useBlur; blurRadius: 8;}
+    }
+
+    Item{ id:embeddedViewer
+        width: parent.width
+        height: parent.height
+        opacity: 0;
+        z: 10
+        Loader{
+            id: loader
+            z: 10
+            focus: true //Automatic FocusScope
+            clip: true
+            source: qmlFile
+            anchors.centerIn: parent
+            onStatusChanged: if(status == Loader.Ready) {
                 if(loader.item.width > 640)
                     loader.item.width = 640;
                 if(loader.item.height > 480)
                     loader.item.height = 480;
-       }
+            }
 
-    }
-    Rectangle{
-        z: -1
-        anchors.fill: loader.status == Loader.Ready ? loader : errorTxt
-        anchors.margins: -10
-        radius: 12
-        smooth: true
-        gradient: Gradient{
-            GradientStop{ position: 0.0; color: "#14FFFFFF" }
-            GradientStop{ position: 1.0; color: "#5AFFFFFF" }
         }
-        MouseArea{
-            anchors.fill: parent
-            onClicked: loader.focus=true;/* and don't propogate to the 'exit' area*/
+        Rectangle{ id: frame
+            z: 9
+            anchors.fill: loader.status == Loader.Ready ? loader : errorTxt
+            anchors.margins: -8
+            radius: 4
+            smooth: true
+            border.color: "#88aaaaaa"
+            gradient: Gradient{
+                GradientStop{ position: 0.0; color: "#14FFFFFF" }
+                GradientStop{ position: 1.0; color: "#5AFFFFFF" }
+            }
+            MouseArea{
+                anchors.fill: parent
+                onClicked: loader.focus=true;/* and don't propogate to the 'exit' area*/
+            }
+
+            Rectangle{ id: innerFrame
+                anchors.margins: 7
+                anchors.bottomMargin: 8
+                anchors.rightMargin: 8
+                color: "black"
+                border.color: "#44000000"
+                anchors.fill:parent
+            }
+
+            effect: DropShadow  {
+                enabled: useBlur;
+                blurRadius: 9;
+                color: "#88000000";
+                xOffset:0
+                yOffset:0
+            }
         }
 
+        Text{
+            id: errorTxt
+            z: 10
+            anchors.centerIn: parent
+            color: 'white'
+            smooth: true
+            visible: loader.status == Loader.Error
+            textFormat: Text.RichText
+            //Note that if loader is Error, it is because the file was found but there was an error creating the component
+            //This means either we have a bug in our demos, or the required modules (which ship with Qt) did not deploy correctly
+            text: "The example has failed to load.<br />If you installed Qt's QML modules this is a bug!<br />"
+                + 'Report it at <a href="http://bugreports.qt.nokia.com">http://bugreports.qt.nokia.com</a>';
+            onLinkActivated: Qt.openUrlExternally(link);
+        }
+    }
+    Rectangle{ id: blackout //Maybe use a colorize effect instead?
+        z: 8
+        anchors.fill: parent
+        color: "#000000"
+        opacity: 0
     }
-
     MouseArea{
-        z: -2
-        hoverEnabled: true //To steal from the buttons
+        z: 8
+        enabled: main.show
+        hoverEnabled: true //To steal focus from the buttons
         anchors.fill: parent
         onClicked: main.show=false;
     }
 
-    Text{
-        id: errorTxt
-        anchors.centerIn: parent
-        color: 'white'
-        smooth: true
-        visible: loader.status == Loader.Error
-        textFormat: Text.RichText //includes link for bugreport
-        //Note that if loader is Error, it is because the file was found but there was an error creating the component
-        //This means either we have a bug in our demos, or the required modules (which ship with Qt) did not deploy correctly
-        text: 'The example has failed to load. This is a bug!<br />'
-            +'Report it at <a href="http://bugreports.qt.nokia.com">http://bugreports.qt.nokia.com</a>';
-        onLinkActivated: Qt.openUrlExternally(link);
-    }
-
-
     states: [
         State {
             name: "show"
             when: show == true
             PropertyChanges {
-                target: main
+                target: embeddedViewer
+                opacity: 1
+            }
+            PropertyChanges {
+                target: bg
                 opacity: 1
-                y: 0                
             }
             PropertyChanges {
-                target: blurEffect
-                enabled: true
-                blurRadius: 8
-                blurHints: Blur.AnimationHint | Blur.PerformanceHint
+                target: blackout
+                opacity: 0.5
             }
         }
     ]
-    MagicAnim{ id: magicAnim; target: main; from: -500; to: 0 }
-    transitions: [
-        Transition { from: ""; to: "show"
-            SequentialAnimation{
-                ScriptAction{ script: magicAnim.start() }
-                NumberAnimation{ properties: "opacity,blurRadius";  easing.type: Easing.OutCubic; duration: 1000}
-                PropertyAnimation{ target: main; property: "y"}
-            }
-
-        },
-        Transition { from: "show"; to: "" //Addtionally, unload the item
+    transitions: [//Should not be too long, because the component has already started running
+        Transition { from: ''; to: "show"; reversible: true
             SequentialAnimation{
-                NumberAnimation{ properties: "y,opacity,blurRadius";duration: 500 }
-                ScriptAction{ script: loader.source = ''; }
+                PropertyAction { target: bg; property: useBlur?"y":"opacity";}//fade in blurred background only if blurred
+                NumberAnimation{ properties: "opacity"; easing.type: Easing.InQuad; duration: 500}
             }
-            /*Attempt to copy the exeunt animation. Looks bad
-            SequentialAnimation{
-                ParallelAnimation{
-                    NumberAnimation{ properties: "opacity,blurRadius"; easing.type: Easing.InCubic; duration: 1000 }
-                    SequentialAnimation{
-                        NumberAnimation{ target: main; property: 'y'; to: 3.2*height/5; duration: 500}
-                        ParallelAnimation{
-                            NumberAnimation{ target: main; property: 'y'; to: 3.0*height/5; duration: 100}
-                            NumberAnimation{ target: main; property: 'x'; to: 3.0*width/5; duration: 100}
-                        }
-                        NumberAnimation{ target: main; property: 'x'; to: 700; duration: 400}
-                    }
-                }
-                ScriptAction{ script: loader.source = ''; }
-                PropertyAction{ properties: "x,y";}
-            }
-            */
         }
     ]
-    Item{ Blur{id: dummyBlur } }
-
 }
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
index 5e64e1c..4d4177e 100644
--- a/demos/qtdemo/qtdemo.pro
+++ b/demos/qtdemo/qtdemo.pro
@@ -75,5 +75,4 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES qtdemo.pro images xml *.
 sources.path = $$[QT_INSTALL_DEMOS]/qtdemo
 
 OTHER_FILES += \
-    qmlShell.qml \
-    MagicAnim.qml
+    qmlShell.qml
diff --git a/demos/qtdemo/qtdemo.qrc b/demos/qtdemo/qtdemo.qrc
index 7682ab5..c18420f 100644
--- a/demos/qtdemo/qtdemo.qrc
+++ b/demos/qtdemo/qtdemo.qrc
@@ -7,6 +7,5 @@
     </qresource>
     <qresource prefix="/qml" lang="qml">
         <file>qmlShell.qml</file>
-        <file>MagicAnim.qml</file>
     </qresource>
 </RCC>
-- 
cgit v0.12


From 2c54f49584023633c5992579d23dc6819ec79c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Nilsen?= <bjorn.nilsen@nokia.com>
Date: Thu, 27 May 2010 15:28:26 +0200
Subject: Wrong QGraphicsItem::childrenBoundingRect() when applying effects.

Problem was that we used the children's raw bounding rect instead of
using their effective bounding rect when calculating the bounds.

Auto test included.

Task-number: QTBUG-10756
---
 src/gui/graphicsview/qgraphicsitem.cpp         |  6 +++---
 tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 29 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index db6c4c5..36d21a6 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1275,14 +1275,14 @@ void QGraphicsItemPrivate::childrenBoundingRectHelper(QTransform *x, QRectF *rec
             QTransform matrix = childd->transformToParent();
             if (x)
                 matrix *= *x;
-            *rect |= matrix.mapRect(child->boundingRect());
+            *rect |= matrix.mapRect(child->d_ptr->effectiveBoundingRect());
             if (!childd->children.isEmpty())
                 childd->childrenBoundingRectHelper(&matrix, rect);
         } else {
             if (x)
-                *rect |= x->mapRect(child->boundingRect());
+                *rect |= x->mapRect(child->d_ptr->effectiveBoundingRect());
             else
-                *rect |= child->boundingRect();
+                *rect |= child->d_ptr->effectiveBoundingRect();
             if (!childd->children.isEmpty())
                 childd->childrenBoundingRectHelper(x, rect);
         }
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 300afc3..5547b02 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -348,6 +348,7 @@ private slots:
     void childrenBoundingRect2();
     void childrenBoundingRect3();
     void childrenBoundingRect4();
+    void childrenBoundingRect5();
     void group();
     void setGroup();
     void setGroup2();
@@ -3369,6 +3370,34 @@ void tst_QGraphicsItem::childrenBoundingRect4()
     QCOMPARE(rect2->childrenBoundingRect(), rect3->boundingRect());
 }
 
+void tst_QGraphicsItem::childrenBoundingRect5()
+{
+    QGraphicsScene scene;
+
+    QGraphicsRectItem *parent = scene.addRect(QRectF(0, 0, 100, 100));
+    QGraphicsRectItem *child = scene.addRect(QRectF(0, 0, 100, 100));
+    child->setParentItem(parent);
+
+    QGraphicsView view(&scene);
+    view.show();
+
+    QTest::qWaitForWindowShown(&view);
+
+    // Try to mess up the cached bounding rect.
+    QRectF expectedChildrenBoundingRect = parent->boundingRect();
+    QCOMPARE(parent->childrenBoundingRect(), expectedChildrenBoundingRect);
+
+    // Apply some effects.
+    QGraphicsDropShadowEffect *dropShadow = new QGraphicsDropShadowEffect;
+    dropShadow->setOffset(25, 25);
+    child->setGraphicsEffect(dropShadow);
+    parent->setGraphicsEffect(new QGraphicsOpacityEffect);
+
+    QVERIFY(parent->childrenBoundingRect() != expectedChildrenBoundingRect);
+    expectedChildrenBoundingRect |= dropShadow->boundingRect();
+    QCOMPARE(parent->childrenBoundingRect(), expectedChildrenBoundingRect);
+}
+
 void tst_QGraphicsItem::group()
 {
     QGraphicsScene scene;
-- 
cgit v0.12


From 7fbd0a170a90f8fba8e81abb964ec06702f25448 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Thu, 27 May 2010 16:35:28 +0200
Subject: Upgrade harfbuzz to the latest version

Merge the folling changes from harfbuzz:

commit 85ad0ddd092522b4cff251f324128662f100991f
Author: Lars Knoll <lars.knoll@nokia.com>
Date:   Thu May 27 16:05:00 2010 +0200

    use unsigned char instead of unsigned in the bitfield.

    This saves significant memory, as the HB_CharAttributes
    and HB_GlyphAttributes structures are not 4 byte aligned
    anymore, by aligned to 1 resp. 2 bytes.

    The change is not compliant with ISO C, but accepted by
    almost all compilers.

commit 30f0e6c3d0aa67ab9ff95c60903fe28c4df80fbc
Author: Behdad Esfahbod <behdad@behdad.org>
Date:   Mon May 17 15:43:46 2010 -0400

    [hangul] Fix typo

Reviewed-By: Thiago Macieira
---
 src/3rdparty/harfbuzz/src/harfbuzz-hangul.c |  2 +-
 src/3rdparty/harfbuzz/src/harfbuzz-shaper.h | 36 +++++++++++++++++++----------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c b/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c
index a819dac..6f89ed6 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-hangul.c
@@ -130,7 +130,7 @@ static int hangul_nextSyllableBoundary(const HB_UChar16 *s, int start, int end)
 static const HB_OpenTypeFeature hangul_features [] = {
     { HB_MAKE_TAG('c', 'c', 'm', 'p'), CcmpProperty },
     { HB_MAKE_TAG('l', 'j', 'm', 'o'), CcmpProperty },
-    { HB_MAKE_TAG('j', 'j', 'm', 'o'), CcmpProperty },
+    { HB_MAKE_TAG('v', 'j', 'm', 'o'), CcmpProperty },
     { HB_MAKE_TAG('t', 'j', 'm', 'o'), CcmpProperty },
     { 0, 0 }
 };
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
index f7c7714..470e27b 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h
@@ -34,6 +34,18 @@
 
 HB_BEGIN_HEADER
 
+/*
+   using anything else than signed or unsigned for bitfields in C is non standard,
+   but accepted by almost all compilers. And it gives a significant reduction in
+   memory consumption as HB_CharAttributes and HB_GlyphAttributes will not have
+   a 4 byte alignment
+*/
+#ifdef  __xlC__
+typedef unsigned hb_bitfield;
+#else
+typedef hb_uint8 hb_bitfield;
+#endif
+
 typedef enum {
         HB_Script_Common,
         HB_Script_Greek,
@@ -123,12 +135,12 @@ typedef enum {
 
 
 typedef struct {
-    /*HB_LineBreakType*/ unsigned lineBreakType  :2;
-    /*HB_Bool*/ unsigned whiteSpace              :1;     /* A unicode whitespace character, except NBSP, ZWNBSP */
-    /*HB_Bool*/ unsigned charStop                :1;     /* Valid cursor position (for left/right arrow) */
-    /*HB_Bool*/ unsigned wordBoundary            :1;
-    /*HB_Bool*/ unsigned sentenceBoundary        :1;
-    unsigned unused                  :2;
+    /*HB_LineBreakType*/ hb_bitfield lineBreakType  :2;
+    /*HB_Bool*/ hb_bitfield whiteSpace              :1;     /* A unicode whitespace character, except NBSP, ZWNBSP */
+    /*HB_Bool*/ hb_bitfield charStop                :1;     /* Valid cursor position (for left/right arrow) */
+    /*HB_Bool*/ hb_bitfield wordBoundary            :1;
+    /*HB_Bool*/ hb_bitfield sentenceBoundary        :1;
+    hb_bitfield unused                  :2;
 } HB_CharAttributes;
 
 void HB_GetCharAttributes(const HB_UChar16 *string, hb_uint32 stringLength,
@@ -181,12 +193,12 @@ typedef enum {
  * it like that. If this is a problem please tell Trolltech :)
  */
 typedef struct {
-    unsigned justification   :4;  /* Justification class */
-    unsigned clusterStart    :1;  /* First glyph of representation of cluster */
-    unsigned mark            :1;  /* needs to be positioned around base char */
-    unsigned zeroWidth       :1;  /* ZWJ, ZWNJ etc, with no width */
-    unsigned dontPrint       :1;
-    unsigned combiningClass  :8;
+    hb_bitfield justification   :4;  /* Justification class */
+    hb_bitfield clusterStart    :1;  /* First glyph of representation of cluster */
+    hb_bitfield mark            :1;  /* needs to be positioned around base char */
+    hb_bitfield zeroWidth       :1;  /* ZWJ, ZWNJ etc, with no width */
+    hb_bitfield dontPrint       :1;
+    hb_bitfield combiningClass  :8;
 } HB_GlyphAttributes;
 
 typedef struct HB_FaceRec_ {
-- 
cgit v0.12


From 19c2aef89f7a8748c11161ffab9765313d0e2e7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Thu, 27 May 2010 16:36:19 +0200
Subject: Removed unused variable

Reviewed-by: Olivier Goffart
---
 src/gui/itemviews/qitemdelegate.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index d5f6fd2..9bbfc23 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -667,7 +667,6 @@ void QItemDelegate::drawDisplay(QPainter *painter, const QStyleOptionViewItem &o
 {
     Q_D(const QItemDelegate);
 
-    QPen pen = painter->pen();
     QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
                               ? QPalette::Normal : QPalette::Disabled;
     if (cg == QPalette::Normal && !(option.state & QStyle::State_Active))
-- 
cgit v0.12


From c3d652967c313cdc1853e9d905440ddf645c49f4 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 27 May 2010 15:42:10 +0200
Subject: fix & unify path separator escaping

Reviewed-by: mauricek
---
 configure.exe                    | Bin 1316864 -> 1317888 bytes
 tools/configure/configureapp.cpp | 104 +++++++++++++++++++++------------------
 tools/configure/configureapp.h   |   3 +-
 3 files changed, 58 insertions(+), 49 deletions(-)

diff --git a/configure.exe b/configure.exe
index a19f515..1fddc81 100755
Binary files a/configure.exe and b/configure.exe differ
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index ee49bbf..c2b3a57 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -392,11 +392,19 @@ Configure::~Configure()
     }
 }
 
-QString Configure::fixSeparators(QString somePath)
+QString Configure::fixSeparators(const QString &somePath, bool escape)
 {
-    return useUnixSeparators ?
-           QDir::fromNativeSeparators(somePath) :
-           QDir::toNativeSeparators(somePath);
+    if (useUnixSeparators)
+        return QDir::fromNativeSeparators(somePath);
+    QString ret = QDir::toNativeSeparators(somePath);
+    return escape ? escapeSeparators(ret) : ret;
+}
+
+QString Configure::escapeSeparators(const QString &somePath)
+{
+    QString out = somePath;
+    out.replace(QLatin1Char('\\'), QLatin1String("\\\\"));
+    return out;
 }
 
 // We could use QDir::homePath() + "/.qt-license", but
@@ -2573,10 +2581,10 @@ void Configure::generateOutputVars()
         qtConfig += "accessibility";
 
     if( !qmakeLibs.isEmpty() )
-        qmakeVars += "LIBS           += " + qmakeLibs.join( " " );
+        qmakeVars += "LIBS           += " + escapeSeparators(qmakeLibs.join( " " ));
 
     if( !dictionary["QT_LFLAGS_SQLITE"].isEmpty() )
-        qmakeVars += "QT_LFLAGS_SQLITE += " + dictionary["QT_LFLAGS_SQLITE"];
+        qmakeVars += "QT_LFLAGS_SQLITE += " + escapeSeparators(dictionary["QT_LFLAGS_SQLITE"]);
 
     if (dictionary[ "QT3SUPPORT" ] == "yes")
         qtConfig += "qt3support";
@@ -2721,14 +2729,14 @@ void Configure::generateOutputVars()
     if(dictionary.contains("XQMAKESPEC") && dictionary[ "XQMAKESPEC" ].startsWith("linux"))
         dictionary[ "QMAKE_RPATHDIR" ] = dictionary[ "QT_INSTALL_LIBS" ];
 
-    qmakeVars += QString("OBJECTS_DIR     = ") + fixSeparators( "tmp/obj/" + dictionary[ "QMAKE_OUTDIR" ] );
-    qmakeVars += QString("MOC_DIR         = ") + fixSeparators( "tmp/moc/" + dictionary[ "QMAKE_OUTDIR" ] );
-    qmakeVars += QString("RCC_DIR         = ") + fixSeparators("tmp/rcc/" + dictionary["QMAKE_OUTDIR"]);
+    qmakeVars += QString("OBJECTS_DIR     = ") + fixSeparators("tmp/obj/" + dictionary[ "QMAKE_OUTDIR" ], true);
+    qmakeVars += QString("MOC_DIR         = ") + fixSeparators("tmp/moc/" + dictionary[ "QMAKE_OUTDIR" ], true);
+    qmakeVars += QString("RCC_DIR         = ") + fixSeparators("tmp/rcc/" + dictionary["QMAKE_OUTDIR"], true);
 
     if (!qmakeDefines.isEmpty())
         qmakeVars += QString("DEFINES        += ") + qmakeDefines.join( " " );
     if (!qmakeIncludes.isEmpty())
-        qmakeVars += QString("INCLUDEPATH    += ") + qmakeIncludes.join( " " );
+        qmakeVars += QString("INCLUDEPATH    += ") + escapeSeparators(qmakeIncludes.join( " " ));
     if (!opensslLibs.isEmpty())
         qmakeVars += opensslLibs;
     else if (dictionary[ "OPENSSL" ] == "linked") {
@@ -2800,27 +2808,27 @@ void Configure::generateCachefile()
         QString targetSpec = dictionary.contains("XQMAKESPEC") ? dictionary[ "XQMAKESPEC" ] : dictionary[ "QMAKESPEC" ];
         QString mkspec_path = fixSeparators(sourcePath + "/mkspecs/" + targetSpec);
         if(QFile::exists(mkspec_path))
-            cacheStream << "QMAKESPEC       = " << mkspec_path << endl;
+            cacheStream << "QMAKESPEC       = " << escapeSeparators(mkspec_path) << endl;
         else
-            cacheStream << "QMAKESPEC       = " << fixSeparators(targetSpec) << endl;
-        cacheStream << "ARCH            = " << fixSeparators(dictionary[ "ARCHITECTURE" ]) << endl;
-        cacheStream << "QT_BUILD_TREE   = " << fixSeparators(dictionary[ "QT_BUILD_TREE" ]) << endl;
-        cacheStream << "QT_SOURCE_TREE  = " << fixSeparators(dictionary[ "QT_SOURCE_TREE" ]) << endl;
+            cacheStream << "QMAKESPEC       = " << fixSeparators(targetSpec, true) << endl;
+        cacheStream << "ARCH            = " << dictionary[ "ARCHITECTURE" ] << endl;
+        cacheStream << "QT_BUILD_TREE   = " << fixSeparators(dictionary[ "QT_BUILD_TREE" ], true) << endl;
+        cacheStream << "QT_SOURCE_TREE  = " << fixSeparators(dictionary[ "QT_SOURCE_TREE" ], true) << endl;
 
         if (dictionary["QT_EDITION"] != "QT_EDITION_OPENSOURCE")
             cacheStream << "DEFINES        *= QT_EDITION=QT_EDITION_DESKTOP" << endl;
 
         //so that we can build without an install first (which would be impossible)
-        cacheStream << "QMAKE_MOC       = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe") << endl;
-        cacheStream << "QMAKE_UIC       = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe") << endl;
-        cacheStream << "QMAKE_UIC3      = $$QT_BUILD_TREE" << fixSeparators("/bin/uic3.exe") << endl;
-        cacheStream << "QMAKE_RCC       = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe") << endl;
-        cacheStream << "QMAKE_DUMPCPP   = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe") << endl;
-        cacheStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include") << endl;
-        cacheStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib") << endl;
+        cacheStream << "QMAKE_MOC       = $$QT_BUILD_TREE" << fixSeparators("/bin/moc.exe", true) << endl;
+        cacheStream << "QMAKE_UIC       = $$QT_BUILD_TREE" << fixSeparators("/bin/uic.exe", true) << endl;
+        cacheStream << "QMAKE_UIC3      = $$QT_BUILD_TREE" << fixSeparators("/bin/uic3.exe", true) << endl;
+        cacheStream << "QMAKE_RCC       = $$QT_BUILD_TREE" << fixSeparators("/bin/rcc.exe", true) << endl;
+        cacheStream << "QMAKE_DUMPCPP   = $$QT_BUILD_TREE" << fixSeparators("/bin/dumpcpp.exe", true) << endl;
+        cacheStream << "QMAKE_INCDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/include", true) << endl;
+        cacheStream << "QMAKE_LIBDIR_QT = $$QT_BUILD_TREE" << fixSeparators("/lib", true) << endl;
         if (dictionary["CETEST"] == "yes") {
-            cacheStream << "QT_CE_RAPI_INC  = " << fixSeparators(dictionary[ "QT_CE_RAPI_INC" ]) << endl;
-            cacheStream << "QT_CE_RAPI_LIB  = " << fixSeparators(dictionary[ "QT_CE_RAPI_LIB" ]) << endl;
+            cacheStream << "QT_CE_RAPI_INC  = " << fixSeparators(dictionary[ "QT_CE_RAPI_INC" ], true) << endl;
+            cacheStream << "QT_CE_RAPI_LIB  = " << fixSeparators(dictionary[ "QT_CE_RAPI_LIB" ], true) << endl;
         }
 
         // embedded
@@ -2896,7 +2904,7 @@ void Configure::generateCachefile()
                      << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl;
 
         configStream << "#Qt for Windows CE c-runtime deployment" << endl
-                     << "QT_CE_C_RUNTIME = " << fixSeparators(dictionary[ "CE_CRT" ]) << endl;
+                     << "QT_CE_C_RUNTIME = " << fixSeparators(dictionary[ "CE_CRT" ], true) << endl;
 
         if(dictionary["CE_SIGNATURE"] != QLatin1String("no"))
             configStream << "DEFAULT_SIGNATURE=" << dictionary["CE_SIGNATURE"] << endl;
@@ -3213,32 +3221,32 @@ void Configure::generateConfigfiles()
                   << endl;
         if(!dictionary[ "QT_HOST_PREFIX" ].isNull())
             tmpStream << "#if !defined(QT_BOOTSTRAPPED) && !defined(QT_BUILD_QMAKE)" << endl;
-        tmpStream << "static const char qt_configure_prefix_path_str       [512 + 12] = \"qt_prfxpath=" << QString(dictionary["QT_INSTALL_PREFIX"]).replace( "\\", "\\\\" ) << "\";" << endl
-                  << "static const char qt_configure_documentation_path_str[512 + 12] = \"qt_docspath=" << QString(dictionary["QT_INSTALL_DOCS"]).replace( "\\", "\\\\" ) << "\";"  << endl
-                  << "static const char qt_configure_headers_path_str      [512 + 12] = \"qt_hdrspath=" << QString(dictionary["QT_INSTALL_HEADERS"]).replace( "\\", "\\\\" ) << "\";"  << endl
-                  << "static const char qt_configure_libraries_path_str    [512 + 12] = \"qt_libspath=" << QString(dictionary["QT_INSTALL_LIBS"]).replace( "\\", "\\\\" ) << "\";"  << endl
-                  << "static const char qt_configure_binaries_path_str     [512 + 12] = \"qt_binspath=" << QString(dictionary["QT_INSTALL_BINS"]).replace( "\\", "\\\\" ) << "\";"  << endl
-                  << "static const char qt_configure_plugins_path_str      [512 + 12] = \"qt_plugpath=" << QString(dictionary["QT_INSTALL_PLUGINS"]).replace( "\\", "\\\\" ) << "\";"  << endl
-                  << "static const char qt_configure_imports_path_str      [512 + 12] = \"qt_impspath=" << QString(dictionary["QT_INSTALL_IMPORTS"]).replace( "\\", "\\\\" ) << "\";"  << endl
-                  << "static const char qt_configure_data_path_str         [512 + 12] = \"qt_datapath=" << QString(dictionary["QT_INSTALL_DATA"]).replace( "\\", "\\\\" ) << "\";"  << endl
-                  << "static const char qt_configure_translations_path_str [512 + 12] = \"qt_trnspath=" << QString(dictionary["QT_INSTALL_TRANSLATIONS"]).replace( "\\", "\\\\" ) << "\";" << endl
-                  << "static const char qt_configure_examples_path_str     [512 + 12] = \"qt_xmplpath=" << QString(dictionary["QT_INSTALL_EXAMPLES"]).replace( "\\", "\\\\" ) << "\";"  << endl
-                  << "static const char qt_configure_demos_path_str        [512 + 12] = \"qt_demopath=" << QString(dictionary["QT_INSTALL_DEMOS"]).replace( "\\", "\\\\" ) << "\";"  << endl
-                  //<< "static const char qt_configure_settings_path_str [256] = \"qt_stngpath=" << QString(dictionary["QT_INSTALL_SETTINGS"]).replace( "\\", "\\\\" ) << "\";" << endl
+        tmpStream << "static const char qt_configure_prefix_path_str       [512 + 12] = \"qt_prfxpath=" << escapeSeparators(dictionary["QT_INSTALL_PREFIX"]) << "\";" << endl
+                  << "static const char qt_configure_documentation_path_str[512 + 12] = \"qt_docspath=" << escapeSeparators(dictionary["QT_INSTALL_DOCS"]) << "\";"  << endl
+                  << "static const char qt_configure_headers_path_str      [512 + 12] = \"qt_hdrspath=" << escapeSeparators(dictionary["QT_INSTALL_HEADERS"]) << "\";"  << endl
+                  << "static const char qt_configure_libraries_path_str    [512 + 12] = \"qt_libspath=" << escapeSeparators(dictionary["QT_INSTALL_LIBS"]) << "\";"  << endl
+                  << "static const char qt_configure_binaries_path_str     [512 + 12] = \"qt_binspath=" << escapeSeparators(dictionary["QT_INSTALL_BINS"]) << "\";"  << endl
+                  << "static const char qt_configure_plugins_path_str      [512 + 12] = \"qt_plugpath=" << escapeSeparators(dictionary["QT_INSTALL_PLUGINS"]) << "\";"  << endl
+                  << "static const char qt_configure_imports_path_str      [512 + 12] = \"qt_impspath=" << escapeSeparators(dictionary["QT_INSTALL_IMPORTS"]) << "\";"  << endl
+                  << "static const char qt_configure_data_path_str         [512 + 12] = \"qt_datapath=" << escapeSeparators(dictionary["QT_INSTALL_DATA"]) << "\";"  << endl
+                  << "static const char qt_configure_translations_path_str [512 + 12] = \"qt_trnspath=" << escapeSeparators(dictionary["QT_INSTALL_TRANSLATIONS"]) << "\";" << endl
+                  << "static const char qt_configure_examples_path_str     [512 + 12] = \"qt_xmplpath=" << escapeSeparators(dictionary["QT_INSTALL_EXAMPLES"]) << "\";"  << endl
+                  << "static const char qt_configure_demos_path_str        [512 + 12] = \"qt_demopath=" << escapeSeparators(dictionary["QT_INSTALL_DEMOS"]) << "\";"  << endl
+                  //<< "static const char qt_configure_settings_path_str [256] = \"qt_stngpath=" << escapeSeparators(dictionary["QT_INSTALL_SETTINGS"]) << "\";" << endl
                   ;
         if(!dictionary[ "QT_HOST_PREFIX" ].isNull()) {
              tmpStream << "#else" << endl
-                       << "static const char qt_configure_prefix_path_str       [512 + 12] = \"qt_prfxpath=" << QString(dictionary[ "QT_HOST_PREFIX" ]).replace( "\\", "\\\\" ) << "\";" << endl
-                       << "static const char qt_configure_documentation_path_str[512 + 12] = \"qt_docspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/doc").replace( "\\", "\\\\" ) <<"\";"  << endl
-                       << "static const char qt_configure_headers_path_str      [512 + 12] = \"qt_hdrspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/include").replace( "\\", "\\\\" ) <<"\";"  << endl
-                       << "static const char qt_configure_libraries_path_str    [512 + 12] = \"qt_libspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/lib").replace( "\\", "\\\\" ) <<"\";"  << endl
-                       << "static const char qt_configure_binaries_path_str     [512 + 12] = \"qt_binspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/bin").replace( "\\", "\\\\" ) <<"\";"  << endl
-                       << "static const char qt_configure_plugins_path_str      [512 + 12] = \"qt_plugpath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/plugins").replace( "\\", "\\\\" ) <<"\";"  << endl
-                       << "static const char qt_configure_imports_path_str      [512 + 12] = \"qt_impspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/imports").replace( "\\", "\\\\" ) <<"\";"  << endl
-                       << "static const char qt_configure_data_path_str         [512 + 12] = \"qt_datapath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ]).replace( "\\", "\\\\" ) <<"\";"  << endl
-                       << "static const char qt_configure_translations_path_str [512 + 12] = \"qt_trnspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/translations").replace( "\\", "\\\\" ) <<"\";" << endl
-                       << "static const char qt_configure_examples_path_str     [512 + 12] = \"qt_xmplpath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/example").replace( "\\", "\\\\" ) <<"\";"  << endl
-                       << "static const char qt_configure_demos_path_str        [512 + 12] = \"qt_demopath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/demos").replace( "\\", "\\\\" ) <<"\";"  << endl
+                       << "static const char qt_configure_prefix_path_str       [512 + 12] = \"qt_prfxpath=" << escapeSeparators(dictionary[ "QT_HOST_PREFIX" ]) << "\";" << endl
+                       << "static const char qt_configure_documentation_path_str[512 + 12] = \"qt_docspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/doc", true) <<"\";"  << endl
+                       << "static const char qt_configure_headers_path_str      [512 + 12] = \"qt_hdrspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/include", true) <<"\";"  << endl
+                       << "static const char qt_configure_libraries_path_str    [512 + 12] = \"qt_libspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/lib", true) <<"\";"  << endl
+                       << "static const char qt_configure_binaries_path_str     [512 + 12] = \"qt_binspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/bin", true) <<"\";"  << endl
+                       << "static const char qt_configure_plugins_path_str      [512 + 12] = \"qt_plugpath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/plugins", true) <<"\";"  << endl
+                       << "static const char qt_configure_imports_path_str      [512 + 12] = \"qt_impspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/imports", true) <<"\";"  << endl
+                       << "static const char qt_configure_data_path_str         [512 + 12] = \"qt_datapath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ], true) <<"\";"  << endl
+                       << "static const char qt_configure_translations_path_str [512 + 12] = \"qt_trnspath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/translations", true) <<"\";" << endl
+                       << "static const char qt_configure_examples_path_str     [512 + 12] = \"qt_xmplpath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/example", true) <<"\";"  << endl
+                       << "static const char qt_configure_demos_path_str        [512 + 12] = \"qt_demopath=" << fixSeparators(dictionary[ "QT_HOST_PREFIX" ] + "/demos", true) <<"\";"  << endl
                        << "#endif //QT_BOOTSTRAPPED" << endl;
         }
         tmpStream << "/* strlen( \"qt_lcnsxxxx\" ) == 12 */" << endl
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index c441129..6c10dd8 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -147,7 +147,8 @@ private:
     int outputWidth;
 
     bool useUnixSeparators;
-    QString fixSeparators(QString somePath);
+    QString fixSeparators(const QString &somePath, bool escape = false);
+    QString escapeSeparators(const QString &somePath);
     bool filesDiffer(const QString &file1, const QString &file2);
 
     bool findFile(const QString &fileName);
-- 
cgit v0.12


From c86bb735e9b783b03010bc830c2a7a2fbcdb71b7 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 27 May 2010 16:31:57 +0200
Subject: escape backslashes in QMAKE_PRL_LIBS

they may contain (absolute) windows paths, which need escaping now.

Reviewed-by: mauricek
---
 qmake/generators/makefile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 4c4f5bc..d6b3e09 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -972,7 +972,7 @@ MakefileGenerator::writePrlFile(QTextStream &t)
             libs << "QMAKE_LIBS_PRIVATE";
         t << "QMAKE_PRL_LIBS = ";
         for(QStringList::Iterator it = libs.begin(); it != libs.end(); ++it)
-            t << project->values((*it)).join(" ") << " ";
+            t << project->values((*it)).join(" ").replace('\\', "\\\\") << " ";
         t << endl;
     }
 }
-- 
cgit v0.12


From f399b0deede15c7c5cb1108db261b77452afb394 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Thu, 27 May 2010 16:39:11 +0200
Subject: fix escaping - by not using eval

the left-hand-side of qmake assignments is expanded, so there is
no need to use eval.
---
 mkspecs/features/incredibuild_xge.prf |  6 +++---
 src/src.pro                           | 16 ++++++++--------
 src/tools/tools.pro                   | 16 ++++++++--------
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/mkspecs/features/incredibuild_xge.prf b/mkspecs/features/incredibuild_xge.prf
index b8ca571..a81a0cc 100644
--- a/mkspecs/features/incredibuild_xge.prf
+++ b/mkspecs/features/incredibuild_xge.prf
@@ -1,11 +1,11 @@
 contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc") {
-    EOC = \$\$escape_expand(\\\\n\\\\t)
+    EOC = $$escape_expand(\\n\\t)
 
     # The VCPROJ generator will replace the \r\h with the coded \r\n: &#x0d;&#x0a;
     # No other generator understands the \h
-    win32-msvc2*|wince*msvc*: EOC = \$\$escape_expand(\\\\r\\\\h)
+    win32-msvc2*|wince*msvc*: EOC = $$escape_expand(\\r\\h)
 
     for(xge, INCREDIBUILD_XGE) {
-        eval($${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$replace($${xge}.output,/,\\) $$EOC $$eval($${xge}.commands))
+        $${xge}.commands = Rem IncrediBuild_AllowRemote $$EOC Rem IncrediBuild_OutputFile $$replace($${xge}.output,/,\\) $$EOC $$eval($${xge}.commands)
     }
 }
diff --git a/src/src.pro b/src/src.pro
index 7574796..5436c4a 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -157,24 +157,24 @@ for(subname, SRC_SUBDIRS) {
    SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE))
    !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc) | isEqual(subname, src_tools_uic3)):!separate_debug_info {
        #debug
-       eval(debug-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS)
-       eval(debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug))
+       debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
+       debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
        EXTRA_DEBUG_TARGETS += debug-$${subtarget}
        QMAKE_EXTRA_TARGETS += debug-$${subtarget}
        #release
-       eval(release-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS)
-       eval(release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release))
+       release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
+       release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
        EXTRA_RELEASE_TARGETS += release-$${subtarget}
        QMAKE_EXTRA_TARGETS += release-$${subtarget}
     } else { #do not have a real debug target/release
        #debug
-       eval(debug-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS)
-       eval(debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first))
+       debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
+       debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
        EXTRA_DEBUG_TARGETS += debug-$${subtarget}
        QMAKE_EXTRA_TARGETS += debug-$${subtarget}
        #release
-       eval(release-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS)
-       eval(release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first))
+       release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
+       release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
        EXTRA_RELEASE_TARGETS += release-$${subtarget}
        QMAKE_EXTRA_TARGETS += release-$${subtarget}
    }
diff --git a/src/tools/tools.pro b/src/tools/tools.pro
index 1ecb944..4736d09 100644
--- a/src/tools/tools.pro
+++ b/src/tools/tools.pro
@@ -45,24 +45,24 @@ EXTRA_RELEASE_TARGETS =
         SUB_TEMPLATE = $$list($$fromfile($$subpro, TEMPLATE))
         !isEqual(subname, src_tools_bootstrap):if(isEqual($$SUB_TEMPLATE, lib) | isEqual($$SUB_TEMPLATE, subdirs) | isEqual(subname, src_tools_idc) | isEqual(subname, src_tools_uic3)):!separate_debug_info {
             #debug
-            eval(debug-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS)
-            eval(debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug))
+            debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
+            debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
             EXTRA_DEBUG_TARGETS += debug-$${subtarget}
             QMAKE_EXTRA_TARGETS += debug-$${subtarget}
             #release
-            eval(release-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS)
-            eval(release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release))
+            release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
+            release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) release)
             EXTRA_RELEASE_TARGETS += release-$${subtarget}
             QMAKE_EXTRA_TARGETS += release-$${subtarget}
         } else { #do not have a real debug target/release
             #debug
-            eval(debug-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS)
-            eval(debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first))
+            debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
+            debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
             EXTRA_DEBUG_TARGETS += debug-$${subtarget}
             QMAKE_EXTRA_TARGETS += debug-$${subtarget}
             #release
-            eval(release-$${subtarget}.depends = $${subdir}\$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS)
-            eval(release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first))
+            release-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_RELEASE_TARGETS
+            release-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) first)
             EXTRA_RELEASE_TARGETS += release-$${subtarget}
             QMAKE_EXTRA_TARGETS += release-$${subtarget}
         }
-- 
cgit v0.12


From 5f8312f82ac9ef77c89ef363d9c2e0246b398d20 Mon Sep 17 00:00:00 2001
From: Martin Jones <martin.jones@nokia.com>
Date: Fri, 28 May 2010 12:53:39 +1000
Subject: Use QElapsedTimer rather than QTime::elapsed()

---
 .../graphicsitems/qdeclarativeflickable.cpp        | 11 ++--
 .../graphicsitems/qdeclarativeflickable_p_p.h      |  6 +--
 src/declarative/graphicsitems/qdeclarativeitem.cpp | 59 ++++++++++++++--------
 src/declarative/graphicsitems/qdeclarativeitem_p.h | 11 ++--
 .../graphicsitems/qdeclarativepathview.cpp         | 10 ++--
 .../graphicsitems/qdeclarativepathview_p_p.h       |  3 +-
 6 files changed, 58 insertions(+), 42 deletions(-)

diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index 1dde510..10dc0f8 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -160,6 +160,7 @@ void QDeclarativeFlickablePrivate::init()
     q->setFiltersChildEvents(true);
     QDeclarativeItemPrivate *viewportPrivate = static_cast<QDeclarativeItemPrivate*>(QGraphicsItemPrivate::get(viewport));
     viewportPrivate->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
+    lastPosTime.invalidate();
 }
 
 /*
@@ -656,7 +657,7 @@ void QDeclarativeFlickablePrivate::handleMousePressEvent(QGraphicsSceneMouseEven
 void QDeclarativeFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_Q(QDeclarativeFlickable);
-    if (!interactive || lastPosTime.isNull())
+    if (!interactive || !lastPosTime.isValid())
         return;
     bool rejectY = false;
     bool rejectX = false;
@@ -752,7 +753,7 @@ void QDeclarativeFlickablePrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEv
     stealMouse = false;
     q->setKeepMouseGrab(false);
     pressed = false;
-    if (lastPosTime.isNull())
+    if (!lastPosTime.isValid())
         return;
 
     if (QDeclarativeItemPrivate::elapsed(lastPosTime) > 100) {
@@ -780,7 +781,7 @@ void QDeclarativeFlickablePrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEv
         fixupX();
     }
 
-    lastPosTime = QTime();
+    lastPosTime.invalidate();
 
     if (!timeline.isActive())
         q->movementEnding();
@@ -1218,8 +1219,8 @@ bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
         }
 
         return stealThisEvent || d->delayedPressEvent;
-    } else if (!d->lastPosTime.isNull()) {
-        d->lastPosTime = QTime();
+    } else if (d->lastPosTime.isValid()) {
+        d->lastPosTime.invalidate();
     }
     if (mouseEvent.type() == QEvent::GraphicsSceneMouseRelease) {
         d->clearDelayedPress();
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
index b467ed2..66d2678 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
@@ -140,13 +140,13 @@ public:
     bool stealMouse : 1;
     bool pressed : 1;
     bool interactive : 1;
-    QTime lastPosTime;
+    QElapsedTimer lastPosTime;
     QPointF lastPos;
     QPointF pressPos;
-    QTime pressTime;
+    QElapsedTimer pressTime;
     qreal deceleration;
     qreal maxVelocity;
-    QTime velocityTime;
+    QElapsedTimer velocityTime;
     QPointF lastFlickablePosition;
     qreal reportedVelocitySmoothing;
     QGraphicsSceneMouseEvent *delayedPressEvent;
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 2841ac3..7bd08ce 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -3145,41 +3145,56 @@ QDebug operator<<(QDebug debug, QDeclarativeItem *item)
     return debug;
 }
 
-int QDeclarativeItemPrivate::consistentTime = -1;
-void QDeclarativeItemPrivate::setConsistentTime(int t)
+qint64 QDeclarativeItemPrivate::consistentTime = -1;
+void QDeclarativeItemPrivate::setConsistentTime(qint64 t)
 {
     consistentTime = t;
 }
 
-QTime QDeclarativeItemPrivate::currentTime()
+class QElapsedTimerConsistentTimeHack
 {
-    if (consistentTime == -1)
-        return QTime::currentTime();
-    else
-        return QTime(0, 0).addMSecs(consistentTime);
-}
+public:
+    void start() {
+        t1 = QDeclarativeItemPrivate::consistentTime;
+        t2 = 0;
+    }
+    qint64 elapsed() {
+        return QDeclarativeItemPrivate::consistentTime - t1;
+    }
+    qint64 restart() {
+        qint64 val = QDeclarativeItemPrivate::consistentTime - t1;
+        t1 = QDeclarativeItemPrivate::consistentTime;
+        t2 = 0;
+        return val;
+    }
 
-void QDeclarativeItemPrivate::start(QTime &t)
+private:
+    qint64 t1;
+    qint64 t2;
+};
+
+void QDeclarativeItemPrivate::start(QElapsedTimer &t)
 {
-    t = currentTime();
+    if (QDeclarativeItemPrivate::consistentTime == -1)
+        t.start();
+    else
+        ((QElapsedTimerConsistentTimeHack*)&t)->start();
 }
 
-int QDeclarativeItemPrivate::elapsed(QTime &t)
+qint64 QDeclarativeItemPrivate::elapsed(QElapsedTimer &t)
 {
-    int n = t.msecsTo(currentTime());
-    if (n < 0)                                // passed midnight
-        n += 86400 * 1000;
-    return n;
+    if (QDeclarativeItemPrivate::consistentTime == -1)
+        return t.elapsed();
+    else
+        return ((QElapsedTimerConsistentTimeHack*)&t)->elapsed();
 }
 
-int QDeclarativeItemPrivate::restart(QTime &t)
+qint64 QDeclarativeItemPrivate::restart(QElapsedTimer &t)
 {
-    QTime time = currentTime();
-    int n = t.msecsTo(time);
-    if (n < 0)                                // passed midnight
-        n += 86400*1000;
-    t = time;
-    return n;
+    if (QDeclarativeItemPrivate::consistentTime == -1)
+        return t.restart();
+    else
+        return ((QElapsedTimerConsistentTimeHack*)&t)->restart();
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h
index 15b34f0..184d6f1 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h
@@ -305,12 +305,11 @@ public:
 
     virtual void focusChanged(bool);
 
-    static int consistentTime;
-    static QTime currentTime();
-    static void setConsistentTime(int t);
-    static void start(QTime &);
-    static int elapsed(QTime &);
-    static int restart(QTime &);
+    static qint64 consistentTime;
+    static void setConsistentTime(qint64 t);
+    static void start(QElapsedTimer &);
+    static qint64 elapsed(QElapsedTimer &);
+    static qint64 restart(QElapsedTimer &);
 };
 
 /*
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 3a69f44..448ec06 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -948,7 +948,7 @@ void QDeclarativePathView::mousePressEvent(QGraphicsSceneMouseEvent *event)
 void QDeclarativePathView::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativePathView);
-    if (!d->interactive || d->lastPosTime.isNull())
+    if (!d->interactive || !d->lastPosTime.isValid())
         return;
 
     if (!d->stealMouse) {
@@ -982,7 +982,7 @@ void QDeclarativePathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
     Q_D(QDeclarativePathView);
     d->stealMouse = false;
     setKeepMouseGrab(false);
-    if (!d->interactive || d->lastPosTime.isNull())
+    if (!d->interactive || !d->lastPosTime.isValid())
         return;
 
     qreal elapsed = qreal(d->lastElapsed + QDeclarativeItemPrivate::elapsed(d->lastPosTime)) / 1000.;
@@ -1017,7 +1017,7 @@ void QDeclarativePathView::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
         d->fixOffset();
     }
 
-    d->lastPosTime = QTime();
+    d->lastPosTime.invalidate();
     ungrabMouse();
 }
 
@@ -1059,8 +1059,8 @@ bool QDeclarativePathView::sendMouseEvent(QGraphicsSceneMouseEvent *event)
             grabMouse();
 
         return d->stealMouse;
-    } else if (!d->lastPosTime.isNull()) {
-        d->lastPosTime = QTime();
+    } else if (d->lastPosTime.isValid()) {
+        d->lastPosTime.invalidate();
     }
     return false;
 }
diff --git a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
index 3abb2f4..a0d2610 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepathview_p_p.h
@@ -97,6 +97,7 @@ public:
         q->setFlag(QGraphicsItem::ItemIsFocusScope);
         q->setFiltersChildEvents(true);
         q->connect(&tl, SIGNAL(updated()), q, SLOT(ticked()));
+        lastPosTime.invalidate();
     }
 
     void itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) {
@@ -154,7 +155,7 @@ public:
     bool autoHighlight : 1;
     bool highlightUp : 1;
     bool layoutScheduled : 1;
-    QTime lastPosTime;
+    QElapsedTimer lastPosTime;
     QPointF lastPos;
     qreal dragMargin;
     qreal deceleration;
-- 
cgit v0.12


From 0da153d47da2dcc59b33bc47ea949ceaf3189579 Mon Sep 17 00:00:00 2001
From: Joona Petrell <joona.t.petrell@nokia.com>
Date: Fri, 28 May 2010 14:06:41 +1000
Subject: Active window focus gain should not open virtual keypad

Task-number:
Reviewed-by: Martin Jones
---
 src/declarative/QmlChanges.txt                              |  3 +++
 src/declarative/graphicsitems/qdeclarativetextedit.cpp      |  2 +-
 src/declarative/graphicsitems/qdeclarativetextinput.cpp     |  2 +-
 .../qdeclarativetextedit/tst_qdeclarativetextedit.cpp       | 13 +++++++++++--
 .../qdeclarativetextinput/tst_qdeclarativetextinput.cpp     | 13 +++++++++++--
 5 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 3eed8d6..142920c 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -1,6 +1,9 @@
 =============================================================================
 The changes below are pre Qt 4.7.0 RC
 
+TextInput and TextEdit: 
+   - showInputPanelOnFocus property added
+   - openSoftwareInputPanel() and closeSoftwareInputPanel() functions added
 Flickable:
    - overShoot is replaced by boundsBehavior enumeration
    - flickingHorizontally and flickingVertically properties added
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 167db77..9ccb8d2 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -1335,7 +1335,7 @@ void QDeclarativeTextEdit::setShowInputPanelOnFocus(bool showOnFocus)
 void QDeclarativeTextEdit::focusInEvent(QFocusEvent *event)
 {
     Q_D(const QDeclarativeTextEdit);
-    if (d->showInputPanelOnFocus && !isReadOnly()) {
+    if (d->showInputPanelOnFocus && !isReadOnly() && event->reason() != Qt::ActiveWindowFocusReason) {
         openSoftwareInputPanel();
     }
     QDeclarativePaintedItem::focusInEvent(event);
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 18e3595..9c70ea9 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -1282,7 +1282,7 @@ void QDeclarativeTextInput::setShowInputPanelOnFocus(bool showOnFocus)
 void QDeclarativeTextInput::focusInEvent(QFocusEvent *event)
 {
     Q_D(const QDeclarativeTextInput);
-    if (d->showInputPanelOnFocus && !isReadOnly()) {
+    if (d->showInputPanelOnFocus && !isReadOnly() && event->reason() != Qt::ActiveWindowFocusReason) {
         openSoftwareInputPanel();
     }
     QDeclarativePaintedItem::focusInEvent(event);
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index 0df28d0..d3e3c3a 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -915,9 +915,18 @@ void tst_qdeclarativetextedit::sendRequestSoftwareInputPanelEvent()
     edit.setFocus(false);
     QCOMPARE(ic.openInputPanelReceived, false);
     QCOMPARE(ic.closeInputPanelReceived, true);
+    ic.closeInputPanelReceived = false;
+
+    // active window focus reason should not cause input panel to open
+    QGraphicsObject * editObject = qobject_cast<QGraphicsObject*>(&edit);
+    editObject->setFocus(Qt::ActiveWindowFocusReason);
+    QCOMPARE(ic.openInputPanelReceived, false);
+    QCOMPARE(ic.closeInputPanelReceived, false);
+
+    // and input panel should not open if focus has already been set
     edit.setFocus(true);
-    QCOMPARE(ic.openInputPanelReceived, true);
-    QCOMPARE(ic.closeInputPanelReceived, true);
+    QCOMPARE(ic.openInputPanelReceived, false);
+    QCOMPARE(ic.closeInputPanelReceived, false);
 
     edit.setShowInputPanelOnFocus(true);
     QCOMPARE(inputPanelonFocusSpy.count(),2);
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 155223d..c01cfa5 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -819,9 +819,18 @@ void tst_qdeclarativetextinput::sendRequestSoftwareInputPanelEvent()
     input.setFocus(false);
     QCOMPARE(ic.openInputPanelReceived, false);
     QCOMPARE(ic.closeInputPanelReceived, true);
+    ic.closeInputPanelReceived = false;
+
+    // active window focus reason should not cause input panel to open
+    QGraphicsObject * inputObject = qobject_cast<QGraphicsObject*>(&input);
+    inputObject->setFocus(Qt::ActiveWindowFocusReason);
+    QCOMPARE(ic.openInputPanelReceived, false);
+    QCOMPARE(ic.closeInputPanelReceived, false);
+
+    // and input panel should not open if focus has already been set
     input.setFocus(true);
-    QCOMPARE(ic.openInputPanelReceived, true);
-    QCOMPARE(ic.closeInputPanelReceived, true);
+    QCOMPARE(ic.openInputPanelReceived, false);
+    QCOMPARE(ic.closeInputPanelReceived, false);
 
     input.setShowInputPanelOnFocus(true);
     QCOMPARE(inputPanelonFocusSpy.count(),2);
-- 
cgit v0.12


From f5ff803e09ffbc73a1167d3f5a202af4a9767564 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Fri, 28 May 2010 16:03:30 +1000
Subject: Add missign license headers.

Reviewed-by: Trust Me
---
 mkspecs/symbian/linux-armcc/qplatformdefs.h | 41 +++++++++++++++++++++++++++++
 mkspecs/symbian/linux-gcce/qplatformdefs.h  | 41 +++++++++++++++++++++++++++++
 2 files changed, 82 insertions(+)

diff --git a/mkspecs/symbian/linux-armcc/qplatformdefs.h b/mkspecs/symbian/linux-armcc/qplatformdefs.h
index db67648..3b7d023 100644
--- a/mkspecs/symbian/linux-armcc/qplatformdefs.h
+++ b/mkspecs/symbian/linux-armcc/qplatformdefs.h
@@ -1 +1,42 @@
+/****************************************************************************
+**
+** 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 mkspecs 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 "../../common/symbian/qplatformdefs.h"
diff --git a/mkspecs/symbian/linux-gcce/qplatformdefs.h b/mkspecs/symbian/linux-gcce/qplatformdefs.h
index 4a658c5..fcbd9ea 100644
--- a/mkspecs/symbian/linux-gcce/qplatformdefs.h
+++ b/mkspecs/symbian/linux-gcce/qplatformdefs.h
@@ -1,2 +1,43 @@
+/****************************************************************************
+**
+** 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 mkspecs 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 "../../common/symbian/qplatformdefs.h"
 
-- 
cgit v0.12


From aaf3e8013d21b7f9247da7751a340b75d1deedc2 Mon Sep 17 00:00:00 2001
From: Rhys Weatherley <rhys.weatherley@nokia.com>
Date: Fri, 28 May 2010 17:40:08 +1000
Subject: Make QGLBuffer copiable

Reviewed-by: Gunnar
---
 src/opengl/qglbuffer.cpp | 92 +++++++++++++++++++++++++++++++++++++++++++-----
 src/opengl/qglbuffer.h   |  9 +++--
 2 files changed, 90 insertions(+), 11 deletions(-)

diff --git a/src/opengl/qglbuffer.cpp b/src/opengl/qglbuffer.cpp
index 223243c..d6e0109 100644
--- a/src/opengl/qglbuffer.cpp
+++ b/src/opengl/qglbuffer.cpp
@@ -42,6 +42,7 @@
 #include <QtOpenGL/qgl.h>
 #include <QtOpenGL/private/qgl_p.h>
 #include <QtOpenGL/private/qglextensions_p.h>
+#include <QtCore/qatomic.h>
 #include "qglbuffer.h"
 
 QT_BEGIN_NAMESPACE
@@ -55,6 +56,20 @@ QT_BEGIN_NAMESPACE
     Buffer objects are created in the GL server so that the
     client application can avoid uploading vertices, indices,
     texture image data, etc every time they are needed.
+
+    QGLBuffer objects can be copied around as a reference to the
+    underlying GL buffer object:
+
+    \code
+    QGLBuffer buffer1(QGLBuffer::IndexBuffer);
+    buffer1.create();
+
+    QGLBuffer buffer2 = buffer1;
+    \endcode
+
+    QGLBuffer performs a shallow copy when objects are copied in this
+    manner, but does not implement copy-on-write semantics.  The original
+    object will be affected whenever the copy is modified.
 */
 
 /*!
@@ -116,13 +131,15 @@ class QGLBufferPrivate
 {
 public:
     QGLBufferPrivate(QGLBuffer::Type t)
-        : type(t),
+        : ref(1),
+          type(t),
           guard(0),
           usagePattern(QGLBuffer::StaticDraw),
           actualUsagePattern(QGLBuffer::StaticDraw)
     {
     }
 
+    QAtomicInt ref;
     QGLBuffer::Type type;
     QGLSharedResourceGuard guard;
     QGLBuffer::UsagePattern usagePattern;
@@ -130,6 +147,19 @@ public:
 };
 
 /*!
+    Constructs a new buffer object of type QGLBuffer::VertexBuffer.
+
+    Note: this constructor just creates the QGLBuffer instance.  The actual
+    buffer object in the GL server is not created until create() is called.
+
+    \sa create()
+*/
+QGLBuffer::QGLBuffer()
+    : d_ptr(new QGLBufferPrivate(QGLBuffer::VertexBuffer))
+{
+}
+
+/*!
     Constructs a new buffer object of \a type.
 
     Note: this constructor just creates the QGLBuffer instance.  The actual
@@ -142,6 +172,18 @@ QGLBuffer::QGLBuffer(QGLBuffer::Type type)
 {
 }
 
+/*!
+    Constructs a shallow copy of \a other.
+
+    Note: QGLBuffer does not implement copy-on-write semantics,
+    so \a other will be affected whenever the copy is modified.
+*/
+QGLBuffer::QGLBuffer(const QGLBuffer &other)
+    : d_ptr(other.d_ptr)
+{
+    d_ptr->ref.ref();
+}
+
 #define ctx d->guard.context()
 
 /*!
@@ -150,13 +192,27 @@ QGLBuffer::QGLBuffer(QGLBuffer::Type type)
 */
 QGLBuffer::~QGLBuffer()
 {
-    Q_D(QGLBuffer);
-    GLuint bufferId = d->guard.id();
-    if (bufferId) {
-        // Switch to the original creating context to destroy it.
-        QGLShareContextScope scope(d->guard.context());
-        glDeleteBuffers(1, &bufferId);
+    if (!d_ptr->ref.deref()) {
+        destroy();
+        delete d_ptr;
+    }
+}
+
+/*!
+    Assigns a shallow copy of \a other to this object.
+
+    Note: QGLBuffer does not implement copy-on-write semantics,
+    so \a other will be affected whenever the copy is modified.
+*/
+QGLBuffer &QGLBuffer::operator=(const QGLBuffer &other)
+{
+    if (d_ptr != other.d_ptr) {
+        other.d_ptr->ref.ref();
+        if (!d_ptr->ref.deref())
+            destroy();
+        d_ptr = other.d_ptr;
     }
+    return *this;
 }
 
 /*!
@@ -215,7 +271,7 @@ void QGLBuffer::setUsagePattern(QGLBuffer::UsagePattern value)
     This function will return false if the GL implementation
     does not support buffers, or there is no current QGLContext.
 
-    \sa isCreated(), allocate(), write()
+    \sa isCreated(), allocate(), write(), destroy()
 */
 bool QGLBuffer::create()
 {
@@ -242,7 +298,7 @@ bool QGLBuffer::create()
 /*!
     Returns true if this buffer has been created; false otherwise.
 
-    \sa create()
+    \sa create(), destroy()
 */
 bool QGLBuffer::isCreated() const
 {
@@ -251,6 +307,24 @@ bool QGLBuffer::isCreated() const
 }
 
 /*!
+    Destroys this buffer object, including the storage being
+    used in the GL server.  All references to the buffer will
+    become invalid.
+*/
+void QGLBuffer::destroy()
+{
+    Q_D(QGLBuffer);
+    GLuint bufferId = d->guard.id();
+    if (bufferId) {
+        // Switch to the original creating context to destroy it.
+        QGLShareContextScope scope(d->guard.context());
+        glDeleteBuffers(1, &bufferId);
+    }
+    d->guard.setId(0);
+    d->guard.setContext(0);
+}
+
+/*!
     Reads the \a count bytes in this buffer starting at \a offset
     into \a data.  Returns true on success; false if reading from
     the buffer is not supported.  Buffer reading is not supported
diff --git a/src/opengl/qglbuffer.h b/src/opengl/qglbuffer.h
index 2fe1f1f..a1b45ff 100644
--- a/src/opengl/qglbuffer.h
+++ b/src/opengl/qglbuffer.h
@@ -64,9 +64,13 @@ public:
         PixelUnpackBuffer   = 0x88EC  // GL_PIXEL_UNPACK_BUFFER
     };
 
+    QGLBuffer();
     explicit QGLBuffer(QGLBuffer::Type type);
+    QGLBuffer(const QGLBuffer &other);
     ~QGLBuffer();
 
+    QGLBuffer &operator=(const QGLBuffer &other);
+
     enum UsagePattern
     {
         StreamDraw          = 0x88E0, // GL_STREAM_DRAW
@@ -95,6 +99,8 @@ public:
     bool create();
     bool isCreated() const;
 
+    void destroy();
+
     bool bind() const;
     void release() const;
 
@@ -114,9 +120,8 @@ public:
     bool unmap();
 
 private:
-    QScopedPointer<QGLBufferPrivate> d_ptr;
+    QGLBufferPrivate *d_ptr;
 
-    Q_DISABLE_COPY(QGLBuffer)
     Q_DECLARE_PRIVATE(QGLBuffer)
 };
 
-- 
cgit v0.12


From b9d899339118f24b34182e7dbe7aed5956d927e7 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Tue, 25 May 2010 15:16:38 +0200
Subject: add test for QMetaMethod::invoke

---
 tests/auto/qmetaobject/tst_qmetaobject.cpp | 51 ++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/tests/auto/qmetaobject/tst_qmetaobject.cpp b/tests/auto/qmetaobject/tst_qmetaobject.cpp
index c0b1303..b6d4558 100644
--- a/tests/auto/qmetaobject/tst_qmetaobject.cpp
+++ b/tests/auto/qmetaobject/tst_qmetaobject.cpp
@@ -172,6 +172,8 @@ private slots:
     void stdSet();
     void classInfo();
 
+    void metaMethod();
+
 signals:
     void value6Changed();
     void value7Changed(const QString &);
@@ -886,5 +888,54 @@ void tst_QMetaObject::classInfo()
     QCOMPARE(QLatin1String(b.metaObject()->classInfo(index).value()), QLatin1String("Christopher Pike"));
 }
 
+void tst_QMetaObject::metaMethod()
+{
+    QString str("foo");
+    QString ret("bar");
+    QMetaMethod method;
+    QVERIFY(!method.invoke(this));
+    QVERIFY(!method.invoke(this, Q_ARG(QString, str)));
+    QVERIFY(!method.invoke(this, Q_RETURN_ARG(QString, ret), Q_ARG(QString, str)));
+    QCOMPARE(str, QString("foo"));
+    QCOMPARE(ret, QString("bar"));
+
+
+    QtTestObject obj;
+    QString t1("1"); QString t2("2"); QString t3("3"); QString t4("4"); QString t5("5");
+    QString t6("6"); QString t7("7"); QString t8("8"); QString t9("9"); QString t10("X");
+
+    int index = QtTestObject::staticMetaObject.indexOfMethod("sl5(QString,QString,QString,QString,QString)");
+    QVERIFY(index > 0);
+    method = QtTestObject::staticMetaObject.method(index);
+    //wrong args
+    QVERIFY(!method.invoke(&obj, Q_ARG(QString, "1"), Q_ARG(QString, "2"), Q_ARG(QString, "3"), Q_ARG(QString, "4")));
+    //QVERIFY(!method.invoke(&obj, Q_ARG(QString, "1"), Q_ARG(QString, "2"), Q_ARG(QString, "3"), Q_ARG(QString, "4"), Q_ARG(QString, "5"), Q_ARG(QString, "6")));
+    //QVERIFY(!method.invoke(&obj, Q_ARG(QString, "1"), Q_ARG(QString, "2"), Q_ARG(QString, "3"), Q_ARG(QString, "4"), Q_ARG(int, 5)));
+    QVERIFY(!method.invoke(&obj, Q_RETURN_ARG(QString, ret), Q_ARG(QString, "1"), Q_ARG(QString, "2"), Q_ARG(QString, "3"), Q_ARG(QString, "4"), Q_ARG(QString, "5")));
+
+    //wrong object
+    //QVERIFY(!method.invoke(this, Q_ARG(QString, "1"), Q_ARG(QString, "2"), Q_ARG(QString, "3"), Q_ARG(QString, "4"), Q_ARG(QString, "5")));
+    QVERIFY(!method.invoke(0, Q_ARG(QString, "1"), Q_ARG(QString, "2"), Q_ARG(QString, "3"), Q_ARG(QString, "4"), Q_ARG(QString, "5")));
+    QCOMPARE(ret, QString("bar"));
+    QCOMPARE(obj.slotResult, QString());
+
+    QVERIFY(method.invoke(&obj, Q_ARG(QString, "1"), Q_ARG(QString, "2"), Q_ARG(QString, "3"), Q_ARG(QString, "4"), Q_ARG(QString, "5")));
+    QCOMPARE(obj.slotResult, QString("sl5:12345"));
+
+    index = QtTestObject::staticMetaObject.indexOfMethod("sl13(QList<QString>)");
+    QVERIFY(index > 0);
+    QMetaMethod sl13 = QtTestObject::staticMetaObject.method(index);
+    QList<QString> returnValue, argument;
+    argument << QString("one") << QString("two") << QString("three");
+    //wrong object
+    //QVERIFY(!sl13.invoke(this, Q_RETURN_ARG(QList<QString>, returnValue), Q_ARG(QList<QString>, argument)));
+    QVERIFY(!sl13.invoke(0,  Q_RETURN_ARG(QList<QString>, returnValue), Q_ARG(QList<QString>, argument)));
+    QCOMPARE(returnValue, QList<QString>());
+
+    QVERIFY(sl13.invoke(&obj, Q_RETURN_ARG(QList<QString>, returnValue), Q_ARG(QList<QString>, argument)));
+    QCOMPARE(returnValue, argument);
+    QCOMPARE(obj.slotResult, QString("sl13"));
+}
+
 QTEST_MAIN(tst_QMetaObject)
 #include "tst_qmetaobject.moc"
-- 
cgit v0.12


From 49a5cf7cd44584e04d1f54f3fbd0d5c86fe55c83 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Fri, 28 May 2010 11:49:20 +0200
Subject: QMetaMethod::invoke: Document that the function does not check the
 arguments

And added an assert to ease debugging

Task-number: QTBUG-10945
---
 src/corelib/kernel/qmetaobject.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 4ad78fd..79a38cd 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -1454,6 +1454,11 @@ QMetaMethod::MethodType QMetaMethod::methodType() const
     If the "compute" slot does not take exactly one QString, one int
     and one double in the specified order, the call will fail.
 
+    \warning this method will not test the validity of the arguments: \a object
+    must be an instance of the class of the QMetaObject of which this QMetaMethod
+    has been constructed with.  The arguments must have the same type as the ones
+    expected by the method, else, the behaviour is undefined.
+
     \sa Q_ARG(), Q_RETURN_ARG(), qRegisterMetaType(), QMetaObject::invokeMethod()
 */
 bool QMetaMethod::invoke(QObject *object,
@@ -1473,6 +1478,8 @@ bool QMetaMethod::invoke(QObject *object,
     if (!object || !mobj)
         return false;
 
+    Q_ASSERT(mobj->cast(object));
+
     // check return type
     if (returnValue.data()) {
         const char *retType = typeName();
-- 
cgit v0.12


From fa7dfb24c2d165cad438eb28c83ac2fd60831b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Thu, 27 May 2010 16:07:46 +0200
Subject: Improve precision of testlib benchmarking.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

20 ms is a bit too to get a precise measurement due to limited timer
resolution. We increase the limit to 50 ms and introduce a warm-up iteration
to prevent any state or cache-related issues which can be hard to account
for in the tests.

On the N900 this seems to decrease the variance of test results by 30 %,
and fixes some cases where the results were way off due to hidden state.

Task-number: QT-3390
Reviewed-by: Morten Sørvig
---
 src/testlib/qbenchmarkmeasurement.cpp | 7 ++++++-
 src/testlib/qbenchmarkmeasurement_p.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/testlib/qbenchmarkmeasurement.cpp b/src/testlib/qbenchmarkmeasurement.cpp
index c03cbff..0a84792 100644
--- a/src/testlib/qbenchmarkmeasurement.cpp
+++ b/src/testlib/qbenchmarkmeasurement.cpp
@@ -66,7 +66,7 @@ qint64 QBenchmarkTimeMeasurer::stop()
 
 bool QBenchmarkTimeMeasurer::isMeasurementAccepted(qint64 measurement)
 {
-    return (measurement > 20);
+    return (measurement > 50);
 }
 
 int QBenchmarkTimeMeasurer::adjustIterationCount(int suggestion)
@@ -74,6 +74,11 @@ int QBenchmarkTimeMeasurer::adjustIterationCount(int suggestion)
     return suggestion; 
 }
 
+bool QBenchmarkTimeMeasurer::needsWarmupIteration()
+{
+    return true;
+}
+
 int QBenchmarkTimeMeasurer::adjustMedianCount(int)
 { 
     return 1; 
diff --git a/src/testlib/qbenchmarkmeasurement_p.h b/src/testlib/qbenchmarkmeasurement_p.h
index 8ad3613..932852c 100644
--- a/src/testlib/qbenchmarkmeasurement_p.h
+++ b/src/testlib/qbenchmarkmeasurement_p.h
@@ -84,6 +84,7 @@ public:
     bool isMeasurementAccepted(qint64 measurement);
     int adjustIterationCount(int sugestion);
     int adjustMedianCount(int suggestion);
+    bool needsWarmupIteration();
     QTest::QBenchmarkMetric metricType();
 private:
     QTime time;
-- 
cgit v0.12


From 60c12264b0ff01bb4888323b3acda0bc581021a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Fri, 28 May 2010 11:55:47 +0200
Subject: Fixed bug where testlib would not respect the -iterations option.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Reviewed-by: Morten Sørvig
---
 src/testlib/qbenchmark.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/testlib/qbenchmark.cpp b/src/testlib/qbenchmark.cpp
index 23c5639..c88ecb0 100644
--- a/src/testlib/qbenchmark.cpp
+++ b/src/testlib/qbenchmark.cpp
@@ -159,7 +159,7 @@ void QBenchmarkTestMethodData::setResult(
     if (QBenchmarkGlobalData::current->iterationCount != -1)
         accepted = true;
 
-    if (QBenchmarkTestMethodData::current->runOnce || !setByMacro) {
+    else if (QBenchmarkTestMethodData::current->runOnce || !setByMacro) {
         iterationCount = 1;
         accepted = true;
     }
-- 
cgit v0.12


From 71425f24893fecb15cd4d01e6dc3d391051e9d6b Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Fri, 28 May 2010 11:27:27 +0200
Subject: fix visibility detection for g++ with a qualified binary name

it may be called g++-4.4 (versioned) or x86_64-pc-linux-gnu-g++
(cross-compiler), so make the pattern just match anything with g++.
it may also be aliased to "c++", so catch that as well.
otoh, "gcc" would be a poor choice for QMAKE_CXX, so don't recognize
that.

Reviewed-by: thiago
Task-number: QTBUG-11065
---
 config.tests/unix/fvisibility.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.tests/unix/fvisibility.test b/config.tests/unix/fvisibility.test
index 99e6fbe..27c6841 100755
--- a/config.tests/unix/fvisibility.test
+++ b/config.tests/unix/fvisibility.test
@@ -34,7 +34,7 @@ EOF
 
 
 case "$COMPILER" in
-gcc|g++)
+*g++*|*c++*)
     CMDLINE="-fvisibility=hidden"
     RunCompileTest
    ;;
-- 
cgit v0.12


From df17b26b40717e35a534e373b2070d37817cb4a3 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Fri, 28 May 2010 13:50:28 +0200
Subject: tst_qtextcodec: Fix broken merge conflict resolution

---
 config.tests/unix/fvisibility.test | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config.tests/unix/fvisibility.test b/config.tests/unix/fvisibility.test
index 99e6fbe..5bc4b93 100755
--- a/config.tests/unix/fvisibility.test
+++ b/config.tests/unix/fvisibility.test
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -x
 
 FVISIBILITY_SUPPORT=no
 COMPILER=$1
@@ -34,7 +34,7 @@ EOF
 
 
 case "$COMPILER" in
-gcc|g++)
+*g++*|*c++*)
     CMDLINE="-fvisibility=hidden"
     RunCompileTest
    ;;
-- 
cgit v0.12


From f9ca637a41ae2f8f5a5439766073bf19cbc7d9e2 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Fri, 28 May 2010 14:06:05 +0200
Subject: tst_qtextcodec: Fix broken merge conflict resolution

---
 tests/auto/qtextcodec/tst_qtextcodec.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/auto/qtextcodec/tst_qtextcodec.cpp b/tests/auto/qtextcodec/tst_qtextcodec.cpp
index c91201e..0946c93 100644
--- a/tests/auto/qtextcodec/tst_qtextcodec.cpp
+++ b/tests/auto/qtextcodec/tst_qtextcodec.cpp
@@ -2001,7 +2001,7 @@ void tst_QTextCodec::threadSafety()
 
     QCOMPARE(res.results(), codecList);
     QCOMPARE(res2.results(), mibList);
-#endif
+#else
     QSKIP("This function is not yet supported with QT_NO_CONCURRENT defined.", SkipAll);
 #endif
 }
-- 
cgit v0.12


From b0b4ca6547807fc602176c1ad262f15f6858116a Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@nokia.com>
Date: Fri, 28 May 2010 15:17:04 +0200
Subject: qdoc: Fixed the model/view programming page; tried a style change.

---
 .../model-view-programming.qdoc                    | 463 +++++++--------------
 doc/src/template/style/style.css                   |   7 +-
 tools/qdoc3/doc.cpp                                |  12 -
 tools/qdoc3/htmlgenerator.cpp                      |   3 +
 4 files changed, 166 insertions(+), 319 deletions(-)

diff --git a/doc/src/frameworks-technologies/model-view-programming.qdoc b/doc/src/frameworks-technologies/model-view-programming.qdoc
index 7568981..3bac8ce 100644
--- a/doc/src/frameworks-technologies/model-view-programming.qdoc
+++ b/doc/src/frameworks-technologies/model-view-programming.qdoc
@@ -46,71 +46,13 @@
 
 /*!
     \page model-view-programming.html
-    \nextpage An Introduction to Model/View Programming
-    \startpage index.html Qt Reference Documentation
 
     \title Model/View Programming
-    \brief A guide to the extensible model/view architecture used by Qt's
-    item view classes.
+    \brief A guide to Qt's extensible model/view architecture.
 
-    \ingroup frameworks-technologies
+    \section1 Introduction to Model/View Programming
 
-    \list
-    \o \l{An Introduction to Model/View Programming}
-      \tableofcontents{1 An Introduction to Model/View Programming}
-    \o \l{Using Models and Views}
-      \tableofcontents{1 Using Models and Views}
-    \o \l{Model Classes}
-      \tableofcontents{1 Model Classes}
-    \o \l{Creating New Models}
-      \tableofcontents{1 Creating New Models}
-    \o \l{View Classes}
-      \tableofcontents{1 View Classes}
-    \o \l{Handling Selections in Item Views}
-      \tableofcontents{1 Handling Selections in Item Views}
-    \o \l{Delegate Classes}
-      \tableofcontents{1 Delegate Classes}
-    \o \l{Item View Convenience Classes}
-      \tableofcontents{1 Item View Convenience Classes}
-    \o \l{Using Drag and Drop with Item Views}
-      \tableofcontents{1 Using Drag and Drop with Item Views}
-    \o \l{Proxy Models}
-      \tableofcontents{1 Proxy Models}
-    \o \l{Model Subclassing Reference}
-      \tableofcontents{1 Model Subclassing Reference}
-    \endlist
-
-    \keyword Model/View Classes
-    \section1 All Model/View Classes
-
-    These classes use the model/view design pattern in which the
-    underlying data (in the model) is kept separate from the way the data
-    is presented and manipulated by the user (in the view).
-
-    \annotatedlist model-view
-
-    \section1 Related Examples
-
-    \list
-    \o \l{itemviews/dirview}{Dir View}
-    \o \l{itemviews/spinboxdelegate}{Spin Box Delegate}
-    \o \l{itemviews/pixelator}{Pixelator}
-    \o \l{itemviews/simpletreemodel}{Simple Tree Model}
-    \o \l{itemviews/chart}{Chart}
-    \endlist
-*/
-
-/*!
-    \page model-view-introduction.html
-    \previouspage Model/View Programming
-    \nextpage Using Models and Views
-    \startpage index.html Qt Reference Documentation
-
-    \title An Introduction to Model/View Programming
-
-    \tableofcontents
-
-    Qt 4 introduces a new set of item view classes that use a model/view
+    Qt 4 introduced a new set of item view classes that use a model/view
     architecture to manage the relationship between data and the way it
     is presented to the user. The separation of functionality introduced by
     this architecture gives developers greater flexibility to customize the
@@ -121,7 +63,7 @@
     view system. Each of the components in the architecture is explained,
     and examples are given that show how to use the classes provided.
 
-    \section1 The Model/View Architecture
+    \section2 The model/view architecture
 
     Model-View-Controller (MVC) is a design pattern originating from
     Smalltalk that is often used when building user interfaces.
@@ -185,7 +127,7 @@
        model and view about the state of the editor.
     \endlist
 
-    \section2 Models
+    \section3 Models
 
     All item models are based on the QAbstractItemModel class. This class
     defines an interface that is used by views and delegates to access data.
@@ -225,7 +167,7 @@
     QAbstractItemModel, QAbstractListModel, or QAbstractTableModel to create
     your own custom models.
 
-    \section2 Views
+    \section3 Views
 
     Complete implementations are provided for different kinds of
     views: QListView displays a list of items, QTableView displays data
@@ -237,7 +179,7 @@
 
     The available views are examined in the section on \l{View Classes}.
 
-    \section2 Delegates
+    \section3 Delegates
 
     QAbstractItemDelegate is the abstract base class for delegates in the
     model/view framework. Since Qt 4.4, the default delegate implementation is
@@ -251,7 +193,7 @@
 
     Delegates are described in the section on \l{Delegate Classes}.
 
-    \section2 Sorting
+    \section3 Sorting
 
     There are two ways of approaching sorting in the model/view
     architecture; which approach to choose depends on your underlying
@@ -272,7 +214,7 @@
     before presenting the data in the view. This is covered in detail
     in the section on \l {Proxy Models}.
 
-    \section2 Convenience Classes
+    \section3 Convenience classes
 
     A number of \e convenience classes are derived from the standard view
     classes for the benefit of applications that rely on Qt's item-based
@@ -293,24 +235,13 @@
     classes, such as QListView, QTableView, and QTreeView with
     QStandardItemModel.
 
-    \section1 The Model/View Components
+    \section1 Using models and views
 
-    The following sections describe the way in which the model/view pattern
-    is used in Qt. Each section provides an example of use, and is followed
-    by a section showing how you can create new components.
-*/
-
-/*!
-    \page model-view-using.html
-    \contentspage model-view-programming.html Contents
-    \previouspage An Introduction to Model/View Programming
-    \nextpage Model Classes
+    The following sections explain how to use the model/view pattern
+    in Qt. Each section includes an an example and is followed by a
+    section showing how to create new components.
 
-    \title Using Models and Views
-
-    \tableofcontents
-
-    \section1 Introduction
+    \section2 Two models included in Qt
 
     Two of the standard models provided by Qt are QStandardItemModel and
     QFileSystemModel. QStandardItemModel is a multi-purpose model that can be
@@ -325,7 +256,7 @@
     to set up a model for use with ready-made views, and explore how to
     manipulate data using model indexes.
 
-    \section1 Using Views with an Existing Model
+    \section2 Using views with an existing model
 
     The QListView and QTreeView classes are the most suitable views
     to use with QFileSystemModel. The example presented below displays the
@@ -361,7 +292,7 @@
 
     The \c index() function used in this case is unique to QFileSystemModel; we
     supply it with a directory and it returns a model index. Model indexes are
-    discussed in the \l{Model Classes} chapter.
+    discussed in \l{Model Classes}.
 
     The rest of the function just displays the views within a splitter
     widget, and runs the application's event loop:
@@ -369,23 +300,15 @@
     \snippet doc/src/snippets/shareddirmodel/main.cpp 8
 
     In the above example, we neglected to mention how to handle selections
-    of items. This subject is covered in more detail in the chapter on
-    \l{Handling Selections in Item Views}. Before examining how selections
-    are handled, you may find it useful to read the \l{Model Classes} chapter
-    which describes the concepts used in the model/view framework.
-*/
+    of items. This subject is covered in more detail in the section about
+    \l{Handling Selections in Item Views}. 
 
-/*!
-    \page model-view-model.html
-    \contentspage model-view-programming.html Contents
-    \previouspage Using Models and Views
-    \nextpage Creating New Models
-
-    \title Model Classes
+    \section1 Model classes
 
-    \tableofcontents
+    Before examining how selections are handled, you may find it
+    useful to examine the concepts used in the model/view framework.
 
-    \section1 Basic Concepts
+    \section2 Basic concepts
 
     In the model/view architecture, the model provides a standard interface
     that views and delegates use to access data. In Qt, the standard
@@ -401,11 +324,11 @@
     Models also notify any attached views about changes to data through the
     signals and slots mechanism.
 
-    This chapter describes some basic concepts that are central to the way
+    This section describes some basic concepts that are central to the way
     item of data are accessed by other components via a model class. More
-    advanced concepts are discussed in later chapters.
+    advanced concepts are discussed in later sections.
 
-    \section2 Model Indexes
+    \section3 Model indexes
 
     To ensure that the representation of the data is kept separate from the
     way it is accessed, the concept of a \e{model index} is introduced. Each
@@ -435,7 +358,7 @@
     and the model index of a parent item. The following sections describe
     and explain these properties in detail.
 
-    \section2 Rows and Columns
+    \section3 Rows and columns
 
     In its most basic form, a model can be accessed as a simple table in which
     items are located by their row and column numbers. \e{This does not mean
@@ -468,7 +391,7 @@
     section.
     \endtable
 
-    \section2 Parents of Items
+    \section3 Parents of items
 
     The table-like interface to item data provided by models is ideal when
     using data in a table or list view; the row and column number system maps
@@ -501,7 +424,7 @@
     \snippet doc/src/snippets/code/doc_src_model-view-programming.qdoc 5
     \endtable
 
-    \section2 Item Roles
+    \section3 Item roles
 
     Items in a model can perform various \e roles for other components,
     allowing different kinds of data to be supplied for different situations.
@@ -534,7 +457,7 @@
     interpret or ignore this information as required. It is also possible to
     define additional roles for application-specific purposes.
 
-    \section2 Summary of Concepts
+    \section3 Summary
 
     \list
     \o Model indexes give views and delegates information about the location
@@ -546,17 +469,16 @@
        components, such as views and delegates.
     \o If a valid model index is specified for the parent item when an index is
        requested using \l{QAbstractItemModel::index()}{index()}, the index
-       returned will refer to an item beneath that parent item in the
-       model.
+       returned refers to an item beneath that parent item in the model.
        The index obtained refers to a child of that item.
     \o If an invalid model index is specified for the parent item when an index
        is requested using \l{QAbstractItemModel::index()}{index()}, the index
-       returned will refer to a top-level item in the model.
+       returned refers to a top-level item in the model.
     \o The \l{Qt::ItemDataRole}{role} distinguishes between the
        different kinds of data associated with an item.
     \endlist
 
-    \section2 Using Model Indexes
+    \section2 Using model indexes
 
     To demonstrate how data can be retrieved from a model, using model
     indexes, we set up a QFileSystemModel without a view and display the
@@ -610,26 +532,16 @@
        to the model.
     \endlist
 
+    \section2 Further reading
 
-    \section1 Further Reading
-
-    New models can be created by implementing the standard interface provided
-    by QAbstractItemModel. In the \l{Creating New Models} chapter, we will
-    demonstrate this by creating a convenient ready-to-use model for holding
-    lists of strings.
-*/
-
-/*!
-    \page model-view-view.html
-    \contentspage model-view-programming.html Contents
-    \previouspage Creating New Models
-    \nextpage Handling Selections in Item Views
+    New models can be created by implementing the standard interface
+    provided by QAbstractItemModel. In the \l{Creating New Models}
+    section, we demonstrate this by creating a convenient ready-to-use
+    model for holding lists of strings.
 
-    \title View Classes
+    \section1 View classes
 
-    \tableofcontents
-
-    \section1 Concepts
+    \section2 Concepts
 
     In the model/view architecture, the view obtains items of data from the
     model and presents them to the user. The way that the data is
@@ -668,7 +580,7 @@
     subclassed from the QHeaderView class to provide more specialized
     labels for views.
 
-    \section1 Using an Existing View
+    \section2 Using an existing view
 
     Qt provides three ready-to-use view classes that present data from
     models in ways that are familiar to most users.
@@ -686,7 +598,7 @@
     facilities, and can be customized to suit the needs of more specialized
     user interfaces.
 
-    \section2 Using a Model
+    \section3 Using a model
 
     We take the string list model that \l{Creating New Models}{we created as
     an example model}, set it up with some data, and construct a view to
@@ -697,8 +609,8 @@
 
     Note that the \c StringListModel is declared as a \l QAbstractItemModel.
     This allows us to use the abstract interface to the model, and
-    ensures that the code will still work even if we replace the string list
-    model with a different model in the future.
+    ensures that the code still works, even if we replace the string list
+    model with a different model.
 
     The list view provided by \l QListView is sufficient for presenting
     the items in the string list model. We construct the view, and set up
@@ -721,7 +633,7 @@
     list model. Since the model is editable, the view automatically allows
     each item in the list to be edited using the default delegate.
 
-    \section2 Using Multiple Views onto the Same Model
+    \section3 Using multiple views of a model
 
     Providing multiple views onto the same model is simply a matter of
     setting the same model for each view. In the following code we create
@@ -745,7 +657,7 @@
     selection model. This can be useful in certain situations but, for
     many applications, a shared selection model is desirable.
 
-    \section1 Handling Selections of Items
+    \section2 Handling selections of items
 
     The mechanism for handling selections of items within views is provided
     by the \l QItemSelectionModel class. All of the standard views construct
@@ -758,13 +670,12 @@
     when we want to provide multiple consistent views onto the same model
     data.
 
-    Generally, unless you are subclassing a model or view, you will not
-    need to manipulate the contents of selections directly. However, the
-    interface to the selection model can be accessed, if required, and
-    this is explored in the chapter on
-    \l{Handling Selections in Item Views}.
+    Generally, unless you are subclassing a model or view, you don't
+    need to manipulate the contents of selections directly. However,
+    the interface to the selection model can be accessed, if required,
+    and this is explored in \l{Handling Selections in Item Views}.
 
-    \section2 Sharing Selections Between Views
+    \section3 Sharing selections among views
 
     Although it is convenient that the view classes provide their own
     selection models by default, when we use more than one view onto the
@@ -788,19 +699,9 @@
     each view; for example, a contiguous selection in a table view can be
     represented as a fragmented set of highlighted items in a tree view.
 
-*/
-
-/*!
-    \page model-view-delegate.html
-    \contentspage model-view-programming.html Contents
-    \previouspage Handling Selections in Item Views
-    \nextpage Item View Convenience Classes
-
-    \title Delegate Classes
-
-    \tableofcontents
+    \section1 Delegate classes
 
-    \section1 Concepts
+    \section2 Concepts
 
     Unlike the Model-View-Controller pattern, the model/view design does not
     include a completely separate component for managing interaction with
@@ -821,13 +722,13 @@
 
     Editors for delegates can be implemented either by using widgets to manage
     the editing process or by handling events directly.
-    The first approach is covered later in this chapter, and it is also
+    The first approach is covered later in this section, and it is also
     shown in the \l{Spin Box Delegate Example}{Spin Box Delegate} example.
 
     The \l{Pixelator Example}{Pixelator} example shows how to create a
     custom delegate that performs specialized rendering for a table view.
 
-    \section1 Using an Existing Delegate
+    \section2 Using an existing delegate
 
     The standard views provided with Qt use instances of \l QItemDelegate
     to provide editing facilities. This default implementation of the
@@ -845,15 +746,15 @@
     necessary to use this function when setting the delegate for a custom
     view.
 
-    \section1 A Simple Delegate
+    \section2 A simple delegate
 
-    The delegate implemented here uses a \l QSpinBox to provide editing
-    facilities, and is mainly intended for use with models that display
-    integers. Although we set up a custom integer-based table model for
-    this purpose, we could easily have used \l QStandardItemModel instead
-    since the custom delegate will control data entry. We construct a
-    table view to display the contents of the model, and this will use
-    the custom delegate for editing.
+    The delegate implemented here uses a \l QSpinBox to provide
+    editing facilities, and is mainly intended for use with models
+    that display integers. Although we set up a custom integer-based
+    table model for this purpose, we could easily have used \l
+    QStandardItemModel instead, since the custom delegate controls
+    data entry. We construct a table view to display the contents of
+    the model, and this will use the custom delegate for editing.
 
     \img spinboxdelegate-example.png
 
@@ -866,7 +767,7 @@
     Note that no editor widgets are set up when the delegate is
     constructed. We only construct an editor widget when it is needed.
 
-    \section2 Providing an Editor
+    \section3 Providing an editor
 
     In this example, when the table view needs to provide an editor, it
     asks the delegate to provide an editor widget that is appropriate
@@ -906,7 +807,7 @@
     the model, in which case we would need to cast the widget to the
     appropriate type before accessing its member functions.
 
-    \section2 Submitting Data to the Model
+    \section3 Submitting data to the model
 
     When the user has finished editing the value in the spin box, the view
     asks the delegate to store the edited value in the model by calling the
@@ -935,7 +836,7 @@
     delegate with different kinds of models because \l{QVariant}
     provides sensible default values for unexpected data.
 
-    \section2 Updating the Editor's Geometry
+    \section3 Updating the editor's geometry
 
     It is the responsibility of the delegate to manage the editor's
     geometry. The geometry must be set when the editor is created, and
@@ -951,7 +852,7 @@
     position the editor in relation to the other elements in the item.
 
     \target EditingHints
-    \section2 Editing Hints
+    \section3 Editing hints
 
     After editing, delegates should provide hints to the other components
     about the result of the editing process, and provide hints that will
@@ -982,19 +883,10 @@
     Delegates do not have to emit these hints, but those that do not will
     be less integrated into applications, and will be less usable than
     those that emit hints to support common editing actions.
-*/
-
-/*!
-    \page model-view-selection.html
-    \contentspage model-view-programming.html Contents
-    \previouspage View Classes
-    \nextpage Delegate Classes
 
-    \title Handling Selections in Item Views
+    \section1 Handling selections in item views
 
-    \tableofcontents
-
-    \section1 Concepts
+    \section2 Concepts
 
     The selection model used in the item view classes offers many improvements
     over the selection model used in Qt 3. It provides a more general
@@ -1022,8 +914,7 @@
     after its application through the use of certain types of selection
     commands. These are discussed later in this section.
 
-
-    \section2 Current Item and Selected Items
+    \section3 Current item &amp selected items
 
     In a view, there is always a current item and a selected item - two
     independent states. An item can be the current item and selected at the
@@ -1068,8 +959,7 @@
     be informed of changes to the selection model via the signals and slots
     mechanism.
 
-
-    \section1 Using a Selection Model
+    \section2 Using a selection model
 
     The standard view classes provide default selection models that can
     be used in most applications. A selection model belonging to one view
@@ -1088,8 +978,7 @@
     each having a different effect on the selections already present in the
     selection model.
 
-
-    \section2 Selecting Items
+    \section3 Selecting items
 
     To demonstrate some of the principal features of selections, we construct
     an instance of a custom table model with 32 items in total, and open a
@@ -1122,12 +1011,12 @@
 
     The selection of items can be modified using various operations that
     are defined by the selection flags. The selection that results from
-    these operations may have a complex structure, but will be represented
+    these operations may have a complex structure, but it is represented
     efficiently by the selection model. The use of different selection
     flags to manipulate the selected items is described when we examine
     how to update a selection.
 
-    \section2 Reading the Selection State
+    \section3 Reading the selection state
 
     The model indexes stored in the selection model can be read using
     the \l{QItemSelectionModel::selectedIndexes()}{selectedIndexes()}
@@ -1176,7 +1065,7 @@
     Monitoring selections made by the user is straightforward with these
     signals, but we can also update the selection model directly.
 
-    \section2 Updating a Selection
+    \section3 Updating a selection
 
     Selection commands are provided by a combination of selection flags,
     defined by \l{QItemSelectionModel::SelectionFlag}.
@@ -1215,7 +1104,7 @@
     with a command that is a combination of
     \l{QItemSelectionModel::SelectionFlag}{Select} and
     \l{QItemSelectionModel::SelectionFlag}{Rows}, the
-    entire row containing the item referred to will be selected.
+    entire row containing the item referred to is selected.
     The following code demonstrates the use of the
     \l{QItemSelectionModel::SelectionFlag}{Rows} and
     \l{QItemSelectionModel::SelectionFlag}{Columns} flags:
@@ -1248,7 +1137,7 @@
     has the effect of resetting the selection model's collection of model
     indexes.
 
-    \section2 Selecting All Items in a Model
+    \section3 Selecting all items in a model
 
     To select all items in a model, it is necessary to create a
     selection for each level of the model that covers all items in that
@@ -1271,19 +1160,8 @@
     \l{QAbstractItemModel::hasChildren()}{hasChildren()} function is used to
     determine whether any given item is the parent of another level of
     items.
-*/
-
-/*!
-    \page model-view-creating-models.html
-    \contentspage model-view-programming.html Contents
-    \previouspage Model Classes
-    \nextpage View Classes
-
-    \title Creating New Models
 
-    \tableofcontents
-
-    \section1 Introduction
+    \section1 Creating new models
 
     The separation of functionality between the model/view components allows
     models to be created that can take advantage of existing views. This
@@ -1301,9 +1179,9 @@
     for interfaces to simpler non-hierarchical data structures, and are
     easier to use as a starting point for simple list and table models.
 
-    In this chapter, we create a simple read-only model to explore
+    In this section, we create a simple read-only model to explore
     the basic principles of the model/view architecture. Later in this
-    chapter, we will adapt this simple model so that items can be modified
+    section, we adapt this simple model so that items can be modified
     by the user.
 
     For an example of a more complex model, see the
@@ -1312,21 +1190,21 @@
     The requirements of QAbstractItemModel subclasses is described in more
     detail in the \l{Model Subclassing Reference} document.
 
-    \section1 Designing a Model
+    \section2 Designing a model
 
-    When creating a new model for an existing data structure, it is important
-    to consider which type of model should be used to provide an interface
-    onto the data. If the data structure can be represented as a
-    list or table of items, you can subclass QAbstractListModel or
-    QAbstractTableModel since these classes provide suitable default
-    implementations for many functions.
+    When creating a new model for an existing data structure, it is
+    important to consider which type of model should be used to
+    provide an interface onto the data. If the data structure can be
+    represented as a list or table of items, you can subclass
+    QAbstractListModel or QAbstractTableModel since these classes
+    provide suitable default implementations for many functions.
 
-    However, if the underlying data structure can only be represented by a
-    hierarchical tree structure, it is necessary to subclass
+    However, if the underlying data structure can only be represented
+    by a hierarchical tree structure, it is necessary to subclass
     QAbstractItemModel. This approach is taken in the
     \l{itemviews/simpletreemodel}{Simple Tree Model} example.
 
-    In this chapter, we will implement a simple model based on a list of
+    In this section, we implement a simple model based on a list of
     strings, so the QAbstractListModel provides an ideal base class on
     which to build.
 
@@ -1338,7 +1216,7 @@
     interact with it using the standard API. The model described below
     provides a custom constructor for just this purpose.
 
-    \section1 A Read-Only Example Model
+    \section2 A read-only example model
 
     The model implemented here is a simple, non-hierarchical, read-only data
     model based on the standard QStringListModel class. It has a \l QStringList
@@ -1355,7 +1233,6 @@
     functions as there are default implementations for most of the
     interface. The class declaration is as follows:
 
-
     \snippet doc/src/snippets/stringlistmodel/model.h 0
     \snippet doc/src/snippets/stringlistmodel/model.h 1
     \codeline
@@ -1379,7 +1256,7 @@
     The list of strings is stored internally in the \c stringList private
     member variable.
 
-    \section2 Dimensions of The Model
+    \section3 Dimensions of the model
 
     We want the number of rows in the model to be the same as the number of
     strings in the string list. We implement the
@@ -1394,7 +1271,7 @@
     reimplement the \l{QAbstractItemModel::columnCount()}{columnCount()}
     function.
 
-    \section2 Model Headers and Data
+    \section3 Model headers &amp data
 
     For items in the view, we want to return the strings in the string list.
     The \l{QAbstractItemModel::data()}{data()} function is responsible for
@@ -1433,7 +1310,7 @@
     \l{Qt::ItemDataRole}{ToolTipRole} that views can use to
     display information about items in a tooltip.
 
-    \section1 An Editable Model
+    \section2 An editable model
 
     The read-only model shows how simple choices could be presented to the
     user but, for many applications, an editable list model is much more
@@ -1447,7 +1324,7 @@
     \snippet doc/src/snippets/stringlistmodel/model.h 2
     \snippet doc/src/snippets/stringlistmodel/model.h 3
 
-    \section2 Making the Model Editable
+    \section3 Making the model editable
 
     A delegate checks whether an item is editable before creating an
     editor. The model must let the delegate know that its items are
@@ -1473,7 +1350,7 @@
     \l{Qt::ItemDataRole}{EditRole} since this is the role used by the
     standard item delegate. For boolean values, however, you can use
     Qt::CheckStateRole and set the Qt::ItemIsUserCheckable flag; a
-    checkbox will then be used for editing the value. The underlying
+    checkbox is then used for editing the value. The underlying
     data in this model is the same for all roles, so this detail just
     makes it easier to integrate the model with standard components.
 
@@ -1487,7 +1364,7 @@
 
     \snippet doc/src/snippets/stringlistmodel/model.cpp 1
 
-    \section2 Inserting and Removing Rows
+    \section3 Inserting &amp removing rows
 
     It is possible to change the number of rows and columns in a model. In the
     string list model it only makes sense to change the number of rows, so we
@@ -1536,39 +1413,29 @@
     operation and let other components know that the dimensions of the model
     have changed.
 
-    \section1 Next Steps
+    \section2 Next steps
 
     We can display the data provided by this model, or any other model, using
     the \l QListView class to present the model's items in the form of a vertical
     list.
     For the string list model, this view also provides a default editor so that
     the items can be manipulated. We examine the possibilities made available by
-    the standard view classes in the chapter on \l{View Classes}.
+    the standard view classes in \l{View Classes}.
 
     The \l{Model Subclassing Reference} document discusses the requirements of
     QAbstractItemModel subclasses in more detail, and provides a guide to the
     virtual functions that must be implemented to enable various features in
     different types of models.
-*/
-
-/*!
-    \page model-view-convenience.html
-    \contentspage model-view-programming.html Contents
-    \previouspage Delegate Classes
-    \nextpage Using Drag and Drop with Item Views
-
-    \title Item View Convenience Classes
 
-    \tableofcontents
+    \section1 Item view convenience classes
 
-    \section1 Overview
-
-    Alongside the model/view classes, Qt 4 also includes standard widgets to
-    provide classic item-based container widgets. These behave in a similar
-    way to the item view classes in Qt 3, but have been rewritten to use the
-    underlying model/view framework for performance and maintainability. The
-    old item view classes are still available in the compatibility library
-    (see the \l{porting4.html}{Porting Guide} for more information).
+    Qt 4 also introduced some standard widgets to provide classic
+    item-based container widgets. These behave in a similar way to the
+    item view classes in Qt 3, but have been rewritten to use the
+    underlying model/view framework for performance and
+    maintainability. The old item view classes are still available in
+    the compatibility library (see the \l{porting4.html}{Porting
+    Guide} for more information).
 
     The item-based widgets have been given names which reflect their uses:
     \c QListWidget provides a list of items, \c QTreeWidget displays a
@@ -1577,7 +1444,7 @@
     class which implements common behavior for item selection and header
     management.
 
-    \section1 List Widgets
+    \section2 List widgets
 
     Single level lists of items are typically displayed using a \c QListWidget
     and a number of \c{QListWidgetItem}s. A list widget is constructed in the
@@ -1612,8 +1479,7 @@
     \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 4
     \snippet doc/src/snippets/qlistwidget-using/mainwindow.cpp 5
 
-
-    \section1 Tree Widgets
+    \section2 Tree widgets
 
     Trees or hierarchical lists of items are provided by the \c QTreeWidget
     and \c QTreeWidgetItem classes. Each item in the tree widget can have
@@ -1668,8 +1534,7 @@
     \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 8
     \snippet doc/src/snippets/qtreewidget-using/mainwindow.cpp 9
 
-
-    \section1 Table Widgets
+    \section2 Table widgets
 
     Tables of items similar to those found in spreadsheet applications
     are constructed with the \c QTableWidget and \c QTableWidgetItem. These
@@ -1693,7 +1558,7 @@
 
     Note that the rows and columns in the table begin at zero.
 
-    \section1 Common Features
+    \section2 Common features
 
     There are a number of item-based features common to each of the
     convenience classes that are available through the same interfaces
@@ -1702,7 +1567,7 @@
     Look at the list of \l{Model/View Classes} for each of the widgets
     for more details about the use of each function used.
 
-    \section2 Hidden Items
+    \section3 Hidden items
 
     It is sometimes useful to be able to hide items in an item view widget
     rather than remove them. Items for all of the above widgets can be
@@ -1713,7 +1578,7 @@
     Since this operation is item-based, the same function is available for
     all three convenience classes.
 
-    \section2 Selections
+    \section3 Selections
 
     The way items are selected is controlled by the widget's selection mode
     (\l{QAbstractItemView::SelectionMode}).
@@ -1764,7 +1629,7 @@
     current item may not lie within the selection, depending on the way the
     user formed the selection.
 
-    \section2 Searching
+    \section3 Searching
 
     It is often useful to be able to find items within an item view widget,
     either as a developer or as a service to present to users. All three
@@ -1782,19 +1647,8 @@
     The above code causes items in a tree widget to be selected if they
     contain the text given in the search string. This pattern can also be
     used in the list and table widgets.
-*/
-
-/*!
-    \page model-view-dnd.html
-    \contentspage model-view-programming.html Contents
-    \previouspage Item View Convenience Classes
-    \nextpage Proxy Models
 
-    \title Using Drag and Drop with Item Views
-
-    \tableofcontents
-
-    \section1 Overview
+    \section1 Using drag &amp drop with item views
 
     Qt's drag and drop infrastructure is fully supported by the model/view framework.
     Items in lists, tables, and trees can be dragged within the views, and data can be
@@ -1813,7 +1667,7 @@
     See also the \l{Model Subclassing Reference} for more information about
     enabling drag and drop support in new models.
 
-    \section1 Using Convenience Views
+    \section2 Using convenience views
 
     Each of the types of item used with QListWidget, QTableWidget, and QTreeWidget
     is configured to use a different set of flags by default. For example, each
@@ -1852,7 +1706,7 @@
 
     \snippet doc/src/snippets/qlistwidget-dnd/mainwindow.cpp 1
 
-    \section1 Using Model/View Classes
+    \section2 Using model/view classes
 
     Setting up a view for drag and drop follows the same pattern used with the
     convenience views. For example, a QListView can be set up in the same way as a
@@ -1874,7 +1728,7 @@
     of QAbstractItemModel::removeRows(), either directly or by inheriting the
     implementation from its base class.
 
-    \section2 Enabling Drag and Drop for Items
+    \section3 Enabling drag &amp drop for items
 
     Models indicate to views which items can be dragged, and which will accept drops,
     by reimplementing the QAbstractItemModel::flags() function to provide suitable
@@ -1894,7 +1748,7 @@
     obtain a default set of flags by calling its implementation of the flags()
     function.
 
-    \section2 Encoding Exported Data
+    \section3 Encoding exported data
 
     When items of data are exported from a model in a drag and drop operation, they
     are encoded into an appropriate format corresponding to one or more MIME types.
@@ -1923,7 +1777,7 @@
     and that stream operators must be implemented for them. See the QMetaObject
     class description for details.
 
-    \section2 Inserting Dropped Data into a Model
+    \section3 Inserting dropped data into a model
 
     The way that any given model handles dropped data depends on both its type
     (list, table, or tree) and the way its contents is likely to be presented to
@@ -1988,7 +1842,7 @@
     example shown here, the model only has one level, so this approach is not
     appropriate.
 
-    \section2 Decoding Imported Data
+    \section3 Decoding imported data
 
     Each implementation of \l{QAbstractItemModel::dropMimeData()}{dropMimeData()} must
     also decode the data and insert it into the model's underlying data structure.
@@ -2007,19 +1861,8 @@
     QAbstractItemModel::insertRows() and QAbstractItemModel::setData() functions.
 
     \sa {Item Views Puzzle Example}
-*/
-
-/*!
-    \page model-view-proxy-models.html
-    \contentspage model-view-programming.html Contents
-    \previouspage Using Drag and Drop with Item Views
-    \nextpage Model Subclassing Reference
 
-    \title Proxy Models
-
-    \tableofcontents
-
-    \section1 Overview
+    \section1 Proxy models
 
     In the model/view framework, items of data supplied by a single model can be shared
     by any number of views, and each of these can possibly represent the same information
@@ -2042,7 +1885,7 @@
     framework ensure that each view is updated appropriately no matter how many proxy models
     are placed between itself and the source model.
 
-    \section1 Using Proxy Models
+    \section2 Using proxy models
 
     Proxy models can be inserted between an existing model and any number of views.
     Qt is supplied with a standard proxy model, QSortFilterProxyModel, that is usually
@@ -2061,7 +1904,7 @@
     in applications. More specialized proxy models can be created by subclassing this
     classes and implementing the required comparison operations.
 
-    \section1 Customizing Proxy Models
+    \section2 Customizing proxy models
 
     Generally, the type of processing used in a proxy model involves mapping each item of
     data from its original location in the source model to either a different location in
@@ -2074,7 +1917,7 @@
     being supplied to views, and also allows the contents of a source model to
     be supplied to views as pre-sorted data.
 
-    \section2 Custom Filtering Models
+    \section3 Custom filtering models
 
     The QSortFilterProxyModel class provides a filtering model that is fairly versatile,
     and which can be used in a variety of common situations. For advanced users,
@@ -2095,7 +1938,7 @@
     return true to ensure that all items are passed through to views; reimplementations
     of these functions should return false to filter out individual rows and columns.
 
-    \section2 Custom Sorting Models
+    \section3 Custom sorting models
 
     QSortFilterProxyModel instances use Qt's built-in qStableSort() function to set up
     mappings between items in the source model and those in the proxy model, allowing a
@@ -2103,18 +1946,8 @@
     source model. To provide custom sorting behavior, reimplement the
     \l{QSortFilterProxyModel::lessThan()}{lessThan()} function to perform custom
     comparisons.
-*/
-
-/*!
-    \page model-view-model-subclassing.html
-    \contentspage model-view-programming.html Contents
-    \previouspage Proxy Models
-
-    \title Model Subclassing Reference
 
-    \tableofcontents
-
-    \section1 Introduction
+    \section1 Model subclassing reference
 
     Model subclasses need to provide implementations of many of the virtual functions
     defined in the QAbstractItemModel base class. The number of these functions that need
@@ -2143,13 +1976,13 @@
     For more information, see the \l
     {"Item View Classes" Chapter of C++ GUI Programming with Qt 4}.
 
-    \section1 Item Data Handling
+    \section2 Item data handling
 
     Models can provide varying levels of access to the data they provide: They can be
     simple read-only components, some models may support resizing operations, and
     others may allow items to be edited.
 
-    \section2 Read-Only Access
+    \section2 Read-Only access
 
     To provide read-only access to data provided by a model, the following functions
     \e{must} be implemented in the model's subclass:
@@ -2185,7 +2018,7 @@
             provide this function because it is already implemented in QAbstractListModel.
     \endtable
 
-    \section2 Editable Items
+    \section3 Editable items
 
     Editable models allow items of data to be modified, and may also provide
     functions to allow rows and columns to be inserted and removed. To enable
@@ -2211,7 +2044,7 @@
             signal to inform other components of the change.
     \endtable
 
-    \section2 Resizable Models
+    \section3 Resizable models
 
     All types of model can support the insertion and removal of rows. Table models
     and hierarchical models can also support the insertion and removal of columns.
@@ -2271,7 +2104,7 @@
     it is necessary to emit the \l{QAbstractItemModel::layoutChanged()}{layoutChanged()}
     signal to cause any attached views to be updated.
 
-    \section2 Lazy Population of Model Data
+    \section3 Lazy population of model data
 
     Lazy population of model data effectively allows requests for information
     about the model to be deferred until it is actually needed by views.
@@ -2305,13 +2138,12 @@
     children may be displayed incorrectly in some views until the user
     attempts to view the non-existent child items.
 
-
-    \section1 Navigation and Model Index Creation
+    \section2 Navigation &amp model index creation
 
     Hierarchical models need to provide functions that views can call to navigate the
     tree-like structures they expose, and obtain model indexes for items.
 
-    \section2 Parents and Children
+    \section3 Parents &amp children
 
     Since the structure exposed to views is determined by the underlying data
     structure, it is up to each model subclass to create its own model indexes
@@ -2335,7 +2167,7 @@
     models to supply some unique identifier to this function to ensure that
     the model index can be re-associated with its corresponding item later on.
 
-    \section1 Drag and Drop Support and MIME Type Handling
+    \section2 Drag &amp drop support and MIME type handling
 
     The model/view classes support drag and drop operations, providing default behavior
     that is sufficient for many applications. However, it is also possible to customize
@@ -2347,7 +2179,7 @@
     The \l{#Convenience Views}{Convenience Views} section provides an overview of this
     behavior.
 
-    \section2 MIME Data
+    \section3 MIME data
 
     By default, the built-in models and views use an internal MIME type
     (\c{application/x-qabstractitemmodeldatalist}) to pass around information about
@@ -2394,7 +2226,7 @@
     the QMimeData::setImageData(), QMimeData::setColorData(), and
     QMimeData::setHtml() functions.
 
-    \section2 Accepting Dropped Data
+    \section3 Accepting dropped data
 
     When a drag and drop operation is performed over a view, the underlying model is
     queried to determine which types of operation it supports and the MIME types
@@ -2466,7 +2298,7 @@
     For more information about drag and drop with item views, refer to
     \l{Using Drag and Drop with Item Views}.
 
-    \section2 Convenience Views
+    \section3 Convenience views
 
     The convenience views (QListWidget, QTableWidget, and QTreeWidget) override
     the default drag and drop functionality to provide less flexible, but more
@@ -2477,7 +2309,7 @@
     into the model. For more information on drag and drop in convenience views,
     you can see \l{Using Drag and Drop with Item Views}.
 
-    \section1 Performance Optimization for Large Amounts of Data
+    \section2 Performance optimization for large amounts of data
 
     The \l{QAbstractItemModel::}{canFetchMore()} function checks if the parent
     has more data available and returns true or false accordingly. The
@@ -2498,4 +2330,23 @@
     \l{QAbstractItemModel::}{canFetchMore()} and  \l{QAbstractItemModel::}
     {fetchMore()} must be reimplemented as their default implementation returns
     false and does nothing.
+
+    \keyword Model/View Classes
+    \section1 The model/view classes
+
+    These classes use the model/view design pattern in which the
+    underlying data (in the model) is kept separate from the way the
+    data is presented and manipulated by the user (in the view).
+
+    \annotatedlist model-view
+
+    \section1 Related examples
+
+    \list
+    \o \l{itemviews/dirview}{Dir View}
+    \o \l{itemviews/spinboxdelegate}{Spin Box Delegate}
+    \o \l{itemviews/pixelator}{Pixelator}
+    \o \l{itemviews/simpletreemodel}{Simple Tree Model}
+    \o \l{itemviews/chart}{Chart}
+    \endlist
 */
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index c155d9b..47fe2e0 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -39,7 +39,7 @@
     h1, h2, h3, h4, h5, h6
     {
         font-size: 100%;
-        font-weight: normal;
+/*        font-weight: normal; */
     }
     q:before, q:after
     {
@@ -949,6 +949,11 @@
         margin-left: 15px;
     }
 
+    .wrap .content .toc .level3
+    {
+        margin-left: 30px;
+    }
+
     .content .toc li
     {
         font: normal 10px/1.2 Verdana;
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 5716626..280f055 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -2746,18 +2746,6 @@ Doc::SectioningUnit Doc::granularity() const
     }
 }
 
-#if notyet // ###
-Doc::SectioningUnit Doc::sectioningUnit() const
-{
-    if (priv == 0 || priv->extra == 0) {
-	return DocPrivateExtra().sectioningUnit;
-    }
-    else {
-	return priv->extra->sectioningUnit;
-    }
-}
-#endif
-
 const QSet<QString> &Doc::parameterNames() const
 {
     return priv == 0 ? *null_Set_QString() : priv->params;
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 16df0c0..b103981 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -4060,10 +4060,13 @@ int HtmlGenerator::hOffset(const Node *node)
     case Node::Class:
         return 2;
     case Node::Fake:
+        return 1;
+#if 0        
         if (node->doc().briefText().isEmpty())
             return 1;
         else
             return 2;
+#endif        
     case Node::Enum:
     case Node::Typedef:
     case Node::Function:
-- 
cgit v0.12


From b42315c1d7811a0997181e188fc39a368ac9175f Mon Sep 17 00:00:00 2001
From: Jani Hautakangas <ext-jani.hautakangas@nokia.com>
Date: Fri, 28 May 2010 17:30:26 +0300
Subject: Add runtime_graphics_system flag to QApplicationPrivate.

This flag can be internally used to detect if
QRuntimeGraphicsSystem is used. In some cases Qt needs
to know if runtime graphics system is used and it's
better to have a flag than relsolving graphics system
name every time.

Reviewed-by: Jason Barron
---
 src/gui/kernel/qapplication.cpp              | 1 +
 src/gui/kernel/qapplication_p.h              | 1 +
 src/gui/kernel/qapplication_s60.cpp          | 7 +++----
 src/gui/painting/qgraphicssystem_runtime.cpp | 1 +
 src/gui/painting/qwindowsurface.cpp          | 5 +++++
 src/gui/painting/qwindowsurface_s60.cpp      | 2 +-
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 3d4bf5d..a2c058a 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -446,6 +446,7 @@ QPalette *QApplicationPrivate::set_pal = 0;        // default palette set by pro
 
 QGraphicsSystem *QApplicationPrivate::graphics_system = 0; // default graphics system
 QString QApplicationPrivate::graphics_system_name;         // graphics system id - for delayed initialization
+bool QApplicationPrivate::runtime_graphics_system = false;
 
 Q_GLOBAL_STATIC(QMutex, applicationFontMutex)
 QFont *QApplicationPrivate::app_font = 0;        // default application font
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index e30b6be..e83cd71 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -412,6 +412,7 @@ public:
     static QPalette *set_pal;
     static QGraphicsSystem *graphics_system;
     static QString graphics_system_name;
+    static bool runtime_graphics_system;
 
 private:
     static QFont *app_font; // private for a reason! Always use QApplication::font() instead!
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 7e270aa..8ab82c9 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -66,7 +66,6 @@
 #include "private/qgraphicssystem_runtime_p.h"
 #endif
 
-
 #include "apgwgnam.h" // For CApaWindowGroupName
 #include <mdaaudiotoneplayer.h>     // For CMdaAudioToneUtility
 
@@ -958,7 +957,7 @@ void QSymbianControl::Draw(const TRect& controlRect) const
     if (engine->type() == QPaintEngine::Raster) {
         QS60WindowSurface *s60Surface;
 #ifdef QT_GRAPHICSSYSTEM_RUNTIME
-        if (QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+        if (QApplicationPrivate::runtime_graphics_system) {
             QRuntimeWindowSurface *rtSurface =
                     static_cast<QRuntimeWindowSurface*>(qwidget->windowSurface());
             s60Surface = static_cast<QS60WindowSurface *>(rtSurface->m_windowSurface);
@@ -1855,7 +1854,7 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent
         if (callSymbianEventFilters(symbianEvent))
             return 1;
 #ifdef QT_GRAPHICSSYSTEM_RUNTIME
-        if(QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+        if(QApplicationPrivate::runtime_graphics_system) {
             bool switchToSwRendering(false);
 
             foreach (QWidget *w, QApplication::topLevelWidgets()) {
@@ -1887,7 +1886,7 @@ int QApplicationPrivate::symbianProcessWsEvent(const QSymbianEvent *symbianEvent
         if (callSymbianEventFilters(symbianEvent))
             return 1;
 #ifdef QT_GRAPHICSSYSTEM_RUNTIME
-        if(QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+        if(QApplicationPrivate::runtime_graphics_system) {
             QRuntimeGraphicsSystem *gs =
                    static_cast<QRuntimeGraphicsSystem*>(QApplicationPrivate::graphics_system);
             gs->setGraphicsSystem(QLatin1String("openvg"), S60->memoryLimitForHwRendering);
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index 1c5d944..32a8578 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -344,6 +344,7 @@ QRuntimeGraphicsSystem::QRuntimeGraphicsSystem()
 	m_graphicsSystem(0), m_graphicsSystemChangeMemoryLimit(0)
 {
     QApplicationPrivate::graphics_system_name = QLatin1String("runtime");
+    QApplicationPrivate::runtime_graphics_system = true;
 
 #ifdef Q_OS_SYMBIAN
     m_graphicsSystemName = QLatin1String("openvg");
diff --git a/src/gui/painting/qwindowsurface.cpp b/src/gui/painting/qwindowsurface.cpp
index 2fe9036..02a8b80 100644
--- a/src/gui/painting/qwindowsurface.cpp
+++ b/src/gui/painting/qwindowsurface.cpp
@@ -43,6 +43,7 @@
 #include <qwidget.h>
 #include <private/qwidget_p.h>
 #include <private/qbackingstore_p.h>
+#include <private/qapplication_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -116,6 +117,10 @@ public:
 QWindowSurface::QWindowSurface(QWidget *window)
     : d_ptr(new QWindowSurfacePrivate(window))
 {
+    if (!QApplicationPrivate::runtime_graphics_system) {
+        if(window)
+            window->setWindowSurface(this);
+    }
 }
 
 /*!
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index 93d4d18..477bd93 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -88,7 +88,7 @@ QS60WindowSurface::QS60WindowSurface(QWidget* widget)
 QS60WindowSurface::~QS60WindowSurface()
 {
 #if defined(QT_GRAPHICSSYSTEM_RUNTIME) && defined(Q_SYMBIAN_SUPPORTS_SURFACES)
-    if(QApplicationPrivate::graphics_system_name == QLatin1String("runtime")) {
+    if(QApplicationPrivate::runtime_graphics_system) {
         QRuntimeGraphicsSystem *runtimeGraphicsSystem =
                 static_cast<QRuntimeGraphicsSystem*>(QApplicationPrivate::graphics_system);
         if(runtimeGraphicsSystem->graphicsSystemName() == QLatin1String("openvg")) {
-- 
cgit v0.12


From 9012fc33e135c82360ca34bc955349be93d5635f Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Fri, 28 May 2010 14:34:08 +0100
Subject: Update def files for 4.6.3

Frozen 4.6.3 branch on top of 4.6.2 def files.

Task-number: QTBUG-8769
Reviewed-by: Trust Me
---
 src/s60installs/bwins/QtGuiu.def    | 351 ++++++++----------------------------
 src/s60installs/eabi/QtCoreu.def    |  71 +-------
 src/s60installs/eabi/QtGuiu.def     | 266 ++++-----------------------
 src/s60installs/eabi/QtNetworku.def | 177 +-----------------
 src/s60installs/eabi/QtOpenVGu.def  |   9 +-
 5 files changed, 122 insertions(+), 752 deletions(-)

diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 15addf6..3368e4c 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -2125,9 +2125,9 @@ EXPORTS
 	?addText@QPainterPath@@QAEXMMABVQFont@@ABVQString@@@Z @ 2124 NONAME ; void QPainterPath::addText(float, float, class QFont const &, class QString const &)
 	?addToGroup@QGraphicsItemGroup@@QAEXPAVQGraphicsItem@@@Z @ 2125 NONAME ; void QGraphicsItemGroup::addToGroup(class QGraphicsItem *)
 	?addToIndex@QGraphicsItem@@IAEXXZ @ 2126 NONAME ; void QGraphicsItem::addToIndex(void)
-	?addToPolygon@QBezier@@QBEXPAVQPolygonF@@@Z @ 2127 NONAME ABSENT ; void QBezier::addToPolygon(class QPolygonF *) const
-	?addToPolygonIterative@QBezier@@QBEXPAVQPolygonF@@@Z @ 2128 NONAME ABSENT ; void QBezier::addToPolygonIterative(class QPolygonF *) const
-	?addToPolygonMixed@QBezier@@QBEXPAVQPolygonF@@@Z @ 2129 NONAME ABSENT ; void QBezier::addToPolygonMixed(class QPolygonF *) const
+	?addToPolygon@QBezier@@QBEXPAVQPolygonF@@@Z @ 2127 NONAME ; void QBezier::addToPolygon(class QPolygonF *) const
+	?addToPolygonIterative@QBezier@@QBEXPAVQPolygonF@@@Z @ 2128 NONAME ; void QBezier::addToPolygonIterative(class QPolygonF *) const
+	?addToPolygonMixed@QBezier@@QBEXPAVQPolygonF@@@Z @ 2129 NONAME ; void QBezier::addToPolygonMixed(class QPolygonF *) const
 	?addToolBar@QMainWindow@@QAEPAVQToolBar@@ABVQString@@@Z @ 2130 NONAME ; class QToolBar * QMainWindow::addToolBar(class QString const &)
 	?addToolBar@QMainWindow@@QAEXPAVQToolBar@@@Z @ 2131 NONAME ; void QMainWindow::addToolBar(class QToolBar *)
 	?addToolBar@QMainWindow@@QAEXW4ToolBarArea@Qt@@PAVQToolBar@@@Z @ 2132 NONAME ; void QMainWindow::addToolBar(enum Qt::ToolBarArea, class QToolBar *)
@@ -3207,7 +3207,7 @@ EXPORTS
 	?cursorWordForward@QLineControl@@QAEX_N@Z @ 3206 NONAME ; void QLineControl::cursorWordForward(bool)
 	?cursorWordForward@QLineEdit@@QAEX_N@Z @ 3207 NONAME ; void QLineEdit::cursorWordForward(bool)
 	?curveThreshold@QPainterPathStroker@@QBEMXZ @ 3208 NONAME ; float QPainterPathStroker::curveThreshold(void) const
-	?curveThreshold@QStroker@@QBEMXZ @ 3209 NONAME ABSENT ; float QStroker::curveThreshold(void) const
+	?curveThreshold@QStroker@@QBEMXZ @ 3209 NONAME ; float QStroker::curveThreshold(void) const
 	?customButtonClicked@QWizard@@IAEXH@Z @ 3210 NONAME ; void QWizard::customButtonClicked(int)
 	?customColor@QColorDialog@@SAIH@Z @ 3211 NONAME ; unsigned int QColorDialog::customColor(int)
 	?customContextMenuRequested@QWidget@@IAEXABVQPoint@@@Z @ 3212 NONAME ; void QWidget::customContextMenuRequested(class QPoint const &)
@@ -3853,7 +3853,7 @@ EXPORTS
 	?draw@QLineControl@@QAEXPAVQPainter@@ABVQPoint@@ABVQRect@@H@Z @ 3852 NONAME ; void QLineControl::draw(class QPainter *, class QPoint const &, class QRect const &, int)
 	?draw@QPaintBuffer@@QBEXPAVQPainter@@H@Z @ 3853 NONAME ; void QPaintBuffer::draw(class QPainter *, int) const
 	?draw@QPaintEngineEx@@UAEXABVQVectorPath@@@Z @ 3854 NONAME ; void QPaintEngineEx::draw(class QVectorPath const &)
-	?draw@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@H@Z @ 3855 NONAME ABSENT ; void QPainterReplayer::draw(class QPaintBuffer const &, class QPainter *, int)
+	?draw@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@H@Z @ 3855 NONAME ; void QPainterReplayer::draw(class QPaintBuffer const &, class QPainter *, int)
 	?draw@QPixmapBlurFilter@@UBEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQRectF@@@Z @ 3856 NONAME ; void QPixmapBlurFilter::draw(class QPainter *, class QPointF const &, class QPixmap const &, class QRectF const &) const
 	?draw@QPixmapColorizeFilter@@UBEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQRectF@@@Z @ 3857 NONAME ; void QPixmapColorizeFilter::draw(class QPainter *, class QPointF const &, class QPixmap const &, class QRectF const &) const
 	?draw@QPixmapConvolutionFilter@@UBEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQRectF@@@Z @ 3858 NONAME ; void QPixmapConvolutionFilter::draw(class QPainter *, class QPointF const &, class QPixmap const &, class QRectF const &) const
@@ -3961,7 +3961,7 @@ EXPORTS
 	?drawPixmap@QPainter@@QAEXHHABVQPixmap@@HHHH@Z @ 3960 NONAME ; void QPainter::drawPixmap(int, int, class QPixmap const &, int, int, int, int)
 	?drawPixmap@QPainter@@QAEXHHHHABVQPixmap@@@Z @ 3961 NONAME ; void QPainter::drawPixmap(int, int, int, int, class QPixmap const &)
 	?drawPixmap@QPainter@@QAEXHHHHABVQPixmap@@HHHH@Z @ 3962 NONAME ; void QPainter::drawPixmap(int, int, int, int, class QPixmap const &, int, int, int, int)
-	?drawPixmaps@QPaintEngineEx@@UAEXPBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 3963 NONAME ABSENT ; void QPaintEngineEx::drawPixmaps(struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
+	?drawPixmaps@QPaintEngineEx@@UAEXPBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 3963 NONAME ; void QPaintEngineEx::drawPixmaps(struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
 	?drawPoint@QPainter@@QAEXABVQPoint@@@Z @ 3964 NONAME ; void QPainter::drawPoint(class QPoint const &)
 	?drawPoint@QPainter@@QAEXABVQPointF@@@Z @ 3965 NONAME ; void QPainter::drawPoint(class QPointF const &)
 	?drawPoint@QPainter@@QAEXHH@Z @ 3966 NONAME ; void QPainter::drawPoint(int, int)
@@ -4417,8 +4417,8 @@ EXPORTS
 	?findData@QComboBox@@QBEHABVQVariant@@HV?$QFlags@W4MatchFlag@Qt@@@@@Z @ 4416 NONAME ; int QComboBox::findData(class QVariant const &, int, class QFlags<enum Qt::MatchFlag>) const
 	?findFont@QFontDatabase@@CAPAVQFontEngine@@HPBVQFontPrivate@@ABUQFontDef@@@Z @ 4417 NONAME ; class QFontEngine * QFontDatabase::findFont(int, class QFontPrivate const *, struct QFontDef const &)
 	?findInMask@QLineControl@@ABEHH_N0VQChar@@@Z @ 4418 NONAME ; int QLineControl::findInMask(int, bool, bool, class QChar) const
-	?findIntersections@QBezier@@SA?AV?$QVector@U?$QPair@MM@@@@ABV1@0@Z @ 4419 NONAME ABSENT ; class QVector<struct QPair<float, float> > QBezier::findIntersections(class QBezier const &, class QBezier const &)
-	?findIntersections@QBezier@@SA_NABV1@0PAV?$QVector@U?$QPair@MM@@@@@Z @ 4420 NONAME ABSENT ; bool QBezier::findIntersections(class QBezier const &, class QBezier const &, class QVector<struct QPair<float, float> > *)
+	?findIntersections@QBezier@@SA?AV?$QVector@U?$QPair@MM@@@@ABV1@0@Z @ 4419 NONAME ; class QVector<struct QPair<float, float> > QBezier::findIntersections(class QBezier const &, class QBezier const &)
+	?findIntersections@QBezier@@SA_NABV1@0PAV?$QVector@U?$QPair@MM@@@@@Z @ 4420 NONAME ; bool QBezier::findIntersections(class QBezier const &, class QBezier const &, class QVector<struct QPair<float, float> > *)
 	?findItem@QTextEngine@@QBEHH@Z @ 4421 NONAME ; int QTextEngine::findItem(int) const
 	?findItems@QListWidget@@QBE?AV?$QList@PAVQListWidgetItem@@@@ABVQString@@V?$QFlags@W4MatchFlag@Qt@@@@@Z @ 4422 NONAME ; class QList<class QListWidgetItem *> QListWidget::findItems(class QString const &, class QFlags<enum Qt::MatchFlag>) const
 	?findItems@QStandardItemModel@@QBE?AV?$QList@PAVQStandardItem@@@@ABVQString@@V?$QFlags@W4MatchFlag@Qt@@@@H@Z @ 4423 NONAME ; class QList<class QStandardItem *> QStandardItemModel::findItems(class QString const &, class QFlags<enum Qt::MatchFlag>, int) const
@@ -7206,10 +7206,10 @@ EXPORTS
 	?parseTerm@Parser@QCss@@QAE_NPAUValue@2@@Z @ 7205 NONAME ; bool QCss::Parser::parseTerm(struct QCss::Value *)
 	?passwordCharacter@QLineControl@@QBE?AVQChar@@XZ @ 7206 NONAME ; class QChar QLineControl::passwordCharacter(void) const
 	?passwordEchoEditing@QLineControl@@QBE_NXZ @ 7207 NONAME ; bool QLineControl::passwordEchoEditing(void) const
-	?paste@QLineControl@@QAEXXZ @ 7208 NONAME ABSENT ; void QLineControl::paste(void)
+	?paste@QLineControl@@QAEXXZ @ 7208 NONAME ; void QLineControl::paste(void)
 	?paste@QLineEdit@@QAEXXZ @ 7209 NONAME ; void QLineEdit::paste(void)
 	?paste@QPlainTextEdit@@QAEXXZ @ 7210 NONAME ; void QPlainTextEdit::paste(void)
-	?paste@QTextControl@@QAEXXZ @ 7211 NONAME ABSENT ; void QTextControl::paste(void)
+	?paste@QTextControl@@QAEXXZ @ 7211 NONAME ; void QTextControl::paste(void)
 	?paste@QTextEdit@@QAEXXZ @ 7212 NONAME ; void QTextEdit::paste(void)
 	?path@QGraphicsPathItem@@QBE?AVQPainterPath@@XZ @ 7213 NONAME ; class QPainterPath QGraphicsPathItem::path(void) const
 	?pathFromIndex@QCompleter@@UBE?AVQString@@ABVQModelIndex@@@Z @ 7214 NONAME ; class QString QCompleter::pathFromIndex(class QModelIndex const &) const
@@ -7291,7 +7291,7 @@ EXPORTS
 	?polishEvent@QGraphicsWidget@@MAEXXZ @ 7290 NONAME ; void QGraphicsWidget::polishEvent(void)
 	?polygon@QGraphicsPolygonItem@@QBE?AVQPolygonF@@XZ @ 7291 NONAME ; class QPolygonF QGraphicsPolygonItem::polygon(void) const
 	?polygonFlags@QVectorPath@@SAIW4PolygonDrawMode@QPaintEngine@@@Z @ 7292 NONAME ; unsigned int QVectorPath::polygonFlags(enum QPaintEngine::PolygonDrawMode)
-	?populate@QTextureGlyphCache@@QAEXABVQTextItemInt@@ABV?$QVarLengthArray@I$0BAA@@@ABV?$QVarLengthArray@UQFixedPoint@@$0BAA@@@@Z @ 7293 NONAME ABSENT ; void QTextureGlyphCache::populate(class QTextItemInt const &, class QVarLengthArray<unsigned int, 256> const &, class QVarLengthArray<struct QFixedPoint, 256> const &)
+	?populate@QTextureGlyphCache@@QAEXABVQTextItemInt@@ABV?$QVarLengthArray@I$0BAA@@@ABV?$QVarLengthArray@UQFixedPoint@@$0BAA@@@@Z @ 7293 NONAME ; void QTextureGlyphCache::populate(class QTextItemInt const &, class QVarLengthArray<unsigned int, 256> const &, class QVarLengthArray<struct QFixedPoint, 256> const &)
 	?popup@QCompleter@@QBEPAVQAbstractItemView@@XZ @ 7294 NONAME ; class QAbstractItemView * QCompleter::popup(void) const
 	?popup@QMenu@@QAEXABVQPoint@@PAVQAction@@@Z @ 7295 NONAME ; void QMenu::popup(class QPoint const &, class QAction *)
 	?popupMode@QToolButton@@QBE?AW4ToolButtonPopupMode@1@XZ @ 7296 NONAME ; enum QToolButton::ToolButtonPopupMode QToolButton::popupMode(void) const
@@ -7389,7 +7389,7 @@ EXPORTS
 	?qAlpha@@YAHI@Z @ 7388 NONAME ; int qAlpha(unsigned int)
 	?qBlue@@YAHI@Z @ 7389 NONAME ; int qBlue(unsigned int)
 	?qDrawBorderPixmap@@YAXPAVQPainter@@ABVQRect@@ABVQMargins@@ABVQPixmap@@12ABUQTileRules@@V?$QFlags@W4DrawingHint@QDrawBorderPixmap@@@@@Z @ 7390 NONAME ; void qDrawBorderPixmap(class QPainter *, class QRect const &, class QMargins const &, class QPixmap const &, class QRect const &, class QMargins const &, struct QTileRules const &, class QFlags<enum QDrawBorderPixmap::DrawingHint>)
-	?qDrawPixmaps@@YAXPAVQPainter@@PBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 7391 NONAME ABSENT ; void qDrawPixmaps(class QPainter *, struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
+	?qDrawPixmaps@@YAXPAVQPainter@@PBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 7391 NONAME ; void qDrawPixmaps(class QPainter *, struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
 	?qDrawPlainRect@@YAXPAVQPainter@@ABVQRect@@ABVQColor@@HPBVQBrush@@@Z @ 7392 NONAME ; void qDrawPlainRect(class QPainter *, class QRect const &, class QColor const &, int, class QBrush const *)
 	?qDrawPlainRect@@YAXPAVQPainter@@HHHHABVQColor@@HPBVQBrush@@@Z @ 7393 NONAME ; void qDrawPlainRect(class QPainter *, int, int, int, int, class QColor const &, int, class QBrush const *)
 	?qDrawShadeLine@@YAXPAVQPainter@@ABVQPoint@@1ABVQPalette@@_NHH@Z @ 7394 NONAME ; void qDrawShadeLine(class QPainter *, class QPoint const &, class QPoint const &, class QPalette const &, bool, int, int)
@@ -8769,7 +8769,7 @@ EXPORTS
 	?setCursorWidth@QTextEdit@@QAEXH@Z @ 8768 NONAME ; void QTextEdit::setCursorWidth(int)
 	?setCursor_sys@QWidgetPrivate@@QAEXABVQCursor@@@Z @ 8769 NONAME ; void QWidgetPrivate::setCursor_sys(class QCursor const &)
 	?setCurveThreshold@QPainterPathStroker@@QAEXM@Z @ 8770 NONAME ; void QPainterPathStroker::setCurveThreshold(float)
-	?setCurveThreshold@QStroker@@QAEXM@Z @ 8771 NONAME ABSENT ; void QStroker::setCurveThreshold(float)
+	?setCurveThreshold@QStroker@@QAEXM@Z @ 8771 NONAME ; void QStroker::setCurveThreshold(float)
 	?setCustomColor@QColorDialog@@SAXHI@Z @ 8772 NONAME ; void QColorDialog::setCustomColor(int, unsigned int)
 	?setDashOffset@QDashStroker@@QAEXM@Z @ 8773 NONAME ; void QDashStroker::setDashOffset(float)
 	?setDashOffset@QPainterPathStroker@@QAEXM@Z @ 8774 NONAME ; void QPainterPathStroker::setDashOffset(float)
@@ -10501,7 +10501,7 @@ EXPORTS
 	?speed@QMovie@@QBEHXZ @ 10500 NONAME ; int QMovie::speed(void) const
 	?split@QBezier@@QBEXPAV1@0@Z @ 10501 NONAME ; void QBezier::split(class QBezier *, class QBezier *) const
 	?split@QItemSelection@@SAXABVQItemSelectionRange@@0PAV1@@Z @ 10502 NONAME ; void QItemSelection::split(class QItemSelectionRange const &, class QItemSelectionRange const &, class QItemSelection *)
-	?splitAtIntersections@QBezier@@QAE?AV?$QVector@V?$QList@VQBezier@@@@@@AAV1@@Z @ 10503 NONAME ABSENT ; class QVector<class QList<class QBezier> > QBezier::splitAtIntersections(class QBezier &)
+	?splitAtIntersections@QBezier@@QAE?AV?$QVector@V?$QList@VQBezier@@@@@@AAV1@@Z @ 10503 NONAME ; class QVector<class QList<class QBezier> > QBezier::splitAtIntersections(class QBezier &)
 	?splitCell@QTextTable@@QAEXHHHH@Z @ 10504 NONAME ; void QTextTable::splitCell(int, int, int, int)
 	?splitDockWidget@QMainWindow@@QAEXPAVQDockWidget@@0W4Orientation@Qt@@@Z @ 10505 NONAME ; void QMainWindow::splitDockWidget(class QDockWidget *, class QDockWidget *, enum Qt::Orientation)
 	?splitItem@QTextEngine@@ABEXHH@Z @ 10506 NONAME ; void QTextEngine::splitItem(int, int) const
@@ -10990,7 +10990,7 @@ EXPORTS
 	?toPointF@QVector2D@@QBE?AVQPointF@@XZ @ 10989 NONAME ; class QPointF QVector2D::toPointF(void) const
 	?toPointF@QVector3D@@QBE?AVQPointF@@XZ @ 10990 NONAME ; class QPointF QVector3D::toPointF(void) const
 	?toPointF@QVector4D@@QBE?AVQPointF@@XZ @ 10991 NONAME ; class QPointF QVector4D::toPointF(void) const
-	?toPolygon@QBezier@@QBE?AVQPolygonF@@XZ @ 10992 NONAME ABSENT ; class QPolygonF QBezier::toPolygon(void) const
+	?toPolygon@QBezier@@QBE?AVQPolygonF@@XZ @ 10992 NONAME ; class QPolygonF QBezier::toPolygon(void) const
 	?toPolygon@QPolygonF@@QBE?AVQPolygon@@XZ @ 10993 NONAME ; class QPolygon QPolygonF::toPolygon(void) const
 	?toPrevious@QDataWidgetMapper@@QAEXXZ @ 10994 NONAME ; void QDataWidgetMapper::toPrevious(void)
 	?toReversed@QPainterPath@@QBE?AV1@XZ @ 10995 NONAME ; class QPainterPath QPainterPath::toReversed(void) const
@@ -12548,274 +12548,65 @@ EXPORTS
 	?timerEvent@QS60Style@@MAEXPAVQTimerEvent@@@Z @ 12547 NONAME ; void QS60Style::timerEvent(class QTimerEvent *)
 	?updateAncestorFlags@QGraphicsItemPrivate@@QAEXXZ @ 12548 NONAME ; void QGraphicsItemPrivate::updateAncestorFlags(void)
 	?updateChildWithGraphicsEffectFlagRecursively@QGraphicsItemPrivate@@QAEXXZ @ 12549 NONAME ; void QGraphicsItemPrivate::updateChildWithGraphicsEffectFlagRecursively(void)
-	?isOpacityNull@QGraphicsItemPrivate@@SA_NM@Z @ 12550 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(float)
-	?isOpacityNull@QGraphicsItemPrivate@@QBE_NXZ @ 12551 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(void) const
-	?api@QEglContext@@QBE?AW4API@QEgl@@XZ @ 12552 NONAME ABSENT ; enum QEgl::API QEglContext::api(void) const
+	?api@QEglContext@@QBE?AW4API@QEgl@@XZ @ 12550 NONAME ; enum QEgl::API QEglContext::api(void) const
+	?display@QEglContext@@SAHXZ @ 12551 NONAME ; int QEglContext::display(void)
+	?isOpacityNull@QGraphicsItemPrivate@@SA_NM@Z @ 12552 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(float)
 	?chooseConfig@QEglContext@@QAE_NABVQEglProperties@@W4PixelFormatMatch@QEgl@@@Z @ 12553 NONAME ; bool QEglContext::chooseConfig(class QEglProperties const &, enum QEgl::PixelFormatMatch)
 	?destroySurface@QEglContext@@QAEXH@Z @ 12554 NONAME ; void QEglContext::destroySurface(int)
 	?lazyDoneCurrent@QEglContext@@QAE_NXZ @ 12555 NONAME ; bool QEglContext::lazyDoneCurrent(void)
-	?waitNative@QEglContext@@QAEXXZ @ 12556 NONAME ABSENT ; void QEglContext::waitNative(void)
-	?context@QEglContext@@QBEHXZ @ 12557 NONAME ABSENT ; int QEglContext::context(void) const
-	?configAttrib@QEglContext@@QBE_NHPAH@Z @ 12558 NONAME ABSENT ; bool QEglContext::configAttrib(int, int *) const
+	?waitNative@QEglContext@@QAEXXZ @ 12556 NONAME ; void QEglContext::waitNative(void)
+	?context@QEglContext@@QBEHXZ @ 12557 NONAME ; int QEglContext::context(void) const
+	?configAttrib@QEglContext@@QBE_NHPAH@Z @ 12558 NONAME ; bool QEglContext::configAttrib(int, int *) const
 	??0QEglProperties@@QAE@ABV0@@Z @ 12559 NONAME ; QEglProperties::QEglProperties(class QEglProperties const &)
-	?config@QEglContext@@QBEHXZ @ 12560 NONAME ABSENT ; int QEglContext::config(void) const
-	?openDisplay@QEglContext@@QAE_NPAVQPaintDevice@@@Z @ 12561 NONAME ABSENT ; bool QEglContext::openDisplay(class QPaintDevice *)
-	?error@QEglContext@@SAHXZ @ 12562 NONAME ABSENT ; int QEglContext::error(void)
+	?config@QEglContext@@QBEHXZ @ 12560 NONAME ; int QEglContext::config(void) const
+	?clearFocusHelper@QGraphicsItemPrivate@@QAEX_N@Z @ 12561 NONAME ; void QGraphicsItemPrivate::clearFocusHelper(bool)
+	?error@QEglContext@@SAHXZ @ 12562 NONAME ; int QEglContext::error(void)
 	?swapBuffers@QEglContext@@QAE_NH@Z @ 12563 NONAME ; bool QEglContext::swapBuffers(int)
-	?setApi@QEglContext@@QAEXW4API@QEgl@@@Z @ 12564 NONAME ; void QEglContext::setApi(enum QEgl::API)
-	?makeCurrent@QEglContext@@QAE_NH@Z @ 12565 NONAME ; bool QEglContext::makeCurrent(int)
-	?createSurface@QEglContext@@QAEHPAVQPaintDevice@@PBVQEglProperties@@@Z @ 12566 NONAME ; int QEglContext::createSurface(class QPaintDevice *, class QEglProperties const *)
-	?dumpAllConfigs@QEglContext@@QAEXXZ @ 12567 NONAME ABSENT ; void QEglContext::dumpAllConfigs(void)
-	?reduceConfiguration@QEglProperties@@QAE_NXZ @ 12568 NONAME ; bool QEglProperties::reduceConfiguration(void)
-	?removeValue@QEglProperties@@QAE_NH@Z @ 12569 NONAME ; bool QEglProperties::removeValue(int)
-	?toString@QEglProperties@@QBE?AVQString@@XZ @ 12570 NONAME ; class QString QEglProperties::toString(void) const
-	?dumpAllConfigs@QEglProperties@@SAXXZ @ 12571 NONAME ABSENT ; void QEglProperties::dumpAllConfigs(void)
-	?defaultDisplay@QEglContext@@SAHPAVQPaintDevice@@@Z @ 12572 NONAME ABSENT ; int QEglContext::defaultDisplay(class QPaintDevice *)
-	?configProperties@QEglContext@@QBE?AVQEglProperties@@H@Z @ 12573 NONAME ABSENT ; class QEglProperties QEglContext::configProperties(int) const
-	?properties@QEglProperties@@QBEPBHXZ @ 12574 NONAME ; int const * QEglProperties::properties(void) const
-	??0QEglContext@@QAE@XZ @ 12575 NONAME ; QEglContext::QEglContext(void)
-	??1QEglContext@@QAE@XZ @ 12576 NONAME ; QEglContext::~QEglContext(void)
-	?isValid@QEglContext@@QBE_NXZ @ 12577 NONAME ; bool QEglContext::isValid(void) const
-	?value@QEglProperties@@QBEHH@Z @ 12578 NONAME ; int QEglProperties::value(int) const
-	?clearError@QEglContext@@SAXXZ @ 12579 NONAME ABSENT ; void QEglContext::clearError(void)
-	??0QEglProperties@@QAE@H@Z @ 12580 NONAME ; QEglProperties::QEglProperties(int)
-	?setValue@QEglProperties@@QAEXHH@Z @ 12581 NONAME ; void QEglProperties::setValue(int, int)
-	?setPaintDeviceFormat@QEglProperties@@QAEXPAVQPaintDevice@@@Z @ 12582 NONAME ; void QEglProperties::setPaintDeviceFormat(class QPaintDevice *)
-	?destroy@QEglContext@@QAEXXZ @ 12583 NONAME ABSENT ; void QEglContext::destroy(void)
-	?setRenderableType@QEglProperties@@QAEXW4API@QEgl@@@Z @ 12584 NONAME ; void QEglProperties::setRenderableType(enum QEgl::API)
-	?setContext@QEglContext@@QAEXH@Z @ 12585 NONAME ; void QEglContext::setContext(int)
-	?waitClient@QEglContext@@QAEXXZ @ 12586 NONAME ABSENT ; void QEglContext::waitClient(void)
-	?isEmpty@QEglProperties@@QBE_NXZ @ 12587 NONAME ; bool QEglProperties::isEmpty(void) const
-	?getDisplay@QEglContext@@CAHPAVQPaintDevice@@@Z @ 12588 NONAME ABSENT ; int QEglContext::getDisplay(class QPaintDevice *)
-	?isSharing@QEglContext@@QBE_NXZ @ 12589 NONAME ; bool QEglContext::isSharing(void) const
-	?isCurrent@QEglContext@@QBE_NXZ @ 12590 NONAME ; bool QEglContext::isCurrent(void) const
-	??0QEglProperties@@QAE@XZ @ 12591 NONAME ; QEglProperties::QEglProperties(void)
-	?extensions@QEglContext@@SA?AVQString@@XZ @ 12592 NONAME ABSENT ; class QString QEglContext::extensions(void)
-	?setCurrentContext@QEglContext@@CAXW4API@QEgl@@PAV1@@Z @ 12593 NONAME ; void QEglContext::setCurrentContext(enum QEgl::API, class QEglContext *)
-	??1QEglProperties@@QAE@XZ @ 12594 NONAME ; QEglProperties::~QEglProperties(void)
-	?createContext@QEglContext@@QAE_NPAV1@PBVQEglProperties@@@Z @ 12595 NONAME ; bool QEglContext::createContext(class QEglContext *, class QEglProperties const *)
-	?setConfig@QEglContext@@QAEXH@Z @ 12596 NONAME ; void QEglContext::setConfig(int)
-	?hasExtension@QEglContext@@SA_NPBD@Z @ 12597 NONAME ABSENT ; bool QEglContext::hasExtension(char const *)
-	?doneCurrent@QEglContext@@QAE_NXZ @ 12598 NONAME ; bool QEglContext::doneCurrent(void)
-	?display@QEglContext@@QBEHXZ @ 12599 NONAME ABSENT ; int QEglContext::display(void) const
-	?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12600 NONAME ; void QEglProperties::setPixelFormat(enum QImage::Format)
-	?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12601 NONAME ; class QEglContext * QEglContext::currentContext(enum QEgl::API)
-	?errorString@QEglContext@@SA?AVQString@@H@Z @ 12602 NONAME ABSENT ; class QString QEglContext::errorString(int)
-	?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12603 NONAME ; bool QFontDatabase::removeAllApplicationFonts()
-	??0FileInfo@QZipReader@@QAE@XZ @ 12604 NONAME ; QZipReader::FileInfo::FileInfo(void)
-	??0QAbstractScrollAreaPrivate@@QAE@XZ @ 12605 NONAME ; QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate(void)
-	??0QGraphicsViewPrivate@@QAE@XZ @ 12606 NONAME ; QGraphicsViewPrivate::QGraphicsViewPrivate(void)
-	??0QKeySequence@@QAE@ABVQString@@W4SequenceFormat@0@@Z @ 12607 NONAME ; QKeySequence::QKeySequence(class QString const &, enum QKeySequence::SequenceFormat)
-	??0QStaticText@@QAE@ABV0@@Z @ 12608 NONAME ; QStaticText::QStaticText(class QStaticText const &)
-	??0QStaticText@@QAE@ABVQString@@ABVQSizeF@@@Z @ 12609 NONAME ABSENT ; QStaticText::QStaticText(class QString const &, class QSizeF const &)
-	??0QStaticText@@QAE@XZ @ 12610 NONAME ; QStaticText::QStaticText(void)
-	??0QStaticTextItem@@QAE@XZ @ 12611 NONAME ; QStaticTextItem::QStaticTextItem(void)
-	??0QZipReader@@QAE@ABVQString@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 12612 NONAME ; QZipReader::QZipReader(class QString const &, class QFlags<enum QIODevice::OpenModeFlag>)
-	??0QZipReader@@QAE@PAVQIODevice@@@Z @ 12613 NONAME ; QZipReader::QZipReader(class QIODevice *)
-	??1FileInfo@QZipReader@@QAE@XZ @ 12614 NONAME ; QZipReader::FileInfo::~FileInfo(void)
-	??1QAbstractScrollAreaPrivate@@UAE@XZ @ 12615 NONAME ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(void)
-	??1QGraphicsViewPrivate@@UAE@XZ @ 12616 NONAME ; QGraphicsViewPrivate::~QGraphicsViewPrivate(void)
-	??1QStaticText@@QAE@XZ @ 12617 NONAME ; QStaticText::~QStaticText(void)
-	??1QStaticTextItem@@QAE@XZ @ 12618 NONAME ; QStaticTextItem::~QStaticTextItem(void)
-	??1QZipReader@@QAE@XZ @ 12619 NONAME ; QZipReader::~QZipReader(void)
-	??4FileInfo@QZipReader@@QAEAAU01@ABU01@@Z @ 12620 NONAME ; struct QZipReader::FileInfo & QZipReader::FileInfo::operator=(struct QZipReader::FileInfo const &)
-	??4QStaticText@@QAEAAV0@ABV0@@Z @ 12621 NONAME ; class QStaticText & QStaticText::operator=(class QStaticText const &)
-	??8QStaticText@@QBE_NABV0@@Z @ 12622 NONAME ; bool QStaticText::operator==(class QStaticText const &) const
-	??9QStaticText@@QBE_NABV0@@Z @ 12623 NONAME ; bool QStaticText::operator!=(class QStaticText const &) const
-	??_EQAbstractScrollAreaPrivate@@UAE@I@Z @ 12624 NONAME ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(unsigned int)
-	??_EQGraphicsViewPrivate@@UAE@I@Z @ 12625 NONAME ; QGraphicsViewPrivate::~QGraphicsViewPrivate(unsigned int)
-	?_q_hslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12626 NONAME ; void QAbstractScrollAreaPrivate::_q_hslide(int)
-	?_q_setViewportCursor@QGraphicsViewPrivate@@QAEXABVQCursor@@@Z @ 12627 NONAME ; void QGraphicsViewPrivate::_q_setViewportCursor(class QCursor const &)
-	?_q_showOrHideScrollBars@QAbstractScrollAreaPrivate@@QAEXXZ @ 12628 NONAME ; void QAbstractScrollAreaPrivate::_q_showOrHideScrollBars(void)
-	?_q_unsetViewportCursor@QGraphicsViewPrivate@@QAEXXZ @ 12629 NONAME ; void QGraphicsViewPrivate::_q_unsetViewportCursor(void)
-	?_q_vslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12630 NONAME ; void QAbstractScrollAreaPrivate::_q_vslide(int)
-	?allocStyleOptionsArray@QGraphicsViewPrivate@@QAEPAVQStyleOptionGraphicsItem@@H@Z @ 12631 NONAME ; class QStyleOptionGraphicsItem * QGraphicsViewPrivate::allocStyleOptionsArray(int)
-	?anchorAt@QPlainTextEdit@@QBE?AVQString@@ABVQPoint@@@Z @ 12632 NONAME ; class QString QPlainTextEdit::anchorAt(class QPoint const &) const
-	?assign@QKeySequence@@AAEHABVQString@@W4SequenceFormat@1@@Z @ 12633 NONAME ; int QKeySequence::assign(class QString const &, enum QKeySequence::SequenceFormat)
-	?autoFillBackground@QGraphicsWidget@@QBE_NXZ @ 12634 NONAME ; bool QGraphicsWidget::autoFillBackground(void) const
-	?canKeypadNavigate@QWidgetPrivate@@SA_NW4Orientation@Qt@@@Z @ 12635 NONAME ; bool QWidgetPrivate::canKeypadNavigate(enum Qt::Orientation)
-	?centerView@QGraphicsViewPrivate@@QAEXW4ViewportAnchor@QGraphicsView@@@Z @ 12636 NONAME ; void QGraphicsViewPrivate::centerView(enum QGraphicsView::ViewportAnchor)
-	?clearUndoRedoStacks@QTextDocument@@QAEXW4Stacks@1@@Z @ 12637 NONAME ; void QTextDocument::clearUndoRedoStacks(enum QTextDocument::Stacks)
-	?close@QZipReader@@QAEXXZ @ 12638 NONAME ; void QZipReader::close(void)
-	?constBits@QImage@@QBEPBEXZ @ 12639 NONAME ; unsigned char const * QImage::constBits(void) const
-	?constScanLine@QImage@@QBEPBEH@Z @ 12640 NONAME ; unsigned char const * QImage::constScanLine(int) const
-	?contentsOffset@QAbstractScrollAreaPrivate@@UBE?AVQPoint@@XZ @ 12641 NONAME ; class QPoint QAbstractScrollAreaPrivate::contentsOffset(void) const
-	?convertFromImage@QPixmap@@QAE_NABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12642 NONAME ; bool QPixmap::convertFromImage(class QImage const &, class QFlags<enum Qt::ImageConversionFlag>)
-	?count@QZipReader@@QBEHXZ @ 12643 NONAME ; int QZipReader::count(void) const
-	?create@Fragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12644 NONAME ABSENT ; class QPainter::Fragment QPainter::Fragment::create(class QPointF const &, class QRectF const &, float, float, float, float)
-	?detach@QStaticText@@AAEXXZ @ 12645 NONAME ; void QStaticText::detach(void)
-	?directoryLoaded@QFileSystemModel@@IAEXABVQString@@@Z @ 12646 NONAME ; void QFileSystemModel::directoryLoaded(class QString const &)
-	?dispatchPendingUpdateRequests@QGraphicsViewPrivate@@QAEXXZ @ 12647 NONAME ; void QGraphicsViewPrivate::dispatchPendingUpdateRequests(void)
-	?drawPixmapFragments@QPaintEngineEx@@UAEXPBVFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12648 NONAME ABSENT ; void QPaintEngineEx::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags<enum QPainter::FragmentHint>)
-	?drawPixmapFragments@QPainter@@QAEXPBVFragment@1@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12649 NONAME ABSENT ; void QPainter::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags<enum QPainter::FragmentHint>)
-	?drawStaticText@QPainter@@QAEXABVQPoint@@ABVQStaticText@@@Z @ 12650 NONAME ; void QPainter::drawStaticText(class QPoint const &, class QStaticText const &)
-	?drawStaticText@QPainter@@QAEXABVQPointF@@ABVQStaticText@@@Z @ 12651 NONAME ; void QPainter::drawStaticText(class QPointF const &, class QStaticText const &)
-	?drawStaticText@QPainter@@QAEXHHABVQStaticText@@@Z @ 12652 NONAME ; void QPainter::drawStaticText(int, int, class QStaticText const &)
-	?entryInfoAt@QZipReader@@QBE?AUFileInfo@1@H@Z @ 12653 NONAME ; struct QZipReader::FileInfo QZipReader::entryInfoAt(int) const
-	?exists@QZipReader@@QBE_NXZ @ 12654 NONAME ; bool QZipReader::exists(void) const
-	?extractAll@QZipReader@@QBE_NABVQString@@@Z @ 12655 NONAME ; bool QZipReader::extractAll(class QString const &) const
-	?fileData@QZipReader@@QBE?AVQByteArray@@ABVQString@@@Z @ 12656 NONAME ; class QByteArray QZipReader::fileData(class QString const &) const
-	?fileInfoList@QZipReader@@QBE?AV?$QList@UFileInfo@QZipReader@@@@XZ @ 12657 NONAME ; class QList<struct QZipReader::FileInfo> QZipReader::fileInfoList(void) const
-	?findItems@QGraphicsViewPrivate@@QBE?AV?$QList@PAVQGraphicsItem@@@@ABVQRegion@@PA_NABVQTransform@@@Z @ 12658 NONAME ; class QList<class QGraphicsItem *> QGraphicsViewPrivate::findItems(class QRegion const &, bool *, class QTransform const &) const
-	?fixup@QIntValidator@@UBEXAAVQString@@@Z @ 12659 NONAME ; void QIntValidator::fixup(class QString &) const
-	?freeStyleOptionsArray@QGraphicsViewPrivate@@QAEXPAVQStyleOptionGraphicsItem@@@Z @ 12660 NONAME ; void QGraphicsViewPrivate::freeStyleOptionsArray(class QStyleOptionGraphicsItem *)
-	?getPixmapCursor@QApplicationPrivate@@QAE?AVQPixmap@@W4CursorShape@Qt@@@Z @ 12661 NONAME ; class QPixmap QApplicationPrivate::getPixmapCursor(enum Qt::CursorShape)
-	?getSubRange@QBezier@@QBE?AV1@MM@Z @ 12662 NONAME ; class QBezier QBezier::getSubRange(float, float) const
-	?hasSelectedText@QLabel@@QBE_NXZ @ 12663 NONAME ; bool QLabel::hasSelectedText(void) const
-	?horizontalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12664 NONAME ; long long QGraphicsViewPrivate::horizontalScroll(void) const
-	?inTabWidget@QWidgetPrivate@@SA_NPAVQWidget@@@Z @ 12665 NONAME ; bool QWidgetPrivate::inTabWidget(class QWidget *)
-	?init@QAbstractScrollAreaPrivate@@QAEXXZ @ 12666 NONAME ; void QAbstractScrollAreaPrivate::init(void)
-	?isImageCached@QImagePixmapCleanupHooks@@SA_NABVQImage@@@Z @ 12667 NONAME ; bool QImagePixmapCleanupHooks::isImageCached(class QImage const &)
-	?isPixmapCached@QImagePixmapCleanupHooks@@SA_NABVQPixmap@@@Z @ 12668 NONAME ; bool QImagePixmapCleanupHooks::isPixmapCached(class QPixmap const &)
-	?isReadable@QZipReader@@QBE_NXZ @ 12669 NONAME ; bool QZipReader::isReadable(void) const
-	?isValidColor@QColor@@SA_NABVQString@@@Z @ 12670 NONAME ; bool QColor::isValidColor(class QString const &)
-	?layoutChildren@QAbstractScrollAreaPrivate@@QAEXXZ @ 12671 NONAME ; void QAbstractScrollAreaPrivate::layoutChildren(void)
-	?mapBy@QBezier@@QBE?AV1@ABVQTransform@@@Z @ 12672 NONAME ; class QBezier QBezier::mapBy(class QTransform const &) const
-	?mapRectFromScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12673 NONAME ; class QRectF QGraphicsViewPrivate::mapRectFromScene(class QRectF const &) const
-	?mapRectToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABVQRect@@@Z @ 12674 NONAME ; class QRectF QGraphicsViewPrivate::mapRectToScene(class QRect const &) const
-	?mapToScene@QGraphicsViewPrivate@@QBE?AVQPointF@@ABV2@@Z @ 12675 NONAME ; class QPointF QGraphicsViewPrivate::mapToScene(class QPointF const &) const
-	?mapToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12676 NONAME ; class QRectF QGraphicsViewPrivate::mapToScene(class QRectF const &) const
-	?mapToViewRect@QGraphicsViewPrivate@@QBE?AVQRect@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12677 NONAME ; class QRect QGraphicsViewPrivate::mapToViewRect(class QGraphicsItem const *, class QRectF const &) const
-	?mapToViewRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12678 NONAME ; class QRegion QGraphicsViewPrivate::mapToViewRegion(class QGraphicsItem const *, class QRectF const &) const
-	?maximumSize@QStaticText@@QBE?AVQSizeF@@XZ @ 12679 NONAME ABSENT ; class QSizeF QStaticText::maximumSize(void) const
-	?mouseMoveEventHandler@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12680 NONAME ; void QGraphicsViewPrivate::mouseMoveEventHandler(class QMouseEvent *)
-	?performanceHint@QStaticText@@QBE?AW4PerformanceHint@1@XZ @ 12681 NONAME ; enum QStaticText::PerformanceHint QStaticText::performanceHint(void) const
-	?populate@QTextureGlyphCache@@QAEXPAVQFontEngine@@HPBIPBUQFixedPoint@@@Z @ 12682 NONAME ; void QTextureGlyphCache::populate(class QFontEngine *, int, unsigned int const *, struct QFixedPoint const *)
-	?populateSceneDragDropEvent@QGraphicsViewPrivate@@QAEXPAVQGraphicsSceneDragDropEvent@@PAVQDropEvent@@@Z @ 12683 NONAME ; void QGraphicsViewPrivate::populateSceneDragDropEvent(class QGraphicsSceneDragDropEvent *, class QDropEvent *)
-	?positionInBlock@QTextCursor@@QBEHXZ @ 12684 NONAME ; int QTextCursor::positionInBlock(void) const
-	?prepare@QStaticText@@QAEXABVQTransform@@ABVQFont@@@Z @ 12685 NONAME ; void QStaticText::prepare(class QTransform const &, class QFont const &)
-	?processPendingUpdates@QGraphicsViewPrivate@@QAEXXZ @ 12686 NONAME ; void QGraphicsViewPrivate::processPendingUpdates(void)
-	?q_func@QAbstractScrollAreaPrivate@@AAEPAVQAbstractScrollArea@@XZ @ 12687 NONAME ; class QAbstractScrollArea * QAbstractScrollAreaPrivate::q_func(void)
-	?q_func@QAbstractScrollAreaPrivate@@ABEPBVQAbstractScrollArea@@XZ @ 12688 NONAME ; class QAbstractScrollArea const * QAbstractScrollAreaPrivate::q_func(void) const
-	?q_func@QGraphicsViewPrivate@@AAEPAVQGraphicsView@@XZ @ 12689 NONAME ; class QGraphicsView * QGraphicsViewPrivate::q_func(void)
-	?q_func@QGraphicsViewPrivate@@ABEPBVQGraphicsView@@XZ @ 12690 NONAME ; class QGraphicsView const * QGraphicsViewPrivate::q_func(void) const
-	?qt_draw_glyphs@@YAXPAVQPainter@@PBIPBVQPointF@@H@Z @ 12691 NONAME ; void qt_draw_glyphs(class QPainter *, unsigned int const *, class QPointF const *, int)
-	?recalculateContentSize@QGraphicsViewPrivate@@QAEXXZ @ 12692 NONAME ; void QGraphicsViewPrivate::recalculateContentSize(void)
-	?render@QWidgetPrivate@@QAEXPAVQPaintDevice@@ABVQPoint@@ABVQRegion@@V?$QFlags@W4RenderFlag@QWidget@@@@_N@Z @ 12693 NONAME ; void QWidgetPrivate::render(class QPaintDevice *, class QPoint const &, class QRegion const &, class QFlags<enum QWidget::RenderFlag>, bool)
-	?replaceScrollBar@QAbstractScrollAreaPrivate@@QAEXPAVQScrollBar@@W4Orientation@Qt@@@Z @ 12694 NONAME ; void QAbstractScrollAreaPrivate::replaceScrollBar(class QScrollBar *, enum Qt::Orientation)
-	?replayLastMouseEvent@QGraphicsViewPrivate@@QAEXXZ @ 12695 NONAME ; void QGraphicsViewPrivate::replayLastMouseEvent(void)
-	?rubberBandRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQWidget@@ABVQRect@@@Z @ 12696 NONAME ; class QRegion QGraphicsViewPrivate::rubberBandRegion(class QWidget const *, class QRect const &) const
-	?scrollBarPolicyChanged@QAbstractScrollAreaPrivate@@UAEXW4Orientation@Qt@@W4ScrollBarPolicy@3@@Z @ 12697 NONAME ; void QAbstractScrollAreaPrivate::scrollBarPolicyChanged(enum Qt::Orientation, enum Qt::ScrollBarPolicy)
-	?selectedText@QLabel@@QBE?AVQString@@XZ @ 12698 NONAME ; class QString QLabel::selectedText(void) const
-	?selectionStart@QLabel@@QBEHXZ @ 12699 NONAME ; int QLabel::selectionStart(void) const
-	?setAutoFillBackground@QGraphicsWidget@@QAEX_N@Z @ 12700 NONAME ; void QGraphicsWidget::setAutoFillBackground(bool)
-	?setColorFromString@QColor@@AAE_NABVQString@@@Z @ 12701 NONAME ; bool QColor::setColorFromString(class QString const &)
-	?setMaximumSize@QStaticText@@QAEXABVQSizeF@@@Z @ 12702 NONAME ABSENT ; void QStaticText::setMaximumSize(class QSizeF const &)
-	?setPerformanceHint@QStaticText@@QAEXW4PerformanceHint@1@@Z @ 12703 NONAME ; void QStaticText::setPerformanceHint(enum QStaticText::PerformanceHint)
-	?setSelection@QLabel@@QAEXHH@Z @ 12704 NONAME ; void QLabel::setSelection(int, int)
-	?setText@QStaticText@@QAEXABVQString@@@Z @ 12705 NONAME ; void QStaticText::setText(class QString const &)
-	?setTextFormat@QStaticText@@QAEXW4TextFormat@Qt@@@Z @ 12706 NONAME ; void QStaticText::setTextFormat(enum Qt::TextFormat)
-	?setUserData@QStaticTextItem@@QAEXPAVQStaticTextUserData@@@Z @ 12707 NONAME ; void QStaticTextItem::setUserData(class QStaticTextUserData *)
-	?size@QStaticText@@QBE?AVQSizeF@@XZ @ 12708 NONAME ; class QSizeF QStaticText::size(void) const
-	?status@QZipReader@@QBE?AW4Status@1@XZ @ 12709 NONAME ; enum QZipReader::Status QZipReader::status(void) const
-	?storeDragDropEvent@QGraphicsViewPrivate@@QAEXPBVQGraphicsSceneDragDropEvent@@@Z @ 12710 NONAME ; void QGraphicsViewPrivate::storeDragDropEvent(class QGraphicsSceneDragDropEvent const *)
-	?storeMouseEvent@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12711 NONAME ; void QGraphicsViewPrivate::storeMouseEvent(class QMouseEvent *)
-	?text@QStaticText@@QBE?AVQString@@XZ @ 12712 NONAME ; class QString QStaticText::text(void) const
-	?textFormat@QStaticText@@QBE?AW4TextFormat@Qt@@XZ @ 12713 NONAME ; enum Qt::TextFormat QStaticText::textFormat(void) const
-	?translateTouchEvent@QGraphicsViewPrivate@@SAXPAV1@PAVQTouchEvent@@@Z @ 12714 NONAME ; void QGraphicsViewPrivate::translateTouchEvent(class QGraphicsViewPrivate *, class QTouchEvent *)
-	?updateAll@QGraphicsViewPrivate@@QAEXXZ @ 12715 NONAME ; void QGraphicsViewPrivate::updateAll(void)
-	?updateInputMethodSensitivity@QGraphicsViewPrivate@@QAEXXZ @ 12716 NONAME ; void QGraphicsViewPrivate::updateInputMethodSensitivity(void)
-	?updateLastCenterPoint@QGraphicsViewPrivate@@QAEXXZ @ 12717 NONAME ; void QGraphicsViewPrivate::updateLastCenterPoint(void)
-	?updateRect@QGraphicsViewPrivate@@QAE_NABVQRect@@@Z @ 12718 NONAME ; bool QGraphicsViewPrivate::updateRect(class QRect const &)
-	?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRegion@@@Z @ 12719 NONAME ABSENT ; bool QGraphicsViewPrivate::updateRegion(class QRegion const &)
-	?updateScroll@QGraphicsViewPrivate@@QAEXXZ @ 12720 NONAME ; void QGraphicsViewPrivate::updateScroll(void)
-	?verticalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12721 NONAME ; long long QGraphicsViewPrivate::verticalScroll(void) const
-	?viewportEvent@QAbstractScrollAreaPrivate@@QAE_NPAVQEvent@@@Z @ 12722 NONAME ; bool QAbstractScrollAreaPrivate::viewportEvent(class QEvent *)
-	?visibilityChanged@QToolBar@@IAEX_N@Z @ 12723 NONAME ; void QToolBar::visibilityChanged(bool)
-	??0FileInfo@QZipReader@@QAE@ABU01@@Z @ 12724 NONAME ; QZipReader::FileInfo::FileInfo(struct QZipReader::FileInfo const &)
-	??0QStaticText@@QAE@ABVQString@@@Z @ 12725 NONAME ; QStaticText::QStaticText(class QString const &)
-	?append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12726 NONAME ABSENT ; void QGraphicsItemPrivate::append(class QDeclarativeListProperty<class QGraphicsObject> *, class QGraphicsObject *)
-	?bitPlaneCount@QImage@@QBEHXZ @ 12727 NONAME ; int QImage::bitPlaneCount(void) const
-	?childrenChanged@QGraphicsObject@@IAEXXZ @ 12728 NONAME ; void QGraphicsObject::childrenChanged(void)
-	?childrenList@QGraphicsItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQGraphicsObject@@@@XZ @ 12729 NONAME ; class QDeclarativeListProperty<class QGraphicsObject> QGraphicsItemPrivate::childrenList(void)
-	?clearFocusHelper@QGraphicsItemPrivate@@QAEX_N@Z @ 12730 NONAME ; void QGraphicsItemPrivate::clearFocusHelper(bool)
-	?commandDescription@QPaintBuffer@@QBE?AVQString@@H@Z @ 12731 NONAME ; class QString QPaintBuffer::commandDescription(int) const
-	?create@PixmapFragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12732 NONAME ; class QPainter::PixmapFragment QPainter::PixmapFragment::create(class QPointF const &, class QRectF const &, float, float, float, float)
-	?device@QZipReader@@QBEPAVQIODevice@@XZ @ 12733 NONAME ; class QIODevice * QZipReader::device(void) const
-	?drawPixmapFragments@QPaintEngineEx@@UAEXPBVPixmapFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12734 NONAME ; void QPaintEngineEx::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>)
-	?drawPixmapFragments@QPainter@@QAEXPBVPixmapFragment@1@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12735 NONAME ; void QPainter::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>)
-	?frameEndIndex@QPaintBuffer@@QBEHH@Z @ 12736 NONAME ; int QPaintBuffer::frameEndIndex(int) const
-	?frameStartIndex@QPaintBuffer@@QBEHH@Z @ 12737 NONAME ; int QPaintBuffer::frameStartIndex(int) const
-	?geometryChanged@QGraphicsWidget@@IAEXXZ @ 12738 NONAME ; void QGraphicsWidget::geometryChanged(void)
-	?getGlyphBearings@QFontEngine@@UAEXIPAM0@Z @ 12739 NONAME ; void QFontEngine::getGlyphBearings(unsigned int, float *, float *)
-	?height@QGraphicsItemPrivate@@UBEMXZ @ 12740 NONAME ; float QGraphicsItemPrivate::height(void) const
-	?heightChanged@QGraphicsObject@@IAEXXZ @ 12741 NONAME ; void QGraphicsObject::heightChanged(void)
-	?horizontalAdvance@QTextLine@@QBEMXZ @ 12742 NONAME ; float QTextLine::horizontalAdvance(void) const
-	?isValid@FileInfo@QZipReader@@QBE_NXZ @ 12743 NONAME ; bool QZipReader::FileInfo::isValid(void) const
-	?layoutChanged@QGraphicsWidget@@IAEXXZ @ 12744 NONAME ; void QGraphicsWidget::layoutChanged(void)
-	?pageAdded@QWizard@@IAEXH@Z @ 12745 NONAME ; void QWizard::pageAdded(int)
-	?pageRemoved@QWizard@@IAEXH@Z @ 12746 NONAME ; void QWizard::pageRemoved(int)
-	?paste@QLineControl@@QAEXW4Mode@QClipboard@@@Z @ 12747 NONAME ; void QLineControl::paste(enum QClipboard::Mode)
-	?paste@QTextControl@@QAEXW4Mode@QClipboard@@@Z @ 12748 NONAME ; void QTextControl::paste(enum QClipboard::Mode)
-	?placeholderText@QLineEdit@@QBE?AVQString@@XZ @ 12749 NONAME ; class QString QLineEdit::placeholderText(void) const
-	?prependGraphicsTransform@QGraphicsItemPrivate@@QAEXPAVQGraphicsTransform@@@Z @ 12750 NONAME ; void QGraphicsItemPrivate::prependGraphicsTransform(class QGraphicsTransform *)
-	?processCommands@QPaintBuffer@@QBEHPAVQPainter@@HH@Z @ 12751 NONAME ; int QPaintBuffer::processCommands(class QPainter *, int, int) const
-	?processCommands@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@HH@Z @ 12752 NONAME ; void QPainterReplayer::processCommands(class QPaintBuffer const &, class QPainter *, int, int)
-	?resetHeight@QGraphicsItemPrivate@@UAEXXZ @ 12753 NONAME ; void QGraphicsItemPrivate::resetHeight(void)
-	?resetWidth@QGraphicsItemPrivate@@UAEXXZ @ 12754 NONAME ; void QGraphicsItemPrivate::resetWidth(void)
-	?resizeEvent@QSplitterHandle@@MAEXPAVQResizeEvent@@@Z @ 12755 NONAME ; void QSplitterHandle::resizeEvent(class QResizeEvent *)
-	?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N1@Z @ 12756 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool, bool)
-	?setHeight@QGraphicsItemPrivate@@UAEXM@Z @ 12757 NONAME ; void QGraphicsItemPrivate::setHeight(float)
-	?setPlaceholderText@QLineEdit@@QAEXABVQString@@@Z @ 12758 NONAME ; void QLineEdit::setPlaceholderText(class QString const &)
-	?setSideWidget@QWizard@@QAEXPAVQWidget@@@Z @ 12759 NONAME ; void QWizard::setSideWidget(class QWidget *)
-	?setTextWidth@QStaticText@@QAEXM@Z @ 12760 NONAME ; void QStaticText::setTextWidth(float)
-	?setWidth@QGraphicsItemPrivate@@UAEXM@Z @ 12761 NONAME ; void QGraphicsItemPrivate::setWidth(float)
-	?sideWidget@QWizard@@QBEPAVQWidget@@XZ @ 12762 NONAME ; class QWidget * QWizard::sideWidget(void) const
-	?textWidth@QStaticText@@QBEMXZ @ 12763 NONAME ; float QStaticText::textWidth(void) const
-	?updateDisplayText@QLineControl@@AAEX_N@Z @ 12764 NONAME ; void QLineControl::updateDisplayText(bool)
-	?updateMicroFocus@QGraphicsItem@@IAEXXZ @ 12765 NONAME ; void QGraphicsItem::updateMicroFocus(void)
-	?updateMicroFocus@QGraphicsObject@@IAEXXZ @ 12766 NONAME ; void QGraphicsObject::updateMicroFocus(void)
-	?width@QGraphicsItemPrivate@@UBEMXZ @ 12767 NONAME ; float QGraphicsItemPrivate::width(void) const
-	?widthChanged@QGraphicsObject@@IAEXXZ @ 12768 NONAME ; void QGraphicsObject::widthChanged(void)
-	?children_append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12769 NONAME ; void QGraphicsItemPrivate::children_append(class QDeclarativeListProperty<class QGraphicsObject> *, class QGraphicsObject *)
-	?children_at@QGraphicsItemPrivate@@SAPAVQGraphicsObject@@PAV?$QDeclarativeListProperty@VQGraphicsObject@@@@H@Z @ 12770 NONAME ; class QGraphicsObject * QGraphicsItemPrivate::children_at(class QDeclarativeListProperty<class QGraphicsObject> *, int)
-	?children_count@QGraphicsItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@@Z @ 12771 NONAME ; int QGraphicsItemPrivate::children_count(class QDeclarativeListProperty<class QGraphicsObject> *)
-	?display@QEglContext@@QAEHXZ @ 12772 NONAME ; int QEglContext::display(void)
-	?defaultConfig@QEgl@@YAHHW4API@1@V?$QFlags@W4ConfigOption@QEgl@@@@@Z @ 12773 NONAME ; int QEgl::defaultConfig(int, enum QEgl::API, class QFlags<enum QEgl::ConfigOption>)
-	?configAttrib@QEglContext@@QBEHH@Z @ 12774 NONAME ; int QEglContext::configAttrib(int) const
-	?error@QEgl@@YAHXZ @ 12775 NONAME ABSENT ; int QEgl::error(void)
-	?errorString@QEgl@@YA?AVQString@@XZ @ 12776 NONAME ABSENT ; class QString QEgl::errorString(void)
-	?configProperties@QEglContext@@QBE?AVQEglProperties@@XZ @ 12777 NONAME ABSENT ; class QEglProperties QEglContext::configProperties(void) const
-	?extensions@QEgl@@YA?AVQString@@XZ @ 12778 NONAME ; class QString QEgl::extensions(void)
-	?nativePixmap@QEgl@@YAPAXPAVQPixmap@@@Z @ 12779 NONAME ; void * QEgl::nativePixmap(class QPixmap *)
-	?display@QEgl@@YAHXZ @ 12780 NONAME ; int QEgl::display(void)
-	?eglCreateImageKHR@QEgl@@YAHHHHHPBH@Z @ 12781 NONAME ; int QEgl::eglCreateImageKHR(int, int, int, int, int const *)
-	?hasExtension@QEgl@@YA_NPBD@Z @ 12782 NONAME ; bool QEgl::hasExtension(char const *)
-	?destroyContext@QEglContext@@QAEXXZ @ 12783 NONAME ; void QEglContext::destroyContext(void)
-	?nativeWindow@QEgl@@YAPAXPAVQWidget@@@Z @ 12784 NONAME ; void * QEgl::nativeWindow(class QWidget *)
-	?errorString@QEgl@@YA?AVQString@@H@Z @ 12785 NONAME ; class QString QEgl::errorString(int)
-	?chooseConfig@QEgl@@YAHPBVQEglProperties@@W4PixelFormatMatch@1@@Z @ 12786 NONAME ; int QEgl::chooseConfig(class QEglProperties const *, enum QEgl::PixelFormatMatch)
-	?eglDestroyImageKHR@QEgl@@YAHHH@Z @ 12787 NONAME ; int QEgl::eglDestroyImageKHR(int, int)
-	?isEmpty@QItemSelectionRange@@QBE_NXZ @ 12788 NONAME ; bool QItemSelectionRange::isEmpty(void) const
-	?clearError@QEgl@@YAXXZ @ 12789 NONAME ABSENT ; void QEgl::clearError(void)
-	?nativeDisplay@QEgl@@YAHXZ @ 12790 NONAME ; int QEgl::nativeDisplay(void)
-	?dumpAllConfigs@QEgl@@YAXXZ @ 12791 NONAME ; void QEgl::dumpAllConfigs(void)
-	?setDeviceType@QEglProperties@@QAEXH@Z @ 12792 NONAME ; void QEglProperties::setDeviceType(int)
-	?glyphPadding@QTextureGlyphCache@@UBEHXZ @ 12793 NONAME ; int QTextureGlyphCache::glyphPadding(void) const
-	?createSurface@QEgl@@YAHPAVQPaintDevice@@HPBVQEglProperties@@@Z @ 12794 NONAME ; int QEgl::createSurface(class QPaintDevice *, int, class QEglProperties const *)
-	?setPartialUpdateSupport@QWindowSurface@@IAEX_N@Z @ 12795 NONAME ; void QWindowSurface::setPartialUpdateSupport(bool)
-	?transformChanged@QGraphicsItemPrivate@@UAEXXZ @ 12796 NONAME ; void QGraphicsItemPrivate::transformChanged(void)
-	?hasPartialUpdateSupport@QWindowSurface@@QBE_NXZ @ 12797 NONAME ; bool QWindowSurface::hasPartialUpdateSupport(void) const
-	?name@QIcon@@QBE?AVQString@@XZ @ 12798 NONAME ; class QString QIcon::name(void) const
-	?iconName@QIconEngineV2@@QAE?AVQString@@XZ @ 12799 NONAME ; class QString QIconEngineV2::iconName(void)
-	?updateRectF@QGraphicsViewPrivate@@QAE_NABVQRectF@@@Z @ 12800 NONAME ; bool QGraphicsViewPrivate::updateRectF(class QRectF const &)
-	?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRectF@@ABVQTransform@@@Z @ 12801 NONAME ; bool QGraphicsViewPrivate::updateRegion(class QRectF const &, class QTransform const &)
-	?totalUsed@QPixmapCache@@SAHXZ @ 12802 NONAME ; int QPixmapCache::totalUsed(void)
-	?allPixmaps@QPixmapCache@@SA?AV?$QList@U?$QPair@VQString@@VQPixmap@@@@@@XZ @ 12803 NONAME ; class QList<struct QPair<class QString, class QPixmap> > QPixmapCache::allPixmaps(void)
-	?flushDetachedPixmaps@QPixmapCache@@SAXXZ @ 12804 NONAME ; void QPixmapCache::flushDetachedPixmaps(void)
-	??0QImageTextureGlyphCache@@QAE@W4Type@QFontEngineGlyphCache@@ABVQTransform@@@Z @ 12805 NONAME ; QImageTextureGlyphCache::QImageTextureGlyphCache(enum QFontEngineGlyphCache::Type, class QTransform const &)
-	??1QImageTextureGlyphCache@@UAE@XZ @ 12806 NONAME ; QImageTextureGlyphCache::~QImageTextureGlyphCache(void)
-	??_EQImageTextureGlyphCache@@UAE@I@Z @ 12807 NONAME ; QImageTextureGlyphCache::~QImageTextureGlyphCache(unsigned int)
-	?addToPolygon@QBezier@@QBEXPAVQPolygonF@@M@Z @ 12808 NONAME ; void QBezier::addToPolygon(class QPolygonF *, float) const
-	?createTextureData@QImageTextureGlyphCache@@UAEXHH@Z @ 12809 NONAME ; void QImageTextureGlyphCache::createTextureData(int, int)
-	?curveThreshold@QStrokerOps@@QBEMXZ @ 12810 NONAME ; float QStrokerOps::curveThreshold(void) const
-	?fillTexture@QImageTextureGlyphCache@@UAEXABUCoord@QTextureGlyphCache@@I@Z @ 12811 NONAME ; void QImageTextureGlyphCache::fillTexture(struct QTextureGlyphCache::Coord const &, unsigned int)
-	?glyphMargin@QImageTextureGlyphCache@@UBEHXZ @ 12812 NONAME ; int QImageTextureGlyphCache::glyphMargin(void) const
-	?image@QImageTextureGlyphCache@@QBEABVQImage@@XZ @ 12813 NONAME ; class QImage const & QImageTextureGlyphCache::image(void) const
-	?resizeTextureData@QImageTextureGlyphCache@@UAEXHH@Z @ 12814 NONAME ; void QImageTextureGlyphCache::resizeTextureData(int, int)
-	?setCurveThreshold@QStrokerOps@@QAEXM@Z @ 12815 NONAME ; void QStrokerOps::setCurveThreshold(float)
-	?setCurveThresholdFromTransform@QStrokerOps@@QAEXABVQTransform@@@Z @ 12816 NONAME ; void QStrokerOps::setCurveThresholdFromTransform(class QTransform const &)
-	?setUpdateClip@QGraphicsViewPrivate@@QAEXPAVQGraphicsItem@@@Z @ 12817 NONAME ; void QGraphicsViewPrivate::setUpdateClip(class QGraphicsItem *)
-	?toPolygon@QBezier@@QBE?AVQPolygonF@@M@Z @ 12818 NONAME ; class QPolygonF QBezier::toPolygon(float) const
-	?updatePaintedViewBoundingRects@QGraphicsItemPrivate@@QAEX_N@Z @ 12819 NONAME ; void QGraphicsItemPrivate::updatePaintedViewBoundingRects(bool)
+	?canKeypadNavigate@QWidgetPrivate@@SA_NW4Orientation@Qt@@@Z @ 12564 NONAME ; bool QWidgetPrivate::canKeypadNavigate(enum Qt::Orientation)
+	?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12565 NONAME ; bool QFontDatabase::removeAllApplicationFonts(void)
+	?setApi@QEglContext@@QAEXW4API@QEgl@@@Z @ 12566 NONAME ; void QEglContext::setApi(enum QEgl::API)
+	?updateDisplayText@QLineControl@@AAEX_N@Z @ 12567 NONAME ; void QLineControl::updateDisplayText(bool)
+	?makeCurrent@QEglContext@@QAE_NH@Z @ 12568 NONAME ; bool QEglContext::makeCurrent(int)
+	?isPixmapCached@QImagePixmapCleanupHooks@@SA_NABVQPixmap@@@Z @ 12569 NONAME ; bool QImagePixmapCleanupHooks::isPixmapCached(class QPixmap const &)
+	?createSurface@QEglContext@@QAEHPAVQPaintDevice@@PBVQEglProperties@@@Z @ 12570 NONAME ; int QEglContext::createSurface(class QPaintDevice *, class QEglProperties const *)
+	?dumpAllConfigs@QEglContext@@QAEXXZ @ 12571 NONAME ; void QEglContext::dumpAllConfigs(void)
+	?reduceConfiguration@QEglProperties@@QAE_NXZ @ 12572 NONAME ; bool QEglProperties::reduceConfiguration(void)
+	?nativeDisplay@QEglContext@@CAHXZ @ 12573 NONAME ; int QEglContext::nativeDisplay(void)
+	?getGlyphBearings@QFontEngine@@UAEXIPAM0@Z @ 12574 NONAME ; void QFontEngine::getGlyphBearings(unsigned int, float *, float *)
+	?removeValue@QEglProperties@@QAE_NH@Z @ 12575 NONAME ; bool QEglProperties::removeValue(int)
+	?toString@QEglProperties@@QBE?AVQString@@XZ @ 12576 NONAME ; class QString QEglProperties::toString(void) const
+	?isOpacityNull@QGraphicsItemPrivate@@QBE_NXZ @ 12577 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(void) const
+	?dumpAllConfigs@QEglProperties@@SAXXZ @ 12578 NONAME ; void QEglProperties::dumpAllConfigs(void)
+	?inTabWidget@QWidgetPrivate@@SA_NPAVQWidget@@@Z @ 12579 NONAME ; bool QWidgetPrivate::inTabWidget(class QWidget *)
+	?configProperties@QEglContext@@QBE?AVQEglProperties@@H@Z @ 12580 NONAME ; class QEglProperties QEglContext::configProperties(int) const
+	?properties@QEglProperties@@QBEPBHXZ @ 12581 NONAME ; int const * QEglProperties::properties(void) const
+	?destroyContext@QEglContext@@QAEXXZ @ 12582 NONAME ; void QEglContext::destroyContext(void)
+	??0QEglContext@@QAE@XZ @ 12583 NONAME ; QEglContext::QEglContext(void)
+	??1QEglContext@@QAE@XZ @ 12584 NONAME ; QEglContext::~QEglContext(void)
+	?isValid@QEglContext@@QBE_NXZ @ 12585 NONAME ; bool QEglContext::isValid(void) const
+	?value@QEglProperties@@QBEHH@Z @ 12586 NONAME ; int QEglProperties::value(int) const
+	?clearError@QEglContext@@SAXXZ @ 12587 NONAME ; void QEglContext::clearError(void)
+	??0QEglProperties@@QAE@H@Z @ 12588 NONAME ; QEglProperties::QEglProperties(int)
+	?setValue@QEglProperties@@QAEXHH@Z @ 12589 NONAME ; void QEglProperties::setValue(int, int)
+	?setPaintDeviceFormat@QEglProperties@@QAEXPAVQPaintDevice@@@Z @ 12590 NONAME ; void QEglProperties::setPaintDeviceFormat(class QPaintDevice *)
+	?isImageCached@QImagePixmapCleanupHooks@@SA_NABVQImage@@@Z @ 12591 NONAME ; bool QImagePixmapCleanupHooks::isImageCached(class QImage const &)
+	?setRenderableType@QEglProperties@@QAEXW4API@QEgl@@@Z @ 12592 NONAME ; void QEglProperties::setRenderableType(enum QEgl::API)
+	?setContext@QEglContext@@QAEXH@Z @ 12593 NONAME ; void QEglContext::setContext(int)
+	?waitClient@QEglContext@@QAEXXZ @ 12594 NONAME ; void QEglContext::waitClient(void)
+	?isEmpty@QEglProperties@@QBE_NXZ @ 12595 NONAME ; bool QEglProperties::isEmpty(void) const
+	?dpy@QEglContext@@0HA @ 12596 NONAME ; int QEglContext::dpy
+	?isSharing@QEglContext@@QBE_NXZ @ 12597 NONAME ; bool QEglContext::isSharing(void) const
+	?isCurrent@QEglContext@@QBE_NXZ @ 12598 NONAME ; bool QEglContext::isCurrent(void) const
+	??0QEglProperties@@QAE@XZ @ 12599 NONAME ; QEglProperties::QEglProperties(void)
+	?extensions@QEglContext@@SA?AVQString@@XZ @ 12600 NONAME ; class QString QEglContext::extensions(void)
+	?setCurrentContext@QEglContext@@CAXW4API@QEgl@@PAV1@@Z @ 12601 NONAME ; void QEglContext::setCurrentContext(enum QEgl::API, class QEglContext *)
+	??1QEglProperties@@QAE@XZ @ 12602 NONAME ; QEglProperties::~QEglProperties(void)
+	?createContext@QEglContext@@QAE_NPAV1@PBVQEglProperties@@@Z @ 12603 NONAME ; bool QEglContext::createContext(class QEglContext *, class QEglProperties const *)
+	?setConfig@QEglContext@@QAEXH@Z @ 12604 NONAME ; void QEglContext::setConfig(int)
+	?hasExtension@QEglContext@@SA_NPBD@Z @ 12605 NONAME ; bool QEglContext::hasExtension(char const *)
+	?doneCurrent@QEglContext@@QAE_NXZ @ 12606 NONAME ; bool QEglContext::doneCurrent(void)
+	?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12607 NONAME ; void QEglProperties::setPixelFormat(enum QImage::Format)
+	?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12608 NONAME ; class QEglContext * QEglContext::currentContext(enum QEgl::API)
+	?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N1@Z @ 12609 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool, bool)
+	?errorString@QEglContext@@SA?AVQString@@H@Z @ 12610 NONAME ; class QString QEglContext::errorString(int)
 
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index 48ba8d2..5dc282c 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -622,9 +622,9 @@ EXPORTS
 	_ZN14QObjectPrivate14deleteChildrenEv @ 621 NONAME
 	_ZN14QObjectPrivate14setDeleteWatchEPS_Pi @ 622 NONAME
 	_ZN14QObjectPrivate16resetDeleteWatchEPS_Pii @ 623 NONAME
-	_ZN14QObjectPrivate16setCurrentSenderEP7QObjectPNS_6SenderE @ 624 NONAME ABSENT
+	_ZN14QObjectPrivate16setCurrentSenderEP7QObjectPNS_6SenderE @ 624 NONAME
 	_ZN14QObjectPrivate16setParent_helperEP7QObject @ 625 NONAME
-	_ZN14QObjectPrivate18resetCurrentSenderEP7QObjectPNS_6SenderES3_ @ 626 NONAME ABSENT
+	_ZN14QObjectPrivate18resetCurrentSenderEP7QObjectPNS_6SenderES3_ @ 626 NONAME
 	_ZN14QObjectPrivate19_q_reregisterTimersEPv @ 627 NONAME
 	_ZN14QObjectPrivate19moveToThread_helperEv @ 628 NONAME
 	_ZN14QObjectPrivate20cleanConnectionListsEv @ 629 NONAME
@@ -803,9 +803,9 @@ EXPORTS
 	_ZN16QCoreApplicationD0Ev @ 802 NONAME
 	_ZN16QCoreApplicationD1Ev @ 803 NONAME
 	_ZN16QCoreApplicationD2Ev @ 804 NONAME
-	_ZN16QDeclarativeDataD0Ev @ 805 NONAME ABSENT
-	_ZN16QDeclarativeDataD1Ev @ 806 NONAME ABSENT
-	_ZN16QDeclarativeDataD2Ev @ 807 NONAME ABSENT
+	_ZN16QDeclarativeDataD0Ev @ 805 NONAME
+	_ZN16QDeclarativeDataD1Ev @ 806 NONAME
+	_ZN16QDeclarativeDataD2Ev @ 807 NONAME
 	_ZN16QEventTransition11qt_metacallEN11QMetaObject4CallEiPPv @ 808 NONAME
 	_ZN16QEventTransition11qt_metacastEPKc @ 809 NONAME
 	_ZN16QEventTransition12onTransitionEP6QEvent @ 810 NONAME
@@ -3332,7 +3332,7 @@ EXPORTS
 	_ZTI15QPauseAnimation @ 3331 NONAME
 	_ZTI15QSocketNotifier @ 3332 NONAME
 	_ZTI16QCoreApplication @ 3333 NONAME
-	_ZTI16QDeclarativeData @ 3334 NONAME ABSENT
+	_ZTI16QDeclarativeData @ 3334 NONAME
 	_ZTI16QEventTransition @ 3335 NONAME
 	_ZTI16QIODevicePrivate @ 3336 NONAME
 	_ZTI16QTextCodecPlugin @ 3337 NONAME
@@ -3407,7 +3407,7 @@ EXPORTS
 	_ZTV15QPauseAnimation @ 3406 NONAME
 	_ZTV15QSocketNotifier @ 3407 NONAME
 	_ZTV16QCoreApplication @ 3408 NONAME
-	_ZTV16QDeclarativeData @ 3409 NONAME ABSENT
+	_ZTV16QDeclarativeData @ 3409 NONAME
 	_ZTV16QEventTransition @ 3410 NONAME
 	_ZTV16QIODevicePrivate @ 3411 NONAME
 	_ZTV16QTextCodecPlugin @ 3412 NONAME
@@ -3652,59 +3652,6 @@ EXPORTS
 	_Z40QBasicAtomicPointer_fetchAndStoreAcquirePVPvS_ @ 3651 NONAME
 	_Z40QBasicAtomicPointer_fetchAndStoreRelaxedPVPvS_ @ 3652 NONAME
 	_Z40QBasicAtomicPointer_fetchAndStoreReleasePVPvS_ @ 3653 NONAME
-	_Z14qDecodeDataUrlRK4QUrl @ 3654 NONAME
-	_Z18qDetectCPUFeaturesv @ 3655 NONAME
-	_ZN10QByteArray7replaceEiiPKci @ 3656 NONAME
-	_ZN12QTextDecoderC1EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3657 NONAME
-	_ZN12QTextDecoderC2EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3658 NONAME
-	_ZN12QTextEncoderC1EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3659 NONAME
-	_ZN12QTextEncoderC2EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3660 NONAME
-	_ZN13QElapsedTimer10invalidateEv @ 3661 NONAME
-	_ZN13QElapsedTimer11isMonotonicEv @ 3662 NONAME
-	_ZN13QElapsedTimer5startEv @ 3663 NONAME
-	_ZN13QElapsedTimer7restartEv @ 3664 NONAME
-	_ZN13QElapsedTimer9clockTypeEv @ 3665 NONAME
-	_ZN20QStateMachinePrivate12clearHistoryEv @ 3666 NONAME
-	_ZN7QStringC1EPK5QChar @ 3667 NONAME
-	_ZN7QStringC2EPK5QChar @ 3668 NONAME
-	_ZN8QVariantC1ERK12QEasingCurve @ 3669 NONAME
-	_ZN8QVariantC2ERK12QEasingCurve @ 3670 NONAME
-	_ZN9QDateTime18currentDateTimeUtcEv @ 3671 NONAME
-	_ZN9QDateTime22currentMSecsSinceEpochEv @ 3672 NONAME
-	_ZN9QListData11detach_growEPii @ 3673 NONAME
-	_ZN9QListData6appendEi @ 3674 NONAME
-	_ZN9QListData6detachEi @ 3675 NONAME
-	_ZN9QMetaType15registerTypedefEPKci @ 3676 NONAME
-	_ZN9QMetaType23registerStreamOperatorsEiPFvR11QDataStreamPKvEPFvS1_PvE @ 3677 NONAME
-	_ZNK10QTextCodec11makeDecoderE6QFlagsINS_14ConversionFlagEE @ 3678 NONAME
-	_ZNK10QTextCodec11makeEncoderE6QFlagsINS_14ConversionFlagEE @ 3679 NONAME
-	_ZNK13QElapsedTimer10hasExpiredEx @ 3680 NONAME
-	_ZNK13QElapsedTimer19msecsSinceReferenceEv @ 3681 NONAME
-	_ZNK13QElapsedTimer6secsToERKS_ @ 3682 NONAME
-	_ZNK13QElapsedTimer7elapsedEv @ 3683 NONAME
-	_ZNK13QElapsedTimer7isValidEv @ 3684 NONAME
-	_ZNK13QElapsedTimer7msecsToERKS_ @ 3685 NONAME
-	_ZNK6QState11transitionsEv @ 3686 NONAME
-	_ZNK8QVariant13toEasingCurveEv @ 3687 NONAME
-	_ZlsR11QDataStreamRK12QEasingCurve @ 3688 NONAME
-	_ZltRK13QElapsedTimerS1_ @ 3689 NONAME
-	_ZrsR11QDataStreamR12QEasingCurve @ 3690 NONAME
-	_ZN9QDateTime18setMSecsSinceEpochEx @ 3691 NONAME
-	_ZN9QDateTime19fromMSecsSinceEpochEx @ 3692 NONAME
-	_ZNK9QDateTime17toMSecsSinceEpochEv @ 3693 NONAME
-	_ZN10QTextCodec11validCodecsEv @ 3694 NONAME
-	_ZN16QDeclarativeData13parentChangedE @ 3695 NONAME DATA 4 ABSENT
-	_ZN16QDeclarativeData9destroyedE @ 3696 NONAME DATA 4 ABSENT
-	_ZN24QAbstractDeclarativeData13parentChangedE @ 3697 NONAME DATA 4
-	_ZN24QAbstractDeclarativeData9destroyedE @ 3698 NONAME DATA 4
-	_ZN23QEventDispatcherSymbian12selectThreadEv @ 3699 NONAME
-	_ZN10QByteArray10setRawDataEPKcj @ 3700 NONAME
-	_ZN7QString10setRawDataEPK5QChari @ 3701 NONAME
-	_ZN23QCoreApplicationPrivate11symbianInitEv @ 3702 NONAME
-	_ZN23QEventDispatcherSymbian11qt_metacallEN11QMetaObject4CallEiPPv @ 3703 NONAME
-	_ZN23QEventDispatcherSymbian11qt_metacastEPKc @ 3704 NONAME
-	_ZN23QEventDispatcherSymbian16staticMetaObjectE @ 3705 NONAME DATA 16
-	_ZN23QEventDispatcherSymbian19getStaticMetaObjectEv @ 3706 NONAME
-	_ZNK23QEventDispatcherSymbian10metaObjectEv @ 3707 NONAME
-	_ZNK9QDateTime7msecsToERKS_ @ 3708 NONAME
+	_ZN10QTextCodec11validCodecsEv @ 3654 NONAME
+	_ZN20QStateMachinePrivate12clearHistoryEv @ 3655 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 6b05e9b..cfe2630 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -1,7 +1,7 @@
 EXPORTS
 	_Z11qFadeEffectP7QWidgeti @ 1 NONAME
 	_Z11qt_image_idRK6QImage @ 2 NONAME
-	_Z12qDrawPixmapsP8QPainterPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS1_11DrawingHintEE @ 3 NONAME ABSENT
+	_Z12qDrawPixmapsP8QPainterPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS1_11DrawingHintEE @ 3 NONAME
 	_Z12qt_pixmap_idRK7QPixmap @ 4 NONAME
 	_Z13qDrawWinPanelP8QPainterRK5QRectRK8QPalettebPK6QBrush @ 5 NONAME
 	_Z13qDrawWinPanelP8QPainteriiiiRK8QPalettebPK6QBrush @ 6 NONAME
@@ -1834,7 +1834,7 @@ EXPORTS
 	_ZN12QLineControl4initERK7QString @ 1833 NONAME
 	_ZN12QLineControl5clearEv @ 1834 NONAME
 	_ZN12QLineControl5fixupEv @ 1835 NONAME
-	_ZN12QLineControl5pasteEv @ 1836 NONAME ABSENT
+	_ZN12QLineControl5pasteEv @ 1836 NONAME
 	_ZN12QLineControl6insertERK7QString @ 1837 NONAME
 	_ZN12QLineControl8acceptedEv @ 1838 NONAME
 	_ZN12QLineControl8completeEi @ 1839 NONAME
@@ -2148,7 +2148,7 @@ EXPORTS
 	_ZN12QTextControl4undoEv @ 2147 NONAME
 	_ZN12QTextControl5clearEv @ 2148 NONAME
 	_ZN12QTextControl5eventEP6QEvent @ 2149 NONAME
-	_ZN12QTextControl5pasteEv @ 2150 NONAME ABSENT
+	_ZN12QTextControl5pasteEv @ 2150 NONAME
 	_ZN12QTextControl6appendERK7QString @ 2151 NONAME
 	_ZN12QTextControl7setHtmlERK7QString @ 2152 NONAME
 	_ZN12QTextControl8setFocusEbN2Qt11FocusReasonE @ 2153 NONAME
@@ -2906,7 +2906,7 @@ EXPORTS
 	_ZN14QPaintEngineEx10drawPointsEPK7QPointFi @ 2905 NONAME
 	_ZN14QPaintEngineEx11drawEllipseERK5QRect @ 2906 NONAME
 	_ZN14QPaintEngineEx11drawEllipseERK6QRectF @ 2907 NONAME
-	_ZN14QPaintEngineEx11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 2908 NONAME ABSENT
+	_ZN14QPaintEngineEx11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 2908 NONAME
 	_ZN14QPaintEngineEx11drawPolygonEPK6QPointiN12QPaintEngine15PolygonDrawModeE @ 2909 NONAME
 	_ZN14QPaintEngineEx11drawPolygonEPK7QPointFiN12QPaintEngine15PolygonDrawModeE @ 2910 NONAME
 	_ZN14QPaintEngineEx11updateStateERK17QPaintEngineState @ 2911 NONAME
@@ -3726,7 +3726,7 @@ EXPORTS
 	_ZN16QFileSystemModelD1Ev @ 3725 NONAME
 	_ZN16QFileSystemModelD2Ev @ 3726 NONAME
 	_ZN16QPainterReplayer14setupTransformEP8QPainter @ 3727 NONAME
-	_ZN16QPainterReplayer4drawERK12QPaintBufferP8QPainteri @ 3728 NONAME ABSENT
+	_ZN16QPainterReplayer4drawERK12QPaintBufferP8QPainteri @ 3728 NONAME
 	_ZN16QPainterReplayer7processERK19QPaintBufferCommand @ 3729 NONAME
 	_ZN16QRegExpValidator11qt_metacallEN11QMetaObject4CallEiPPv @ 3730 NONAME
 	_ZN16QRegExpValidator11qt_metacastEPKc @ 3731 NONAME
@@ -4223,7 +4223,7 @@ EXPORTS
 	_ZN18QTextBlockUserDataD0Ev @ 4222 NONAME
 	_ZN18QTextBlockUserDataD1Ev @ 4223 NONAME
 	_ZN18QTextBlockUserDataD2Ev @ 4224 NONAME
-	_ZN18QTextureGlyphCache8populateERK12QTextItemIntRK15QVarLengthArrayIjLi256EERKS3_I11QFixedPointLi256EE @ 4225 NONAME ABSENT
+	_ZN18QTextureGlyphCache8populateERK12QTextItemIntRK15QVarLengthArrayIjLi256EERKS3_I11QFixedPointLi256EE @ 4225 NONAME
 	_ZN19QAbstractProxyModel11qt_metacallEN11QMetaObject4CallEiPPv @ 4226 NONAME
 	_ZN19QAbstractProxyModel11qt_metacastEPKc @ 4227 NONAME
 	_ZN19QAbstractProxyModel13setHeaderDataEiN2Qt11OrientationERK8QVarianti @ 4228 NONAME
@@ -5907,9 +5907,9 @@ EXPORTS
 	_ZN7QActionD1Ev @ 5906 NONAME
 	_ZN7QActionD2Ev @ 5907 NONAME
 	_ZN7QBezier10fromPointsERK7QPointFS2_S2_S2_ @ 5908 NONAME
-	_ZN7QBezier17findIntersectionsERKS_S1_ @ 5909 NONAME ABSENT
-	_ZN7QBezier17findIntersectionsERKS_S1_P7QVectorI5QPairIffEE @ 5910 NONAME ABSENT
-	_ZN7QBezier20splitAtIntersectionsERS_ @ 5911 NONAME ABSENT
+	_ZN7QBezier17findIntersectionsERKS_S1_ @ 5909 NONAME
+	_ZN7QBezier17findIntersectionsERKS_S1_P7QVectorI5QPairIffEE @ 5910 NONAME
+	_ZN7QBezier20splitAtIntersectionsERS_ @ 5911 NONAME
 	_ZN7QBitmap8fromDataERK5QSizePKhN6QImage6FormatE @ 5912 NONAME
 	_ZN7QBitmap9fromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 5913 NONAME
 	_ZN7QBitmapC1ERK5QSize @ 5914 NONAME
@@ -9899,17 +9899,17 @@ EXPORTS
 	_ZNK7QAction9statusTipEv @ 9898 NONAME
 	_ZNK7QAction9whatsThisEv @ 9899 NONAME
 	_ZNK7QBezier10addIfCloseEPff @ 9900 NONAME
-	_ZNK7QBezier12addToPolygonEP9QPolygonF @ 9901 NONAME ABSENT
+	_ZNK7QBezier12addToPolygonEP9QPolygonF @ 9901 NONAME
 	_ZNK7QBezier16bezierOnIntervalEff @ 9902 NONAME
-	_ZNK7QBezier17addToPolygonMixedEP9QPolygonF @ 9903 NONAME ABSENT
+	_ZNK7QBezier17addToPolygonMixedEP9QPolygonF @ 9903 NONAME
 	_ZNK7QBezier17stationaryYPointsERfS0_ @ 9904 NONAME
-	_ZNK7QBezier21addToPolygonIterativeEP9QPolygonF @ 9905 NONAME ABSENT
+	_ZNK7QBezier21addToPolygonIterativeEP9QPolygonF @ 9905 NONAME
 	_ZNK7QBezier5tForYEfff @ 9906 NONAME
 	_ZNK7QBezier6boundsEv @ 9907 NONAME
 	_ZNK7QBezier6lengthEf @ 9908 NONAME
 	_ZNK7QBezier7shiftedEPS_iff @ 9909 NONAME
 	_ZNK7QBezier9tAtLengthEf @ 9910 NONAME
-	_ZNK7QBezier9toPolygonEv @ 9911 NONAME ABSENT
+	_ZNK7QBezier9toPolygonEv @ 9911 NONAME
 	_ZNK7QBitmap11transformedERK10QTransform @ 9912 NONAME
 	_ZNK7QBitmap11transformedERK7QMatrix @ 9913 NONAME
 	_ZNK7QBitmapcv8QVariantEv @ 9914 NONAME
@@ -11741,23 +11741,23 @@ EXPORTS
 	_ZN11QVectorPathD2Ev @ 11740 NONAME
 	_ZNK11QVectorPath12addCacheDataEP14QPaintEngineExPvPFvS1_S2_E @ 11741 NONAME
 	_ZNK20QGraphicsItemPrivate20discardUpdateRequestEbbb @ 11742 NONAME
-	_ZN11QEglContext10extensionsEv @ 11743 NONAME ABSENT
+	_ZN11QEglContext10extensionsEv @ 11743 NONAME
 	_ZN11QEglContext10getDisplayEP12QPaintDevice @ 11744 NONAME ABSENT
-	_ZN11QEglContext10waitClientEv @ 11745 NONAME ABSENT
-	_ZN11QEglContext10waitNativeEv @ 11746 NONAME ABSENT
+	_ZN11QEglContext10waitClientEv @ 11745 NONAME
+	_ZN11QEglContext10waitNativeEv @ 11746 NONAME
 	_ZN11QEglContext11doneCurrentEv @ 11747 NONAME
-	_ZN11QEglContext11errorStringEi @ 11748 NONAME ABSENT
+	_ZN11QEglContext11errorStringEi @ 11748 NONAME
 	_ZN11QEglContext11makeCurrentEi @ 11749 NONAME
 	_ZN11QEglContext11openDisplayEP12QPaintDevice @ 11750 NONAME ABSENT
 	_ZN11QEglContext11swapBuffersEi @ 11751 NONAME
 	_ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME
-	_ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME ABSENT
+	_ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME
 	_ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME
 	_ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME
 	_ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME
 	_ZN11QEglContext14defaultDisplayEP12QPaintDevice @ 11757 NONAME ABSENT
 	_ZN11QEglContext14destroySurfaceEi @ 11758 NONAME
-	_ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME ABSENT
+	_ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME
 	_ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME
 	_ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME
 	_ZN11QEglContext7destroyEv @ 11762 NONAME ABSENT
@@ -11766,7 +11766,7 @@ EXPORTS
 	_ZN11QEglContextD1Ev @ 11765 NONAME
 	_ZN11QEglContextD2Ev @ 11766 NONAME
 	_ZN14QEglProperties11removeValueEi @ 11767 NONAME
-	_ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME ABSENT
+	_ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME
 	_ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME
 	_ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME
 	_ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME
@@ -11776,8 +11776,8 @@ EXPORTS
 	_ZN14QEglPropertiesC1Ev @ 11775 NONAME
 	_ZN14QEglPropertiesC2Ei @ 11776 NONAME
 	_ZN14QEglPropertiesC2Ev @ 11777 NONAME
-	_ZNK11QEglContext12configAttribEiPi @ 11778 NONAME ABSENT
-	_ZNK11QEglContext16configPropertiesEi @ 11779 NONAME ABSENT
+	_ZNK11QEglContext12configAttribEiPi @ 11778 NONAME
+	_ZNK11QEglContext16configPropertiesEi @ 11779 NONAME
 	_ZNK11QEglContext7isValidEv @ 11780 NONAME
 	_ZNK11QEglContext9isCurrentEv @ 11781 NONAME
 	_ZNK14QEglProperties5valueEi @ 11782 NONAME
@@ -11805,211 +11805,19 @@ EXPORTS
 	_ZN24QImagePixmapCleanupHooks34executePixmapDataModificationHooksEP11QPixmapData @ 11804 NONAME
 	_ZN9QS60Style10timerEventEP11QTimerEvent @ 11805 NONAME
 	_ZN9QS60Style11eventFilterEP7QObjectP6QEvent @ 11806 NONAME
-	_ZN13QFontDatabase25removeAllApplicationFontsEv @ 11807 NONAME
-	_ZN10QZipReader5closeEv @ 11808 NONAME
-	_ZN10QZipReader8FileInfoC1ERKS0_ @ 11809 NONAME
-	_ZN10QZipReader8FileInfoC1Ev @ 11810 NONAME
-	_ZN10QZipReader8FileInfoC2ERKS0_ @ 11811 NONAME
-	_ZN10QZipReader8FileInfoC2Ev @ 11812 NONAME
-	_ZN10QZipReader8FileInfoD1Ev @ 11813 NONAME
-	_ZN10QZipReader8FileInfoD2Ev @ 11814 NONAME
-	_ZN10QZipReader8FileInfoaSERKS0_ @ 11815 NONAME
-	_ZN10QZipReaderC1EP9QIODevice @ 11816 NONAME
-	_ZN10QZipReaderC1ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11817 NONAME
-	_ZN10QZipReaderC2EP9QIODevice @ 11818 NONAME
-	_ZN10QZipReaderC2ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11819 NONAME
-	_ZN10QZipReaderD1Ev @ 11820 NONAME
-	_ZN10QZipReaderD2Ev @ 11821 NONAME
-	_ZN11QStaticText13setTextFormatEN2Qt10TextFormatE @ 11822 NONAME
-	_ZN11QStaticText14setMaximumSizeERK6QSizeF @ 11823 NONAME ABSENT
-	_ZN11QStaticText18setPerformanceHintENS_15PerformanceHintE @ 11824 NONAME
-	_ZN11QStaticText6detachEv @ 11825 NONAME
-	_ZN11QStaticText7prepareERK10QTransformRK5QFont @ 11826 NONAME
-	_ZN11QStaticText7setTextERK7QString @ 11827 NONAME
-	_ZN11QStaticTextC1ERK7QString @ 11828 NONAME
-	_ZN11QStaticTextC1ERKS_ @ 11829 NONAME
-	_ZN11QStaticTextC1Ev @ 11830 NONAME
-	_ZN11QStaticTextC2ERK7QString @ 11831 NONAME
-	_ZN11QStaticTextC2ERKS_ @ 11832 NONAME
-	_ZN11QStaticTextC2Ev @ 11833 NONAME
-	_ZN11QStaticTextD1Ev @ 11834 NONAME
-	_ZN11QStaticTextD2Ev @ 11835 NONAME
-	_ZN11QStaticTextaSERKS_ @ 11836 NONAME
-	_ZN12QKeySequence6assignERK7QStringNS_14SequenceFormatE @ 11837 NONAME
-	_ZN12QKeySequenceC1ERK7QStringNS_14SequenceFormatE @ 11838 NONAME
-	_ZN12QKeySequenceC2ERK7QStringNS_14SequenceFormatE @ 11839 NONAME
-	_ZN13QTextDocument19clearUndoRedoStacksENS_6StacksE @ 11840 NONAME
-	_ZN14QPaintEngineEx19drawPixmapFragmentsEPKN8QPainter8FragmentEiRK7QPixmap6QFlagsINS0_12FragmentHintEE @ 11841 NONAME ABSENT
-	_ZN14QWidgetPrivate11inTabWidgetEP7QWidget @ 11842 NONAME
-	_ZN14QWidgetPrivate17canKeypadNavigateEN2Qt11OrientationE @ 11843 NONAME
-	_ZN14QWidgetPrivate6renderEP12QPaintDeviceRK6QPointRK7QRegion6QFlagsIN7QWidget10RenderFlagEEb @ 11844 NONAME
-	_ZN15QGraphicsWidget21setAutoFillBackgroundEb @ 11845 NONAME
-	_ZN16QFileSystemModel15directoryLoadedERK7QString @ 11846 NONAME
-	_ZN18QTextureGlyphCache8populateEP11QFontEngineiPKjPK11QFixedPoint @ 11847 NONAME
-	_ZN19QApplicationPrivate15getPixmapCursorEN2Qt11CursorShapeE @ 11848 NONAME
-	_ZN20QGraphicsViewPrivate10centerViewEN13QGraphicsView14ViewportAnchorE @ 11849 NONAME
-	_ZN20QGraphicsViewPrivate10updateRectERK5QRect @ 11850 NONAME
-	_ZN20QGraphicsViewPrivate12updateRegionERK7QRegion @ 11851 NONAME ABSENT
-	_ZN20QGraphicsViewPrivate12updateScrollEv @ 11852 NONAME
-	_ZN20QGraphicsViewPrivate15storeMouseEventEP11QMouseEvent @ 11853 NONAME
-	_ZN20QGraphicsViewPrivate18storeDragDropEventEPK27QGraphicsSceneDragDropEvent @ 11854 NONAME
-	_ZN20QGraphicsViewPrivate19translateTouchEventEPS_P11QTouchEvent @ 11855 NONAME
-	_ZN20QGraphicsViewPrivate20_q_setViewportCursorERK7QCursor @ 11856 NONAME
-	_ZN20QGraphicsViewPrivate20replayLastMouseEventEv @ 11857 NONAME
-	_ZN20QGraphicsViewPrivate21freeStyleOptionsArrayEP24QStyleOptionGraphicsItem @ 11858 NONAME
-	_ZN20QGraphicsViewPrivate21mouseMoveEventHandlerEP11QMouseEvent @ 11859 NONAME
-	_ZN20QGraphicsViewPrivate21processPendingUpdatesEv @ 11860 NONAME
-	_ZN20QGraphicsViewPrivate21updateLastCenterPointEv @ 11861 NONAME
-	_ZN20QGraphicsViewPrivate22_q_unsetViewportCursorEv @ 11862 NONAME
-	_ZN20QGraphicsViewPrivate22allocStyleOptionsArrayEi @ 11863 NONAME
-	_ZN20QGraphicsViewPrivate22recalculateContentSizeEv @ 11864 NONAME
-	_ZN20QGraphicsViewPrivate26populateSceneDragDropEventEP27QGraphicsSceneDragDropEventP10QDropEvent @ 11865 NONAME
-	_ZN20QGraphicsViewPrivate28updateInputMethodSensitivityEv @ 11866 NONAME
-	_ZN20QGraphicsViewPrivateC1Ev @ 11867 NONAME
-	_ZN20QGraphicsViewPrivateC2Ev @ 11868 NONAME
-	_ZN24QImagePixmapCleanupHooks13isImageCachedERK6QImage @ 11869 NONAME
-	_ZN24QImagePixmapCleanupHooks14isPixmapCachedERK7QPixmap @ 11870 NONAME
-	_ZN26QAbstractScrollAreaPrivate14layoutChildrenEv @ 11871 NONAME
-	_ZN26QAbstractScrollAreaPrivate16replaceScrollBarEP10QScrollBarN2Qt11OrientationE @ 11872 NONAME
-	_ZN26QAbstractScrollAreaPrivate23_q_showOrHideScrollBarsEv @ 11873 NONAME
-	_ZN26QAbstractScrollAreaPrivate4initEv @ 11874 NONAME
-	_ZN26QAbstractScrollAreaPrivate9_q_hslideEi @ 11875 NONAME
-	_ZN26QAbstractScrollAreaPrivate9_q_vslideEi @ 11876 NONAME
-	_ZN26QAbstractScrollAreaPrivateC1Ev @ 11877 NONAME
-	_ZN26QAbstractScrollAreaPrivateC2Ev @ 11878 NONAME
-	_ZN6QColor12isValidColorERK7QString @ 11879 NONAME
-	_ZN6QColor18setColorFromStringERK7QString @ 11880 NONAME
-	_ZN6QLabel12setSelectionEii @ 11881 NONAME
-	_ZN7QPixmap16convertFromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 11882 NONAME
-	_ZN8QPainter14drawStaticTextERK7QPointFRK11QStaticText @ 11883 NONAME
-	_ZN8QPainter19drawPixmapFragmentsEPKNS_8FragmentEiRK7QPixmap6QFlagsINS_12FragmentHintEE @ 11884 NONAME ABSENT
-	_ZN8QPainter8Fragment6createERK7QPointFRK6QRectFffff @ 11885 NONAME ABSENT
-	_ZN8QToolBar17visibilityChangedEb @ 11886 NONAME
-	_ZNK10QZipReader10extractAllERK7QString @ 11887 NONAME
-	_ZNK10QZipReader10isReadableEv @ 11888 NONAME
-	_ZNK10QZipReader11entryInfoAtEi @ 11889 NONAME
-	_ZNK10QZipReader12fileInfoListEv @ 11890 NONAME
-	_ZNK10QZipReader5countEv @ 11891 NONAME
-	_ZNK10QZipReader6existsEv @ 11892 NONAME
-	_ZNK10QZipReader6statusEv @ 11893 NONAME
-	_ZNK10QZipReader8fileDataERK7QString @ 11894 NONAME
-	_ZNK11QStaticText10textFormatEv @ 11895 NONAME
-	_ZNK11QStaticText11maximumSizeEv @ 11896 NONAME ABSENT
-	_ZNK11QStaticText15performanceHintEv @ 11897 NONAME
-	_ZNK11QStaticText4sizeEv @ 11898 NONAME
-	_ZNK11QStaticText4textEv @ 11899 NONAME
-	_ZNK11QStaticTexteqERKS_ @ 11900 NONAME
-	_ZNK11QStaticTextneERKS_ @ 11901 NONAME
-	_ZNK11QTextCursor15positionInBlockEv @ 11902 NONAME
-	_ZNK13QIntValidator5fixupER7QString @ 11903 NONAME
-	_ZNK14QPlainTextEdit8anchorAtERK6QPoint @ 11904 NONAME
-	_ZNK15QGraphicsWidget18autoFillBackgroundEv @ 11905 NONAME
-	_ZNK20QGraphicsViewPrivate10mapToSceneERK6QRectF @ 11906 NONAME
-	_ZNK20QGraphicsViewPrivate10mapToSceneERK7QPointF @ 11907 NONAME
-	_ZNK20QGraphicsViewPrivate13mapToViewRectEPK13QGraphicsItemRK6QRectF @ 11908 NONAME
-	_ZNK20QGraphicsViewPrivate14mapRectToSceneERK5QRect @ 11909 NONAME
-	_ZNK20QGraphicsViewPrivate14verticalScrollEv @ 11910 NONAME
-	_ZNK20QGraphicsViewPrivate15mapToViewRegionEPK13QGraphicsItemRK6QRectF @ 11911 NONAME
-	_ZNK20QGraphicsViewPrivate16horizontalScrollEv @ 11912 NONAME
-	_ZNK20QGraphicsViewPrivate16mapRectFromSceneERK6QRectF @ 11913 NONAME
-	_ZNK20QGraphicsViewPrivate16rubberBandRegionEPK7QWidgetRK5QRect @ 11914 NONAME
-	_ZNK20QGraphicsViewPrivate9findItemsERK7QRegionPbRK10QTransform @ 11915 NONAME
-	_ZNK26QAbstractScrollAreaPrivate14contentsOffsetEv @ 11916 NONAME
-	_ZNK6QImage13constScanLineEi @ 11917 NONAME
-	_ZNK6QImage9constBitsEv @ 11918 NONAME
-	_ZNK6QLabel12selectedTextEv @ 11919 NONAME
-	_ZNK6QLabel14selectionStartEv @ 11920 NONAME
-	_ZNK6QLabel15hasSelectedTextEv @ 11921 NONAME
-	_ZNK7QBezier11getSubRangeEff @ 11922 NONAME
-	_ZNK7QBezier5mapByERK10QTransform @ 11923 NONAME
-	_ZTI20QGraphicsViewPrivate @ 11924 NONAME
-	_ZTI26QAbstractScrollAreaPrivate @ 11925 NONAME
-	_ZTV20QGraphicsViewPrivate @ 11926 NONAME
-	_ZTV26QAbstractScrollAreaPrivate @ 11927 NONAME
-	_Z14qt_draw_glyphsP8QPainterPKjPK7QPointFi @ 11928 NONAME
-	_ZN11QFontEngine16getGlyphBearingsEjPfS0_ @ 11929 NONAME
-	_ZN12QLineControl17updateDisplayTextEb @ 11930 NONAME
-	_ZN12QLineControl5pasteEN10QClipboard4ModeE @ 11931 NONAME
-	_ZN12QTextControl5pasteEN10QClipboard4ModeE @ 11932 NONAME
-	_ZN14QPaintEngineEx19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 11933 NONAME
-	_ZN15QGraphicsObject12widthChangedEv @ 11934 NONAME
-	_ZN15QGraphicsObject13heightChangedEv @ 11935 NONAME
-	_ZN15QGraphicsObject15childrenChangedEv @ 11936 NONAME
-	_ZN15QGraphicsWidget15geometryChangedEv @ 11937 NONAME
-	_ZN15QSplitterHandle11resizeEventEP12QResizeEvent @ 11938 NONAME
-	_ZN20QGraphicsItemPrivate10resetWidthEv @ 11939 NONAME
-	_ZN20QGraphicsItemPrivate11resetHeightEv @ 11940 NONAME
-	_ZN20QGraphicsItemPrivate12childrenListEv @ 11941 NONAME
-	_ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb @ 11942 NONAME
-	_ZN20QGraphicsItemPrivate16clearFocusHelperEb @ 11943 NONAME
-	_ZN20QGraphicsItemPrivate24prependGraphicsTransformEP18QGraphicsTransform @ 11944 NONAME
-	_ZN20QGraphicsItemPrivate6appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11945 NONAME ABSENT
-	_ZN20QGraphicsItemPrivate8setWidthEf @ 11946 NONAME
-	_ZN20QGraphicsItemPrivate9setHeightEf @ 11947 NONAME
-	_ZN7QWizard11pageRemovedEi @ 11948 NONAME
-	_ZN7QWizard13setSideWidgetEP7QWidget @ 11949 NONAME
-	_ZN7QWizard9pageAddedEi @ 11950 NONAME
-	_ZN8QPainter14PixmapFragment6createERK7QPointFRK6QRectFffff @ 11951 NONAME
-	_ZN8QPainter19drawPixmapFragmentsEPKNS_14PixmapFragmentEiRK7QPixmap6QFlagsINS_18PixmapFragmentHintEE @ 11952 NONAME
-	_ZN9QLineEdit18setPlaceholderTextERK7QString @ 11953 NONAME
-	_ZNK10QZipReader6deviceEv @ 11954 NONAME
-	_ZNK10QZipReader8FileInfo7isValidEv @ 11955 NONAME
-	_ZNK20QGraphicsItemPrivate5widthEv @ 11956 NONAME
-	_ZNK20QGraphicsItemPrivate6heightEv @ 11957 NONAME
-	_ZNK6QImage13bitPlaneCountEv @ 11958 NONAME
-	_ZNK7QWizard10sideWidgetEv @ 11959 NONAME
-	_ZNK9QLineEdit15placeholderTextEv @ 11960 NONAME
-	_ZNK9QTextLine17horizontalAdvanceEv @ 11961 NONAME
-	_ZN11QStaticText12setTextWidthEf @ 11962 NONAME
-	_ZN13QGraphicsItem16updateMicroFocusEv @ 11963 NONAME
-	_ZN15QGraphicsObject16updateMicroFocusEv @ 11964 NONAME
-	_ZN15QGraphicsWidget13layoutChangedEv @ 11965 NONAME
-	_ZN16QPainterReplayer15processCommandsERK12QPaintBufferP8QPainterii @ 11966 NONAME
-	_ZNK11QStaticText9textWidthEv @ 11967 NONAME
-	_ZNK12QPaintBuffer13frameEndIndexEi @ 11968 NONAME
-	_ZNK12QPaintBuffer15frameStartIndexEi @ 11969 NONAME
-	_ZNK12QPaintBuffer15processCommandsEP8QPainterii @ 11970 NONAME
-	_ZNK12QPaintBuffer18commandDescriptionEi @ 11971 NONAME
-	_ZN20QGraphicsItemPrivate11children_atEP24QDeclarativeListPropertyI15QGraphicsObjectEi @ 11972 NONAME
-	_ZN20QGraphicsItemPrivate14children_countEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 11973 NONAME
-	_ZN20QGraphicsItemPrivate15children_appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11974 NONAME
-	_ZN11QEglContext14destroyContextEv @ 11975 NONAME
-	_ZN14QEglProperties13setDeviceTypeEi @ 11976 NONAME
-	_ZN4QEgl10clearErrorEv @ 11977 NONAME ABSENT
-	_ZN4QEgl10extensionsEv @ 11978 NONAME
-	_ZN4QEgl11errorStringEi @ 11979 NONAME
-	_ZN4QEgl11errorStringEv @ 11980 NONAME ABSENT
-	_ZN4QEgl12chooseConfigEPK14QEglPropertiesNS_16PixelFormatMatchE @ 11981 NONAME
-	_ZN4QEgl12hasExtensionEPKc @ 11982 NONAME
-	_ZN4QEgl12nativePixmapEP7QPixmap @ 11983 NONAME
-	_ZN4QEgl12nativeWindowEP7QWidget @ 11984 NONAME
-	_ZN4QEgl13createSurfaceEP12QPaintDeviceiPK14QEglProperties @ 11985 NONAME
-	_ZN4QEgl13defaultConfigEiNS_3APIE6QFlagsINS_12ConfigOptionEE @ 11986 NONAME
-	_ZN4QEgl13nativeDisplayEv @ 11987 NONAME
-	_ZN4QEgl14dumpAllConfigsEv @ 11988 NONAME
-	_ZN4QEgl17eglCreateImageKHREiiiiPKi @ 11989 NONAME
-	_ZN4QEgl18eglDestroyImageKHREii @ 11990 NONAME
-	_ZN4QEgl5errorEv @ 11991 NONAME ABSENT
-	_ZN4QEgl7displayEv @ 11992 NONAME
-	_ZNK11QEglContext12configAttribEi @ 11993 NONAME
-	_ZNK11QEglContext16configPropertiesEv @ 11994 NONAME ABSENT
-	_ZNK19QItemSelectionRange7isEmptyEv @ 11995 NONAME
-	_ZN13QIconEngineV28iconNameEv @ 11996 NONAME
-	_ZN14QWindowSurface23setPartialUpdateSupportEb @ 11997 NONAME
-	_ZNK14QWindowSurface23hasPartialUpdateSupportEv @ 11998 NONAME
-	_ZNK5QIcon4nameEv @ 11999 NONAME
-	_ZN20QGraphicsViewPrivate12updateRegionERK6QRectFRK10QTransform @ 12000 NONAME
-	_ZN12QPixmapCache10allPixmapsEv @ 12001 NONAME
-	_ZN12QPixmapCache20flushDetachedPixmapsEv @ 12002 NONAME
-	_ZN12QPixmapCache9totalUsedEv @ 12003 NONAME
-	_ZN20QGraphicsItemPrivate30updatePaintedViewBoundingRectsEb @ 12004 NONAME
-	_ZN20QGraphicsViewPrivate13setUpdateClipEP13QGraphicsItem @ 12005 NONAME
-	_ZN23QImageTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj @ 12006 NONAME
-	_ZN23QImageTextureGlyphCache17createTextureDataEii @ 12007 NONAME
-	_ZN23QImageTextureGlyphCache17resizeTextureDataEii @ 12008 NONAME
-	_ZNK23QImageTextureGlyphCache11glyphMarginEv @ 12009 NONAME
-	_ZNK7QBezier12addToPolygonEP9QPolygonFf @ 12010 NONAME
-	_ZNK7QBezier9toPolygonEf @ 12011 NONAME
-	_ZTI23QImageTextureGlyphCache @ 12012 NONAME
-	_ZTV23QImageTextureGlyphCache @ 12013 NONAME
+	_ZN11QEglContext10clearErrorEv @ 11807 NONAME
+	_ZN11QEglContext13nativeDisplayEv @ 11808 NONAME
+	_ZN11QEglContext14destroyContextEv @ 11809 NONAME
+	_ZN11QEglContext3dpyE @ 11810 NONAME DATA 4
+	_ZN11QEglContext5errorEv @ 11811 NONAME
+	_ZN11QEglContext7displayEv @ 11812 NONAME
+	_ZN11QFontEngine16getGlyphBearingsEjPfS0_ @ 11813 NONAME
+	_ZN12QLineControl17updateDisplayTextEb @ 11814 NONAME
+	_ZN13QFontDatabase25removeAllApplicationFontsEv @ 11815 NONAME
+	_ZN14QWidgetPrivate11inTabWidgetEP7QWidget @ 11816 NONAME
+	_ZN14QWidgetPrivate17canKeypadNavigateEN2Qt11OrientationE @ 11817 NONAME
+	_ZN20QGraphicsItemPrivate14setFocusHelperEN2Qt11FocusReasonEbb @ 11818 NONAME
+	_ZN20QGraphicsItemPrivate16clearFocusHelperEb @ 11819 NONAME
+	_ZN24QImagePixmapCleanupHooks13isImageCachedERK6QImage @ 11820 NONAME
+	_ZN24QImagePixmapCleanupHooks14isPixmapCachedERK7QPixmap @ 11821 NONAME
 
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def
index 87e0805..77c36b4 100644
--- a/src/s60installs/eabi/QtNetworku.def
+++ b/src/s60installs/eabi/QtNetworku.def
@@ -993,179 +993,6 @@ EXPORTS
 	_ZN10QSslSocket15setSocketOptionEN15QAbstractSocket12SocketOptionERK8QVariant @ 992 NONAME
 	_ZN15QNetworkRequest20setOriginatingObjectEP7QObject @ 993 NONAME
 	_ZNK15QNetworkRequest17originatingObjectEv @ 994 NONAME
-	_Z35qNetworkConfigurationManagerPrivatev @ 995 NONAME
-	_ZN13QBearerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 996 NONAME
-	_ZN13QBearerEngine11qt_metacastEPKc @ 997 NONAME
-	_ZN13QBearerEngine15updateCompletedEv @ 998 NONAME
-	_ZN13QBearerEngine16staticMetaObjectE @ 999 NONAME DATA 16
-	_ZN13QBearerEngine18configurationAddedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1000 NONAME
-	_ZN13QBearerEngine19getStaticMetaObjectEv @ 1001 NONAME
-	_ZN13QBearerEngine20configurationChangedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1002 NONAME
-	_ZN13QBearerEngine20configurationRemovedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1003 NONAME
-	_ZN13QBearerEngineC2EP7QObject @ 1004 NONAME
-	_ZN13QBearerEngineD0Ev @ 1005 NONAME
-	_ZN13QBearerEngineD1Ev @ 1006 NONAME
-	_ZN13QBearerEngineD2Ev @ 1007 NONAME
-	_ZN15QNetworkRequest11setPriorityENS_8PriorityE @ 1008 NONAME
-	_ZN15QNetworkSession11qt_metacallEN11QMetaObject4CallEiPPv @ 1009 NONAME
-	_ZN15QNetworkSession11qt_metacastEPKc @ 1010 NONAME
-	_ZN15QNetworkSession12stateChangedENS_5StateE @ 1011 NONAME
-	_ZN15QNetworkSession13connectNotifyEPKc @ 1012 NONAME
-	_ZN15QNetworkSession13waitForOpenedEi @ 1013 NONAME
-	_ZN15QNetworkSession16disconnectNotifyEPKc @ 1014 NONAME
-	_ZN15QNetworkSession16staticMetaObjectE @ 1015 NONAME DATA 16
-	_ZN15QNetworkSession18setSessionPropertyERK7QStringRK8QVariant @ 1016 NONAME
-	_ZN15QNetworkSession19getStaticMetaObjectEv @ 1017 NONAME
-	_ZN15QNetworkSession25newConfigurationActivatedEv @ 1018 NONAME
-	_ZN15QNetworkSession29preferredConfigurationChangedERK21QNetworkConfigurationb @ 1019 NONAME
-	_ZN15QNetworkSession4openEv @ 1020 NONAME
-	_ZN15QNetworkSession4stopEv @ 1021 NONAME
-	_ZN15QNetworkSession5closeEv @ 1022 NONAME
-	_ZN15QNetworkSession5errorENS_12SessionErrorE @ 1023 NONAME
-	_ZN15QNetworkSession6acceptEv @ 1024 NONAME
-	_ZN15QNetworkSession6closedEv @ 1025 NONAME
-	_ZN15QNetworkSession6ignoreEv @ 1026 NONAME
-	_ZN15QNetworkSession6openedEv @ 1027 NONAME
-	_ZN15QNetworkSession6rejectEv @ 1028 NONAME
-	_ZN15QNetworkSession7migrateEv @ 1029 NONAME
-	_ZN15QNetworkSessionC1ERK21QNetworkConfigurationP7QObject @ 1030 NONAME
-	_ZN15QNetworkSessionC2ERK21QNetworkConfigurationP7QObject @ 1031 NONAME
-	_ZN15QNetworkSessionD0Ev @ 1032 NONAME
-	_ZN15QNetworkSessionD1Ev @ 1033 NONAME
-	_ZN15QNetworkSessionD2Ev @ 1034 NONAME
-	_ZN19QBearerEnginePlugin11qt_metacallEN11QMetaObject4CallEiPPv @ 1035 NONAME
-	_ZN19QBearerEnginePlugin11qt_metacastEPKc @ 1036 NONAME
-	_ZN19QBearerEnginePlugin16staticMetaObjectE @ 1037 NONAME DATA 16
-	_ZN19QBearerEnginePlugin19getStaticMetaObjectEv @ 1038 NONAME
-	_ZN19QBearerEnginePluginC2EP7QObject @ 1039 NONAME
-	_ZN19QBearerEnginePluginD0Ev @ 1040 NONAME
-	_ZN19QBearerEnginePluginD1Ev @ 1041 NONAME
-	_ZN19QBearerEnginePluginD2Ev @ 1042 NONAME
-	_ZN21QNetworkAccessManager16setConfigurationERK21QNetworkConfiguration @ 1043 NONAME
-	_ZN21QNetworkAccessManager17sendCustomRequestERK15QNetworkRequestRK10QByteArrayP9QIODevice @ 1044 NONAME
-	_ZN21QNetworkAccessManager20networkAccessChangedEb @ 1045 NONAME ABSENT
-	_ZN21QNetworkAccessManager20networkSessionOnlineEv @ 1046 NONAME ABSENT
-	_ZN21QNetworkAccessManager23setNetworkAccessEnabledEb @ 1047 NONAME ABSENT
-	_ZN21QNetworkConfigurationC1ERKS_ @ 1048 NONAME
-	_ZN21QNetworkConfigurationC1Ev @ 1049 NONAME
-	_ZN21QNetworkConfigurationC2ERKS_ @ 1050 NONAME
-	_ZN21QNetworkConfigurationC2Ev @ 1051 NONAME
-	_ZN21QNetworkConfigurationD1Ev @ 1052 NONAME
-	_ZN21QNetworkConfigurationD2Ev @ 1053 NONAME
-	_ZN21QNetworkConfigurationaSERKS_ @ 1054 NONAME
-	_ZN22QNetworkSessionPrivate11qt_metacallEN11QMetaObject4CallEiPPv @ 1055 NONAME
-	_ZN22QNetworkSessionPrivate11qt_metacastEPKc @ 1056 NONAME
-	_ZN22QNetworkSessionPrivate12stateChangedEN15QNetworkSession5StateE @ 1057 NONAME
-	_ZN22QNetworkSessionPrivate16staticMetaObjectE @ 1058 NONAME DATA 16
-	_ZN22QNetworkSessionPrivate19getStaticMetaObjectEv @ 1059 NONAME
-	_ZN22QNetworkSessionPrivate25newConfigurationActivatedEv @ 1060 NONAME
-	_ZN22QNetworkSessionPrivate25quitPendingWaitsForOpenedEv @ 1061 NONAME
-	_ZN22QNetworkSessionPrivate29preferredConfigurationChangedERK21QNetworkConfigurationb @ 1062 NONAME
-	_ZN22QNetworkSessionPrivate5errorEN15QNetworkSession12SessionErrorE @ 1063 NONAME
-	_ZN22QNetworkSessionPrivate6closedEv @ 1064 NONAME
-	_ZN28QNetworkConfigurationManager11qt_metacallEN11QMetaObject4CallEiPPv @ 1065 NONAME
-	_ZN28QNetworkConfigurationManager11qt_metacastEPKc @ 1066 NONAME
-	_ZN28QNetworkConfigurationManager15updateCompletedEv @ 1067 NONAME
-	_ZN28QNetworkConfigurationManager16staticMetaObjectE @ 1068 NONAME DATA 16
-	_ZN28QNetworkConfigurationManager18configurationAddedERK21QNetworkConfiguration @ 1069 NONAME
-	_ZN28QNetworkConfigurationManager18onlineStateChangedEb @ 1070 NONAME
-	_ZN28QNetworkConfigurationManager19getStaticMetaObjectEv @ 1071 NONAME
-	_ZN28QNetworkConfigurationManager20configurationChangedERK21QNetworkConfiguration @ 1072 NONAME
-	_ZN28QNetworkConfigurationManager20configurationRemovedERK21QNetworkConfiguration @ 1073 NONAME
-	_ZN28QNetworkConfigurationManager20updateConfigurationsEv @ 1074 NONAME
-	_ZN28QNetworkConfigurationManagerC1EP7QObject @ 1075 NONAME
-	_ZN28QNetworkConfigurationManagerC2EP7QObject @ 1076 NONAME
-	_ZN28QNetworkConfigurationManagerD0Ev @ 1077 NONAME
-	_ZN28QNetworkConfigurationManagerD1Ev @ 1078 NONAME
-	_ZN28QNetworkConfigurationManagerD2Ev @ 1079 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate11qt_metacallEN11QMetaObject4CallEiPPv @ 1080 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate11qt_metacastEPKc @ 1081 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate16staticMetaObjectE @ 1082 NONAME DATA 16
-	_ZN35QNetworkConfigurationManagerPrivate18configurationAddedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1083 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate18configurationAddedERK21QNetworkConfiguration @ 1084 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate18onlineStateChangedEb @ 1085 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate19getStaticMetaObjectEv @ 1086 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate20configurationChangedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1087 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate20configurationChangedERK21QNetworkConfiguration @ 1088 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate20configurationRemovedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1089 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate20configurationRemovedERK21QNetworkConfiguration @ 1090 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv @ 1091 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate27configurationUpdateCompleteEv @ 1092 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate31performAsyncConfigurationUpdateEv @ 1093 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate5abortEv @ 1094 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate7enginesEv @ 1095 NONAME
-	_ZN35QNetworkConfigurationManagerPrivateC1Ev @ 1096 NONAME
-	_ZN35QNetworkConfigurationManagerPrivateC2Ev @ 1097 NONAME
-	_ZN35QNetworkConfigurationManagerPrivateD0Ev @ 1098 NONAME
-	_ZN35QNetworkConfigurationManagerPrivateD1Ev @ 1099 NONAME
-	_ZN35QNetworkConfigurationManagerPrivateD2Ev @ 1100 NONAME
-	_ZNK13QBearerEngine10metaObjectEv @ 1101 NONAME
-	_ZNK13QNetworkReply14rawHeaderPairsEv @ 1102 NONAME
-	_ZNK15QNetworkRequest8priorityEv @ 1103 NONAME
-	_ZNK15QNetworkSession10activeTimeEv @ 1104 NONAME
-	_ZNK15QNetworkSession10metaObjectEv @ 1105 NONAME
-	_ZNK15QNetworkSession11errorStringEv @ 1106 NONAME
-	_ZNK15QNetworkSession12bytesWrittenEv @ 1107 NONAME
-	_ZNK15QNetworkSession13bytesReceivedEv @ 1108 NONAME
-	_ZNK15QNetworkSession13configurationEv @ 1109 NONAME
-	_ZNK15QNetworkSession15sessionPropertyERK7QString @ 1110 NONAME
-	_ZNK15QNetworkSession5errorEv @ 1111 NONAME
-	_ZNK15QNetworkSession5stateEv @ 1112 NONAME
-	_ZNK15QNetworkSession6isOpenEv @ 1113 NONAME
-	_ZNK15QNetworkSession9interfaceEv @ 1114 NONAME
-	_ZNK19QBearerEnginePlugin10metaObjectEv @ 1115 NONAME
-	_ZNK21QNetworkAccessManager13configurationEv @ 1116 NONAME
-	_ZNK21QNetworkAccessManager19activeConfigurationEv @ 1117 NONAME
-	_ZNK21QNetworkAccessManager20networkAccessEnabledEv @ 1118 NONAME ABSENT
-	_ZNK21QNetworkConfiguration10bearerNameEv @ 1119 NONAME
-	_ZNK21QNetworkConfiguration10identifierEv @ 1120 NONAME
-	_ZNK21QNetworkConfiguration18isRoamingAvailableEv @ 1121 NONAME
-	_ZNK21QNetworkConfiguration4nameEv @ 1122 NONAME
-	_ZNK21QNetworkConfiguration4typeEv @ 1123 NONAME
-	_ZNK21QNetworkConfiguration5stateEv @ 1124 NONAME
-	_ZNK21QNetworkConfiguration7isValidEv @ 1125 NONAME
-	_ZNK21QNetworkConfiguration7purposeEv @ 1126 NONAME
-	_ZNK21QNetworkConfiguration8childrenEv @ 1127 NONAME
-	_ZNK21QNetworkConfigurationeqERKS_ @ 1128 NONAME
-	_ZNK22QNetworkSessionPrivate10metaObjectEv @ 1129 NONAME
-	_ZNK28QNetworkConfigurationManager10metaObjectEv @ 1130 NONAME
-	_ZNK28QNetworkConfigurationManager12capabilitiesEv @ 1131 NONAME
-	_ZNK28QNetworkConfigurationManager17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1132 NONAME
-	_ZNK28QNetworkConfigurationManager20defaultConfigurationEv @ 1133 NONAME
-	_ZNK28QNetworkConfigurationManager27configurationFromIdentifierERK7QString @ 1134 NONAME
-	_ZNK28QNetworkConfigurationManager8isOnlineEv @ 1135 NONAME
-	_ZNK35QNetworkConfigurationManagerPrivate10metaObjectEv @ 1136 NONAME
-	_ZTI13QBearerEngine @ 1137 NONAME
-	_ZTI15QNetworkSession @ 1138 NONAME
-	_ZTI19QBearerEnginePlugin @ 1139 NONAME
-	_ZTI22QNetworkSessionPrivate @ 1140 NONAME
-	_ZTI28QNetworkConfigurationManager @ 1141 NONAME
-	_ZTI29QBearerEngineFactoryInterface @ 1142 NONAME
-	_ZTI35QNetworkConfigurationManagerPrivate @ 1143 NONAME
-	_ZTV13QBearerEngine @ 1144 NONAME
-	_ZTV15QNetworkSession @ 1145 NONAME
-	_ZTV19QBearerEnginePlugin @ 1146 NONAME
-	_ZTV22QNetworkSessionPrivate @ 1147 NONAME
-	_ZTV28QNetworkConfigurationManager @ 1148 NONAME
-	_ZTV35QNetworkConfigurationManagerPrivate @ 1149 NONAME
-	_ZThn8_N19QBearerEnginePluginD0Ev @ 1150 NONAME
-	_ZThn8_N19QBearerEnginePluginD1Ev @ 1151 NONAME
-	_Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi @ 1152 NONAME
-	_Z24qt_qhostinfo_clear_cachev @ 1153 NONAME ABSENT
-	_ZN21QNetworkAccessManager20setNetworkAccessibleENS_20NetworkAccessibilityE @ 1154 NONAME
-	_ZN21QNetworkAccessManager23networkSessionConnectedEv @ 1155 NONAME
-	_ZN21QNetworkAccessManager24networkAccessibleChangedENS_20NetworkAccessibilityE @ 1156 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate11pollEnginesEv @ 1157 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate12startPollingEv @ 1158 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate13enablePollingEv @ 1159 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate14disablePollingEv @ 1160 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1161 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate20defaultConfigurationEv @ 1162 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate27configurationFromIdentifierERK7QString @ 1163 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate8isOnlineEv @ 1164 NONAME
-	_ZNK13QBearerEngine15requiresPollingEv @ 1165 NONAME
-	_ZNK13QBearerEngine19configurationsInUseEv @ 1166 NONAME
-	_ZNK21QNetworkAccessManager17networkAccessibleEv @ 1167 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate12capabilitiesEv @ 1168 NONAME
-	_ZN10QTcpServer20addPendingConnectionEP10QTcpSocket @ 1169 NONAME
+	_Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi @ 995 NONAME
+	_Z24qt_qhostinfo_clear_cachev @ 996 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index 04f7876..cf226c5 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -31,7 +31,7 @@ EXPORTS
 	_ZN14QVGPaintEngine10penChangedEv @ 30 NONAME
 	_ZN14QVGPaintEngine11drawEllipseERK5QRect @ 31 NONAME
 	_ZN14QVGPaintEngine11drawEllipseERK6QRectF @ 32 NONAME
-	_ZN14QVGPaintEngine11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 33 NONAME ABSENT
+	_ZN14QVGPaintEngine11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 33 NONAME
 	_ZN14QVGPaintEngine11drawPolygonEPK6QPointiN12QPaintEngine15PolygonDrawModeE @ 34 NONAME
 	_ZN14QVGPaintEngine11drawPolygonEPK7QPointFiN12QPaintEngine15PolygonDrawModeE @ 35 NONAME
 	_ZN14QVGPaintEngine12brushChangedEv @ 36 NONAME
@@ -196,9 +196,6 @@ EXPORTS
 	_ZN13QVGPixmapData19detachImageFromPoolEv @ 195 NONAME
 	_ZTI12QVGImagePool @ 196 NONAME
 	_ZTV12QVGImagePool @ 197 NONAME
-	_ZN14QVGPaintEngine16drawCachedGlyphsEiPKjRK5QFontP11QFontEngineRK7QPointF @ 198 NONAME ABSENT
-	_ZN14QVGPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 199 NONAME
-	_ZN14QVGPaintEngine19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 200 NONAME
-	_ZN25QVGEGLWindowSurfaceDirect6scrollEP7QWidgetRK7QRegionii @ 201 NONAME
-	_ZNK25QVGEGLWindowSurfaceDirect22supportsStaticContentsEv @ 202 NONAME
+	_ZN25QVGEGLWindowSurfaceDirect6scrollEP7QWidgetRK7QRegionii @ 198 NONAME
+	_ZNK25QVGEGLWindowSurfaceDirect22supportsStaticContentsEv @ 199 NONAME
 
-- 
cgit v0.12


From 7fcd827e6b7c6c7fa7539a503c5e526d7a4921b3 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Fri, 28 May 2010 16:53:29 +0100
Subject: Freeze 4.7 def files on top of 4.6.3

Task-number: QTBUG-8769
Reviewed-by: Trust Me
---
 src/s60installs/bwins/QtDeclarativeu.def | 106 +++++++++----
 src/s60installs/bwins/QtGuiu.def         | 254 +++++++++++++++++++++++++++----
 src/s60installs/eabi/QtCoreu.def         |  65 +++++++-
 src/s60installs/eabi/QtDeclarativeu.def  |  99 +++++++++---
 src/s60installs/eabi/QtGuiu.def          | 240 +++++++++++++++++++++++++----
 src/s60installs/eabi/QtNetworku.def      | 171 ++++++++++++++++++++-
 src/s60installs/eabi/QtOpenVGu.def       |   5 +-
 7 files changed, 827 insertions(+), 113 deletions(-)

diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index c960614..3df0f47 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -86,7 +86,7 @@ EXPORTS
 	??0QDeclarativeError@@QAE@XZ @ 85 NONAME ; QDeclarativeError::QDeclarativeError(void)
 	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContext@@ABVQString@@PAVQObject@@AAVQDeclarativeExpressionPrivate@@@Z @ 86 NONAME ABSENT ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, class QString const &, class QObject *, class QDeclarativeExpressionPrivate &)
 	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContext@@PAXPAVQDeclarativeRefCount@@PAVQObject@@ABVQString@@HAAVQDeclarativeExpressionPrivate@@@Z @ 87 NONAME ABSENT ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, void *, class QDeclarativeRefCount *, class QObject *, class QString const &, int, class QDeclarativeExpressionPrivate &)
-	??0QDeclarativeExpression@@QAE@PAVQDeclarativeContext@@ABVQString@@PAVQObject@@@Z @ 88 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, class QString const &, class QObject *)
+	??0QDeclarativeExpression@@QAE@PAVQDeclarativeContext@@ABVQString@@PAVQObject@@@Z @ 88 NONAME ABSENT ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, class QString const &, class QObject *)
 	??0QDeclarativeExpression@@QAE@XZ @ 89 NONAME ; QDeclarativeExpression::QDeclarativeExpression(void)
 	??0QDeclarativeExtensionPlugin@@QAE@PAVQObject@@@Z @ 90 NONAME ; QDeclarativeExtensionPlugin::QDeclarativeExtensionPlugin(class QObject *)
 	??0QDeclarativeFlickable@@IAE@AAVQDeclarativeFlickablePrivate@@PAVQDeclarativeItem@@@Z @ 91 NONAME ; QDeclarativeFlickable::QDeclarativeFlickable(class QDeclarativeFlickablePrivate &, class QDeclarativeItem *)
@@ -861,7 +861,7 @@ EXPORTS
 	?cursorPosition@QDeclarativeTextInput@@QBEHXZ @ 860 NONAME ; int QDeclarativeTextInput::cursorPosition(void) const
 	?cursorPositionChanged@QDeclarativeTextEdit@@IAEXXZ @ 861 NONAME ; void QDeclarativeTextEdit::cursorPositionChanged(void)
 	?cursorPositionChanged@QDeclarativeTextInput@@IAEXXZ @ 862 NONAME ; void QDeclarativeTextInput::cursorPositionChanged(void)
-	?cursorRect@QDeclarativeTextEdit@@QBE?AVQRect@@XZ @ 863 NONAME ; class QRect QDeclarativeTextEdit::cursorRect(void) const
+	?cursorRect@QDeclarativeTextEdit@@QBE?AVQRect@@XZ @ 863 NONAME ABSENT ; class QRect QDeclarativeTextEdit::cursorRect(void) const
 	?cursorRect@QDeclarativeTextInput@@QBE?AVQRect@@XZ @ 864 NONAME ; class QRect QDeclarativeTextInput::cursorRect(void) const
 	?cursorVisibleChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 865 NONAME ; void QDeclarativeTextEdit::cursorVisibleChanged(bool)
 	?cursorVisibleChanged@QDeclarativeTextInput@@IAEX_N@Z @ 866 NONAME ; void QDeclarativeTextInput::cursorVisibleChanged(bool)
@@ -1086,7 +1086,7 @@ EXPORTS
 	?errors@QDeclarativeCustomParser@@QBE?AV?$QList@VQDeclarativeError@@@@XZ @ 1085 NONAME ; class QList<class QDeclarativeError> QDeclarativeCustomParser::errors(void) const
 	?errors@QDeclarativeDomDocument@@QBE?AV?$QList@VQDeclarativeError@@@@XZ @ 1086 NONAME ; class QList<class QDeclarativeError> QDeclarativeDomDocument::errors(void) const
 	?errors@QDeclarativeView@@QBE?AV?$QList@VQDeclarativeError@@@@XZ @ 1087 NONAME ; class QList<class QDeclarativeError> QDeclarativeView::errors(void) const
-	?errorsString@QDeclarativeComponent@@QBE?AVQString@@XZ @ 1088 NONAME ; class QString QDeclarativeComponent::errorsString(void) const
+	?errorsString@QDeclarativeComponent@@QBE?AVQString@@XZ @ 1088 NONAME ABSENT ; class QString QDeclarativeComponent::errorsString(void) const
 	?eval@QDeclarativeBind@@AAEXXZ @ 1089 NONAME ; void QDeclarativeBind::eval(void)
 	?evaluate@QDeclarativeVisualDataModel@@UAE?AVQVariant@@HABVQString@@PAVQObject@@@Z @ 1090 NONAME ; class QVariant QDeclarativeVisualDataModel::evaluate(int, class QString const &, class QObject *)
 	?evaluate@QDeclarativeVisualItemModel@@UAE?AVQVariant@@HABVQString@@PAVQObject@@@Z @ 1091 NONAME ; class QVariant QDeclarativeVisualItemModel::evaluate(int, class QString const &, class QObject *)
@@ -1299,7 +1299,7 @@ EXPORTS
 	?hasStdCppSet@QMetaPropertyBuilder@@QBE_NXZ @ 1298 NONAME ; bool QMetaPropertyBuilder::hasStdCppSet(void) const
 	?header@QDeclarativeListView@@QBEPAVQDeclarativeComponent@@XZ @ 1299 NONAME ; class QDeclarativeComponent * QDeclarativeListView::header(void) const
 	?height@QDeclarativeItem@@QBEMXZ @ 1300 NONAME ; float QDeclarativeItem::height(void) const
-	?height@QDeclarativeParentChange@@QBEMXZ @ 1301 NONAME ; float QDeclarativeParentChange::height(void) const
+	?height@QDeclarativeParentChange@@QBEMXZ @ 1301 NONAME ABSENT ; float QDeclarativeParentChange::height(void) const
 	?heightChange@QDeclarativeFlickable@@IAEXXZ @ 1302 NONAME ABSENT ; void QDeclarativeFlickable::heightChange(void)
 	?heightChanged@QDeclarativeItem@@IAEXXZ @ 1303 NONAME ABSENT ; void QDeclarativeItem::heightChanged(void)
 	?heightIsSet@QDeclarativeParentChange@@QBE_NXZ @ 1304 NONAME ; bool QDeclarativeParentChange::heightIsSet(void) const
@@ -1813,8 +1813,8 @@ EXPORTS
 	?orientation@QDeclarativeListView@@QBE?AW4Orientation@1@XZ @ 1812 NONAME ; enum QDeclarativeListView::Orientation QDeclarativeListView::orientation(void) const
 	?orientationChanged@QDeclarativeListView@@IAEXXZ @ 1813 NONAME ; void QDeclarativeListView::orientationChanged(void)
 	?originalParent@QDeclarativeParentChange@@QBEPAVQDeclarativeItem@@XZ @ 1814 NONAME ; class QDeclarativeItem * QDeclarativeParentChange::originalParent(void) const
-	?overShoot@QDeclarativeFlickable@@QBE_NXZ @ 1815 NONAME ; bool QDeclarativeFlickable::overShoot(void) const
-	?overShootChanged@QDeclarativeFlickable@@IAEXXZ @ 1816 NONAME ; void QDeclarativeFlickable::overShootChanged(void)
+	?overShoot@QDeclarativeFlickable@@QBE_NXZ @ 1815 NONAME ABSENT ; bool QDeclarativeFlickable::overShoot(void) const
+	?overShootChanged@QDeclarativeFlickable@@IAEXXZ @ 1816 NONAME ABSENT ; void QDeclarativeFlickable::overShootChanged(void)
 	?override@QDeclarativeAnchorChanges@@UAE_NPAVQDeclarativeActionEvent@@@Z @ 1817 NONAME ; bool QDeclarativeAnchorChanges::override(class QDeclarativeActionEvent *)
 	?override@QDeclarativeParentChange@@UAE_NPAVQDeclarativeActionEvent@@@Z @ 1818 NONAME ; bool QDeclarativeParentChange::override(class QDeclarativeActionEvent *)
 	?pace@QDeclarativeParticleMotionWander@@QBEMXZ @ 1819 NONAME ABSENT ; float QDeclarativeParticleMotionWander::pace(void) const
@@ -2247,7 +2247,7 @@ EXPORTS
 	?rootIndexChanged@QDeclarativeVisualDataModel@@IAEXXZ @ 2246 NONAME ; void QDeclarativeVisualDataModel::rootIndexChanged(void)
 	?rootObject@QDeclarativeDomDocument@@QBE?AVQDeclarativeDomObject@@XZ @ 2247 NONAME ; class QDeclarativeDomObject QDeclarativeDomDocument::rootObject(void) const
 	?rootObject@QDeclarativeView@@QBEPAVQGraphicsObject@@XZ @ 2248 NONAME ; class QGraphicsObject * QDeclarativeView::rootObject(void) const
-	?rotation@QDeclarativeParentChange@@QBEMXZ @ 2249 NONAME ; float QDeclarativeParentChange::rotation(void) const
+	?rotation@QDeclarativeParentChange@@QBEMXZ @ 2249 NONAME ABSENT ; float QDeclarativeParentChange::rotation(void) const
 	?rotationIsSet@QDeclarativeParentChange@@QBE_NXZ @ 2250 NONAME ; bool QDeclarativeParentChange::rotationIsSet(void) const
 	?rows@QDeclarativeGrid@@QBEHXZ @ 2251 NONAME ; int QDeclarativeGrid::rows(void) const
 	?rowsChanged@QDeclarativeGrid@@IAEXXZ @ 2252 NONAME ; void QDeclarativeGrid::rowsChanged(void)
@@ -2257,7 +2257,7 @@ EXPORTS
 	?saveCurrentValues@QDeclarativeParentChange@@UAEXXZ @ 2256 NONAME ; void QDeclarativeParentChange::saveCurrentValues(void)
 	?saveOriginals@QDeclarativeAnchorChanges@@UAEXXZ @ 2257 NONAME ; void QDeclarativeAnchorChanges::saveOriginals(void)
 	?saveOriginals@QDeclarativeParentChange@@UAEXXZ @ 2258 NONAME ; void QDeclarativeParentChange::saveOriginals(void)
-	?scale@QDeclarativeParentChange@@QBEMXZ @ 2259 NONAME ; float QDeclarativeParentChange::scale(void) const
+	?scale@QDeclarativeParentChange@@QBEMXZ @ 2259 NONAME ABSENT ; float QDeclarativeParentChange::scale(void) const
 	?scaleIsSet@QDeclarativeParentChange@@QBE_NXZ @ 2260 NONAME ; bool QDeclarativeParentChange::scaleIsSet(void) const
 	?sceneEvent@QDeclarativeFocusPanel@@MAE_NPAVQEvent@@@Z @ 2261 NONAME ; bool QDeclarativeFocusPanel::sceneEvent(class QEvent *)
 	?sceneEvent@QDeclarativeItem@@MAE_NPAVQEvent@@@Z @ 2262 NONAME ; bool QDeclarativeItem::sceneEvent(class QEvent *)
@@ -2346,7 +2346,7 @@ EXPORTS
 	?setColumn@QDeclarativeError@@QAEXH@Z @ 2345 NONAME ; void QDeclarativeError::setColumn(int)
 	?setColumnNumber@QDeclarativeDebugFileReference@@QAEXH@Z @ 2346 NONAME ; void QDeclarativeDebugFileReference::setColumnNumber(int)
 	?setColumns@QDeclarativeGrid@@QAEXH@Z @ 2347 NONAME ; void QDeclarativeGrid::setColumns(int)
-	?setConsistentTime@QDeclarativeItemPrivate@@SAXH@Z @ 2348 NONAME ; void QDeclarativeItemPrivate::setConsistentTime(int)
+	?setConsistentTime@QDeclarativeItemPrivate@@SAXH@Z @ 2348 NONAME ABSENT ; void QDeclarativeItemPrivate::setConsistentTime(int)
 	?setContent@QDeclarativeWebView@@QAEXABVQByteArray@@ABVQString@@ABVQUrl@@@Z @ 2349 NONAME ABSENT ; void QDeclarativeWebView::setContent(class QByteArray const &, class QString const &, class QUrl const &)
 	?setContentHeight@QDeclarativeFlickable@@QAEXM@Z @ 2350 NONAME ; void QDeclarativeFlickable::setContentHeight(float)
 	?setContentWidth@QDeclarativeFlickable@@QAEXM@Z @ 2351 NONAME ; void QDeclarativeFlickable::setContentWidth(float)
@@ -2437,7 +2437,7 @@ EXPORTS
 	?setHAlign@QDeclarativeTextInput@@QAEXW4HAlignment@1@@Z @ 2436 NONAME ; void QDeclarativeTextInput::setHAlign(enum QDeclarativeTextInput::HAlignment)
 	?setHeader@QDeclarativeListView@@QAEXPAVQDeclarativeComponent@@@Z @ 2437 NONAME ; void QDeclarativeListView::setHeader(class QDeclarativeComponent *)
 	?setHeight@QDeclarativeItem@@QAEXM@Z @ 2438 NONAME ; void QDeclarativeItem::setHeight(float)
-	?setHeight@QDeclarativeParentChange@@QAEXM@Z @ 2439 NONAME ; void QDeclarativeParentChange::setHeight(float)
+	?setHeight@QDeclarativeParentChange@@QAEXM@Z @ 2439 NONAME ABSENT ; void QDeclarativeParentChange::setHeight(float)
 	?setHighlight@QDeclarativeGridView@@QAEXPAVQDeclarativeComponent@@@Z @ 2440 NONAME ; void QDeclarativeGridView::setHighlight(class QDeclarativeComponent *)
 	?setHighlight@QDeclarativeListView@@QAEXPAVQDeclarativeComponent@@@Z @ 2441 NONAME ; void QDeclarativeListView::setHighlight(class QDeclarativeComponent *)
 	?setHighlightFollowsCurrentItem@QDeclarativeGridView@@QAEX_N@Z @ 2442 NONAME ; void QDeclarativeGridView::setHighlightFollowsCurrentItem(bool)
@@ -2506,7 +2506,7 @@ EXPORTS
 	?setOfflineStoragePath@QDeclarativeEngine@@QAEXABVQString@@@Z @ 2505 NONAME ; void QDeclarativeEngine::setOfflineStoragePath(class QString const &)
 	?setOffset@QDeclarativePathView@@QAEXM@Z @ 2506 NONAME ; void QDeclarativePathView::setOffset(float)
 	?setOrientation@QDeclarativeListView@@QAEXW4Orientation@1@@Z @ 2507 NONAME ; void QDeclarativeListView::setOrientation(enum QDeclarativeListView::Orientation)
-	?setOverShoot@QDeclarativeFlickable@@QAEX_N@Z @ 2508 NONAME ; void QDeclarativeFlickable::setOverShoot(bool)
+	?setOverShoot@QDeclarativeFlickable@@QAEX_N@Z @ 2508 NONAME ABSENT ; void QDeclarativeFlickable::setOverShoot(bool)
 	?setPace@QDeclarativeParticleMotionWander@@QAEXM@Z @ 2509 NONAME ABSENT ; void QDeclarativeParticleMotionWander::setPace(float)
 	?setPage@QDeclarativeWebView@@QAEXPAVQWebPage@@@Z @ 2510 NONAME ABSENT ; void QDeclarativeWebView::setPage(class QWebPage *)
 	?setParameterNames@QMetaMethodBuilder@@QAEXABV?$QList@VQByteArray@@@@@Z @ 2511 NONAME ; void QMetaMethodBuilder::setParameterNames(class QList<class QByteArray> const &)
@@ -2555,10 +2555,10 @@ EXPORTS
 	?setRightMargin@QDeclarativeAnchors@@QAEXM@Z @ 2554 NONAME ; void QDeclarativeAnchors::setRightMargin(float)
 	?setRootIndex@QDeclarativeVisualDataModel@@QAEXABVQModelIndex@@@Z @ 2555 NONAME ABSENT ; void QDeclarativeVisualDataModel::setRootIndex(class QModelIndex const &)
 	?setRootObject@QDeclarativeView@@MAEXPAVQObject@@@Z @ 2556 NONAME ; void QDeclarativeView::setRootObject(class QObject *)
-	?setRotation@QDeclarativeParentChange@@QAEXM@Z @ 2557 NONAME ; void QDeclarativeParentChange::setRotation(float)
+	?setRotation@QDeclarativeParentChange@@QAEXM@Z @ 2557 NONAME ABSENT ; void QDeclarativeParentChange::setRotation(float)
 	?setRows@QDeclarativeGrid@@QAEXH@Z @ 2558 NONAME ; void QDeclarativeGrid::setRows(int)
 	?setRunning@QDeclarativeTimer@@QAEX_N@Z @ 2559 NONAME ; void QDeclarativeTimer::setRunning(bool)
-	?setScale@QDeclarativeParentChange@@QAEXM@Z @ 2560 NONAME ; void QDeclarativeParentChange::setScale(float)
+	?setScale@QDeclarativeParentChange@@QAEXM@Z @ 2560 NONAME ABSENT ; void QDeclarativeParentChange::setScale(float)
 	?setScopeObject@QDeclarativeScriptString@@QAEXPAVQObject@@@Z @ 2561 NONAME ; void QDeclarativeScriptString::setScopeObject(class QObject *)
 	?setScript@QDeclarativeScriptString@@QAEXABVQString@@@Z @ 2562 NONAME ; void QDeclarativeScriptString::setScript(class QString const &)
 	?setScript@QDeclarativeStateChangeScript@@QAEXABVQDeclarativeScriptString@@@Z @ 2563 NONAME ; void QDeclarativeStateChangeScript::setScript(class QDeclarativeScriptString const &)
@@ -2651,7 +2651,7 @@ EXPORTS
 	?setWhen@QDeclarativeBind@@QAEX_N@Z @ 2650 NONAME ; void QDeclarativeBind::setWhen(bool)
 	?setWhen@QDeclarativeState@@QAEXPAVQDeclarativeBinding@@@Z @ 2651 NONAME ; void QDeclarativeState::setWhen(class QDeclarativeBinding *)
 	?setWidth@QDeclarativeItem@@QAEXM@Z @ 2652 NONAME ; void QDeclarativeItem::setWidth(float)
-	?setWidth@QDeclarativeParentChange@@QAEXM@Z @ 2653 NONAME ; void QDeclarativeParentChange::setWidth(float)
+	?setWidth@QDeclarativeParentChange@@QAEXM@Z @ 2653 NONAME ABSENT ; void QDeclarativeParentChange::setWidth(float)
 	?setWidth@QDeclarativePen@@QAEXH@Z @ 2654 NONAME ; void QDeclarativePen::setWidth(int)
 	?setWrap@QDeclarativeText@@QAEX_N@Z @ 2655 NONAME ABSENT ; void QDeclarativeText::setWrap(bool)
 	?setWrap@QDeclarativeTextEdit@@QAEX_N@Z @ 2656 NONAME ABSENT ; void QDeclarativeTextEdit::setWrap(bool)
@@ -2659,14 +2659,14 @@ EXPORTS
 	?setWrapEnabled@QDeclarativeListView@@QAEX_N@Z @ 2658 NONAME ; void QDeclarativeListView::setWrapEnabled(bool)
 	?setWritable@QMetaPropertyBuilder@@QAEX_N@Z @ 2659 NONAME ; void QMetaPropertyBuilder::setWritable(bool)
 	?setX@QDeclarativeCurve@@QAEXM@Z @ 2660 NONAME ; void QDeclarativeCurve::setX(float)
-	?setX@QDeclarativeParentChange@@QAEXM@Z @ 2661 NONAME ; void QDeclarativeParentChange::setX(float)
+	?setX@QDeclarativeParentChange@@QAEXM@Z @ 2661 NONAME ABSENT ; void QDeclarativeParentChange::setX(float)
 	?setXAttractor@QDeclarativeParticleMotionGravity@@QAEXM@Z @ 2662 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::setXAttractor(float)
 	?setXVariance@QDeclarativeParticleMotionWander@@QAEXM@Z @ 2663 NONAME ABSENT ; void QDeclarativeParticleMotionWander::setXVariance(float)
 	?setXmax@QDeclarativeDrag@@QAEXM@Z @ 2664 NONAME ; void QDeclarativeDrag::setXmax(float)
 	?setXmin@QDeclarativeDrag@@QAEXM@Z @ 2665 NONAME ; void QDeclarativeDrag::setXmin(float)
 	?setXml@QDeclarativeXmlListModel@@QAEXABVQString@@@Z @ 2666 NONAME ; void QDeclarativeXmlListModel::setXml(class QString const &)
 	?setY@QDeclarativeCurve@@QAEXM@Z @ 2667 NONAME ; void QDeclarativeCurve::setY(float)
-	?setY@QDeclarativeParentChange@@QAEXM@Z @ 2668 NONAME ; void QDeclarativeParentChange::setY(float)
+	?setY@QDeclarativeParentChange@@QAEXM@Z @ 2668 NONAME ABSENT ; void QDeclarativeParentChange::setY(float)
 	?setYAttractor@QDeclarativeParticleMotionGravity@@QAEXM@Z @ 2669 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::setYAttractor(float)
 	?setYVariance@QDeclarativeParticleMotionWander@@QAEXM@Z @ 2670 NONAME ABSENT ; void QDeclarativeParticleMotionWander::setYVariance(float)
 	?setYmax@QDeclarativeDrag@@QAEXM@Z @ 2671 NONAME ; void QDeclarativeDrag::setYmax(float)
@@ -3298,7 +3298,7 @@ EXPORTS
 	?when@QDeclarativeBind@@QBE_NXZ @ 3297 NONAME ; bool QDeclarativeBind::when(void) const
 	?when@QDeclarativeState@@QBEPAVQDeclarativeBinding@@XZ @ 3298 NONAME ; class QDeclarativeBinding * QDeclarativeState::when(void) const
 	?width@QDeclarativeItem@@QBEMXZ @ 3299 NONAME ; float QDeclarativeItem::width(void) const
-	?width@QDeclarativeParentChange@@QBEMXZ @ 3300 NONAME ; float QDeclarativeParentChange::width(void) const
+	?width@QDeclarativeParentChange@@QBEMXZ @ 3300 NONAME ABSENT ; float QDeclarativeParentChange::width(void) const
 	?width@QDeclarativePen@@QBEHXZ @ 3301 NONAME ; int QDeclarativePen::width(void) const
 	?widthChange@QDeclarativeFlickable@@IAEXXZ @ 3302 NONAME ABSENT ; void QDeclarativeFlickable::widthChange(void)
 	?widthChanged@QDeclarativeItem@@IAEXXZ @ 3303 NONAME ABSENT ; void QDeclarativeItem::widthChanged(void)
@@ -3317,7 +3317,7 @@ EXPORTS
 	?write@QDeclarativeProperty@@SA_NPAVQObject@@ABVQString@@ABVQVariant@@PAVQDeclarativeContext@@@Z @ 3316 NONAME ; bool QDeclarativeProperty::write(class QObject *, class QString const &, class QVariant const &, class QDeclarativeContext *)
 	?write@QDeclarativeProperty@@SA_NPAVQObject@@ABVQString@@ABVQVariant@@PAVQDeclarativeEngine@@@Z @ 3317 NONAME ; bool QDeclarativeProperty::write(class QObject *, class QString const &, class QVariant const &, class QDeclarativeEngine *)
 	?x@QDeclarativeCurve@@QBEMXZ @ 3318 NONAME ; float QDeclarativeCurve::x(void) const
-	?x@QDeclarativeParentChange@@QBEMXZ @ 3319 NONAME ; float QDeclarativeParentChange::x(void) const
+	?x@QDeclarativeParentChange@@QBEMXZ @ 3319 NONAME ABSENT ; float QDeclarativeParentChange::x(void) const
 	?xAttractor@QDeclarativeParticleMotionGravity@@QBEMXZ @ 3320 NONAME ABSENT ; float QDeclarativeParticleMotionGravity::xAttractor(void) const
 	?xIsSet@QDeclarativeParentChange@@QBE_NXZ @ 3321 NONAME ; bool QDeclarativeParentChange::xIsSet(void) const
 	?xToPos@QDeclarativeTextInput@@QAEHH@Z @ 3322 NONAME ABSENT ; int QDeclarativeTextInput::xToPos(int)
@@ -3329,7 +3329,7 @@ EXPORTS
 	?xml@QDeclarativeXmlListModel@@QBE?AVQString@@XZ @ 3328 NONAME ; class QString QDeclarativeXmlListModel::xml(void) const
 	?xvarianceChanged@QDeclarativeParticleMotionWander@@IAEXXZ @ 3329 NONAME ABSENT ; void QDeclarativeParticleMotionWander::xvarianceChanged(void)
 	?y@QDeclarativeCurve@@QBEMXZ @ 3330 NONAME ; float QDeclarativeCurve::y(void) const
-	?y@QDeclarativeParentChange@@QBEMXZ @ 3331 NONAME ; float QDeclarativeParentChange::y(void) const
+	?y@QDeclarativeParentChange@@QBEMXZ @ 3331 NONAME ABSENT ; float QDeclarativeParentChange::y(void) const
 	?yAttractor@QDeclarativeParticleMotionGravity@@QBEMXZ @ 3332 NONAME ABSENT ; float QDeclarativeParticleMotionGravity::yAttractor(void) const
 	?yIsSet@QDeclarativeParentChange@@QBE_NXZ @ 3333 NONAME ; bool QDeclarativeParentChange::yIsSet(void) const
 	?yVariance@QDeclarativeParticleMotionWander@@QBEMXZ @ 3334 NONAME ABSENT ; float QDeclarativeParticleMotionWander::yVariance(void) const
@@ -3500,8 +3500,8 @@ EXPORTS
 	??0QDeclarativeBinding@@QAE@PAXPAVQDeclarativeRefCount@@PAVQObject@@PAVQDeclarativeContextData@@ABVQString@@H2@Z @ 3499 NONAME ; QDeclarativeBinding::QDeclarativeBinding(void *, class QDeclarativeRefCount *, class QObject *, class QDeclarativeContextData *, class QString const &, int, class QObject *)
 	??0QDeclarativeContext@@AAE@PAVQDeclarativeContextData@@@Z @ 3500 NONAME ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeContextData *)
 	??0QDeclarativeCustomParser@@QAE@XZ @ 3501 NONAME ; QDeclarativeCustomParser::QDeclarativeCustomParser(void)
-	??0QDeclarativeExpression@@AAE@PAVQDeclarativeContextData@@ABVQString@@PAVQObject@@@Z @ 3502 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QString const &, class QObject *)
-	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContextData@@ABVQString@@PAVQObject@@AAVQDeclarativeExpressionPrivate@@@Z @ 3503 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QString const &, class QObject *, class QDeclarativeExpressionPrivate &)
+	??0QDeclarativeExpression@@AAE@PAVQDeclarativeContextData@@ABVQString@@PAVQObject@@@Z @ 3502 NONAME ABSENT ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QString const &, class QObject *)
+	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContextData@@ABVQString@@PAVQObject@@AAVQDeclarativeExpressionPrivate@@@Z @ 3503 NONAME ABSENT ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QString const &, class QObject *, class QDeclarativeExpressionPrivate &)
 	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContextData@@PAXPAVQDeclarativeRefCount@@PAVQObject@@ABVQString@@HAAVQDeclarativeExpressionPrivate@@@Z @ 3504 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, void *, class QDeclarativeRefCount *, class QObject *, class QString const &, int, class QDeclarativeExpressionPrivate &)
 	??0QDeclarativeItemPrivate@@QAE@XZ @ 3505 NONAME ; QDeclarativeItemPrivate::QDeclarativeItemPrivate(void)
 	??0QDeclarativeListModel@@AAE@_NPAVQObject@@@Z @ 3506 NONAME ; QDeclarativeListModel::QDeclarativeListModel(bool, class QObject *)
@@ -3567,7 +3567,7 @@ EXPORTS
 	?countChanged@QDeclarativeListModel@@IAEXXZ @ 3566 NONAME ; void QDeclarativeListModel::countChanged(void)
 	?countChanged@QDeclarativePathView@@IAEXXZ @ 3567 NONAME ; void QDeclarativePathView::countChanged(void)
 	?create@QDeclarativeType@@QBEXPAPAVQObject@@PAPAXI@Z @ 3568 NONAME ; void QDeclarativeType::create(class QObject * *, void * *, unsigned int) const
-	?currentTime@QDeclarativeItemPrivate@@SA?AVQTime@@XZ @ 3569 NONAME ; class QTime QDeclarativeItemPrivate::currentTime(void)
+	?currentTime@QDeclarativeItemPrivate@@SA?AVQTime@@XZ @ 3569 NONAME ABSENT ; class QTime QDeclarativeItemPrivate::currentTime(void)
 	?d_func@QDeclarativeFocusPanel@@AAEPAVQDeclarativeItemPrivate@@XZ @ 3570 NONAME ; class QDeclarativeItemPrivate * QDeclarativeFocusPanel::d_func(void)
 	?d_func@QDeclarativeFocusPanel@@ABEPBVQDeclarativeItemPrivate@@XZ @ 3571 NONAME ; class QDeclarativeItemPrivate const * QDeclarativeFocusPanel::d_func(void) const
 	?d_func@QDeclarativeFocusScope@@AAEPAVQDeclarativeItemPrivate@@XZ @ 3572 NONAME ; class QDeclarativeItemPrivate * QDeclarativeFocusScope::d_func(void)
@@ -3588,7 +3588,7 @@ EXPORTS
 	?doPositioning@QDeclarativeRow@@MAEXPAVQSizeF@@@Z @ 3587 NONAME ; void QDeclarativeRow::doPositioning(class QSizeF *)
 	?dragMarginChanged@QDeclarativePathView@@IAEXXZ @ 3588 NONAME ; void QDeclarativePathView::dragMarginChanged(void)
 	?duration@QDeclarativeSmoothedAnimation@@UBEHXZ @ 3589 NONAME ; int QDeclarativeSmoothedAnimation::duration(void) const
-	?elapsed@QDeclarativeItemPrivate@@SAHAAVQTime@@@Z @ 3590 NONAME ; int QDeclarativeItemPrivate::elapsed(class QTime &)
+	?elapsed@QDeclarativeItemPrivate@@SAHAAVQTime@@@Z @ 3590 NONAME ABSENT ; int QDeclarativeItemPrivate::elapsed(class QTime &)
 	?evaluateEnum@QDeclarativeCompiler@@QBEHABVQByteArray@@@Z @ 3591 NONAME ; int QDeclarativeCompiler::evaluateEnum(class QByteArray const &) const
 	?evaluateEnum@QDeclarativeCustomParser@@IBEHABVQByteArray@@@Z @ 3592 NONAME ; int QDeclarativeCustomParser::evaluateEnum(class QByteArray const &) const
 	?event@QDeclarativeGridView@@MAE_NPAVQEvent@@@Z @ 3593 NONAME ; bool QDeclarativeGridView::event(class QEvent *)
@@ -3711,7 +3711,7 @@ EXPORTS
 	?resources_append@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@PAVQObject@@@Z @ 3710 NONAME ; void QDeclarativeItemPrivate::resources_append(class QDeclarativeListProperty<class QObject> *, class QObject *)
 	?resources_at@QDeclarativeItemPrivate@@SAPAVQObject@@PAV?$QDeclarativeListProperty@VQObject@@@@H@Z @ 3711 NONAME ; class QObject * QDeclarativeItemPrivate::resources_at(class QDeclarativeListProperty<class QObject> *, int)
 	?resources_count@QDeclarativeItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQObject@@@@@Z @ 3712 NONAME ; int QDeclarativeItemPrivate::resources_count(class QDeclarativeListProperty<class QObject> *)
-	?restart@QDeclarativeItemPrivate@@SAHAAVQTime@@@Z @ 3713 NONAME ; int QDeclarativeItemPrivate::restart(class QTime &)
+	?restart@QDeclarativeItemPrivate@@SAHAAVQTime@@@Z @ 3713 NONAME ABSENT ; int QDeclarativeItemPrivate::restart(class QTime &)
 	?restore@QDeclarativePropertyPrivate@@SA?AVQDeclarativeProperty@@ABVQByteArray@@PAVQObject@@PAVQDeclarativeContextData@@@Z @ 3714 NONAME ; class QDeclarativeProperty QDeclarativePropertyPrivate::restore(class QByteArray const &, class QObject *, class QDeclarativeContextData *)
 	?reversibleChanged@QDeclarativeTransition@@IAEXXZ @ 3715 NONAME ; void QDeclarativeTransition::reversibleChanged(void)
 	?reversingMode@QDeclarativeSmoothedAnimation@@QBE?AW4ReversingMode@1@XZ @ 3716 NONAME ; enum QDeclarativeSmoothedAnimation::ReversingMode QDeclarativeSmoothedAnimation::reversingMode(void) const
@@ -3768,7 +3768,7 @@ EXPORTS
 	?sourceChanged@QDeclarativeXmlListModel@@IAEXXZ @ 3767 NONAME ; void QDeclarativeXmlListModel::sourceChanged(void)
 	?sourceSize@QDeclarativeImageBase@@QBE?AVQSize@@XZ @ 3768 NONAME ; class QSize QDeclarativeImageBase::sourceSize(void) const
 	?sourceSizeChanged@QDeclarativeImageBase@@IAEXXZ @ 3769 NONAME ; void QDeclarativeImageBase::sourceSizeChanged(void)
-	?start@QDeclarativeItemPrivate@@SAXAAVQTime@@@Z @ 3770 NONAME ; void QDeclarativeItemPrivate::start(class QTime &)
+	?start@QDeclarativeItemPrivate@@SAXAAVQTime@@@Z @ 3770 NONAME ABSENT ; void QDeclarativeItemPrivate::start(class QTime &)
 	?startXChanged@QDeclarativePath@@IAEXXZ @ 3771 NONAME ; void QDeclarativePath::startXChanged(void)
 	?startYChanged@QDeclarativePath@@IAEXXZ @ 3772 NONAME ; void QDeclarativePath::startYChanged(void)
 	?states@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 3773 NONAME ABSENT ; class QDeclarativeListProperty<class QDeclarativeState> QDeclarativeItem::states(void)
@@ -3817,7 +3817,7 @@ EXPORTS
 	?staticMetaObject@QDeclarativeWorkerScript@@2UQMetaObject@@B @ 3816 NONAME ; struct QMetaObject const QDeclarativeWorkerScript::staticMetaObject
 	?staticMetaObject@QDeclarativeSmoothedAnimation@@2UQMetaObject@@B @ 3817 NONAME ; struct QMetaObject const QDeclarativeSmoothedAnimation::staticMetaObject
 	?staticMetaObject@QDeclarativeTranslate@@2UQMetaObject@@B @ 3818 NONAME ; struct QMetaObject const QDeclarativeTranslate::staticMetaObject
-	?consistentTime@QDeclarativeItemPrivate@@2HA @ 3819 NONAME ; int QDeclarativeItemPrivate::consistentTime
+	?consistentTime@QDeclarativeItemPrivate@@2HA @ 3819 NONAME ABSENT ; int QDeclarativeItemPrivate::consistentTime
 	??0QDeclarativeAction@@QAE@PAVQObject@@ABVQString@@PAVQDeclarativeContext@@ABVQVariant@@@Z @ 3820 NONAME ; QDeclarativeAction::QDeclarativeAction(class QObject *, class QString const &, class QDeclarativeContext *, class QVariant const &)
 	??0QDeclarativeSmoothedFollow@@QAE@PAVQObject@@@Z @ 3821 NONAME ; QDeclarativeSmoothedFollow::QDeclarativeSmoothedFollow(class QObject *)
 	??1QDeclarativeSmoothedFollow@@UAE@XZ @ 3822 NONAME ; QDeclarativeSmoothedFollow::~QDeclarativeSmoothedFollow(void)
@@ -4020,4 +4020,58 @@ EXPORTS
 	?keyReleasePreHandler@QDeclarativeItem@@IAEXPAVQKeyEvent@@@Z @ 4019 NONAME ; void QDeclarativeItem::keyReleasePreHandler(class QKeyEvent *)
 	?loaded@QDeclarativeLoader@@IAEXXZ @ 4020 NONAME ; void QDeclarativeLoader::loaded(void)
 	?needsCopy@QDeclarativeAnchorChanges@@UAE_NXZ @ 4021 NONAME ; bool QDeclarativeAnchorChanges::needsCopy(void)
+	?closeSoftwareInputPanel@QDeclarativeTextEdit@@QAEXXZ @ 4022 NONAME ; void QDeclarativeTextEdit::closeSoftwareInputPanel(void)
+	?restart@QDeclarativeItemPrivate@@SA_JAAVQElapsedTimer@@@Z @ 4023 NONAME ; long long QDeclarativeItemPrivate::restart(class QElapsedTimer &)
+	?get@QDeclarativeXmlListModel@@QBE?AVQScriptValue@@H@Z @ 4024 NONAME ; class QScriptValue QDeclarativeXmlListModel::get(int) const
+	?setScale@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4025 NONAME ; void QDeclarativeParentChange::setScale(class QDeclarativeScriptString)
+	?showInputPanelOnFocusChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 4026 NONAME ; void QDeclarativeTextEdit::showInputPanelOnFocusChanged(bool)
+	?focusOutEvent@QDeclarativeTextInput@@MAEXPAVQFocusEvent@@@Z @ 4027 NONAME ; void QDeclarativeTextInput::focusOutEvent(class QFocusEvent *)
+	?height@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4028 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::height(void) const
+	?showInputPanelOnFocus@QDeclarativeTextEdit@@QBE_NXZ @ 4029 NONAME ; bool QDeclarativeTextEdit::showInputPanelOnFocus(void) const
+	?errorString@QDeclarativeComponent@@QBE?AVQString@@XZ @ 4030 NONAME ; class QString QDeclarativeComponent::errorString(void) const
+	?elapsed@QDeclarativeItemPrivate@@SA_JAAVQElapsedTimer@@@Z @ 4031 NONAME ; long long QDeclarativeItemPrivate::elapsed(class QElapsedTimer &)
+	?focusInEvent@QDeclarativeTextInput@@MAEXPAVQFocusEvent@@@Z @ 4032 NONAME ; void QDeclarativeTextInput::focusInEvent(class QFocusEvent *)
+	?setX@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4033 NONAME ; void QDeclarativeParentChange::setX(class QDeclarativeScriptString)
+	?rotation@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4034 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::rotation(void) const
+	?paintedHeight@QDeclarativeTextEdit@@QBEMXZ @ 4035 NONAME ; float QDeclarativeTextEdit::paintedHeight(void) const
+	?paintedWidth@QDeclarativeTextEdit@@QBEMXZ @ 4036 NONAME ; float QDeclarativeTextEdit::paintedWidth(void) const
+	?focusOutEvent@QDeclarativeTextEdit@@MAEXPAVQFocusEvent@@@Z @ 4037 NONAME ; void QDeclarativeTextEdit::focusOutEvent(class QFocusEvent *)
+	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContextData@@PAVQObject@@ABVQString@@AAVQDeclarativeExpressionPrivate@@@Z @ 4038 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QObject *, class QString const &, class QDeclarativeExpressionPrivate &)
+	??0QDeclarativeExpression@@QAE@PAVQDeclarativeContext@@PAVQObject@@ABVQString@@1@Z @ 4039 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, class QObject *, class QString const &, class QObject *)
+	?queryError@QDeclarativeXmlListModel@@AAEXPAXABVQString@@@Z @ 4040 NONAME ; void QDeclarativeXmlListModel::queryError(void *, class QString const &)
+	?errorString@QDeclarativeXmlListModel@@QBE?AVQString@@XZ @ 4041 NONAME ; class QString QDeclarativeXmlListModel::errorString(void) const
+	?consistentTime@QDeclarativeItemPrivate@@2_JA @ 4042 NONAME ; long long QDeclarativeItemPrivate::consistentTime
+	?scale@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4043 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::scale(void) const
+	?showInputPanelOnFocus@QDeclarativeTextInput@@QBE_NXZ @ 4044 NONAME ; bool QDeclarativeTextInput::showInputPanelOnFocus(void) const
+	?focusInEvent@QDeclarativeTextEdit@@MAEXPAVQFocusEvent@@@Z @ 4045 NONAME ; void QDeclarativeTextEdit::focusInEvent(class QFocusEvent *)
+	?y@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4046 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::y(void) const
+	?setY@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4047 NONAME ; void QDeclarativeParentChange::setY(class QDeclarativeScriptString)
+	?setShowInputPanelOnFocus@QDeclarativeTextEdit@@QAEX_N@Z @ 4048 NONAME ; void QDeclarativeTextEdit::setShowInputPanelOnFocus(bool)
+	?paintedSizeChanged@QDeclarativeText@@IAEXXZ @ 4049 NONAME ; void QDeclarativeText::paintedSizeChanged(void)
+	?selectByMouseChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 4050 NONAME ; void QDeclarativeTextEdit::selectByMouseChanged(bool)
+	?openSoftwareInputPanel@QDeclarativeTextInput@@QAEXXZ @ 4051 NONAME ; void QDeclarativeTextInput::openSoftwareInputPanel(void)
+	?setShowInputPanelOnFocus@QDeclarativeTextInput@@QAEX_N@Z @ 4052 NONAME ; void QDeclarativeTextInput::setShowInputPanelOnFocus(bool)
+	?boundingRect@QDeclarativePaintedItem@@MBE?AVQRectF@@XZ @ 4053 NONAME ; class QRectF QDeclarativePaintedItem::boundingRect(void) const
+	?closeSoftwareInputPanel@QDeclarativeTextInput@@QAEXXZ @ 4054 NONAME ; void QDeclarativeTextInput::closeSoftwareInputPanel(void)
+	?setWidth@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4055 NONAME ; void QDeclarativeParentChange::setWidth(class QDeclarativeScriptString)
+	?selectByMouse@QDeclarativeTextInput@@QBE_NXZ @ 4056 NONAME ; bool QDeclarativeTextInput::selectByMouse(void) const
+	?setRotation@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4057 NONAME ; void QDeclarativeParentChange::setRotation(class QDeclarativeScriptString)
+	?paintedWidth@QDeclarativeText@@QBEMXZ @ 4058 NONAME ; float QDeclarativeText::paintedWidth(void) const
+	?paintedSizeChanged@QDeclarativeTextEdit@@IAEXXZ @ 4059 NONAME ; void QDeclarativeTextEdit::paintedSizeChanged(void)
+	?setConsistentTime@QDeclarativeItemPrivate@@SAX_J@Z @ 4060 NONAME ; void QDeclarativeItemPrivate::setConsistentTime(long long)
+	??0QDeclarativeExpression@@AAE@PAVQDeclarativeContextData@@PAVQObject@@ABVQString@@@Z @ 4061 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QObject *, class QString const &)
+	?event@QDeclarativePathView@@MAE_NPAVQEvent@@@Z @ 4062 NONAME ; bool QDeclarativePathView::event(class QEvent *)
+	?paintedHeight@QDeclarativeText@@QBEMXZ @ 4063 NONAME ; float QDeclarativeText::paintedHeight(void) const
+	?setSelectByMouse@QDeclarativeTextInput@@QAEX_N@Z @ 4064 NONAME ; void QDeclarativeTextInput::setSelectByMouse(bool)
+	?setSelectByMouse@QDeclarativeTextEdit@@QAEX_N@Z @ 4065 NONAME ; void QDeclarativeTextEdit::setSelectByMouse(bool)
+	?selectByMouse@QDeclarativeTextEdit@@QBE_NXZ @ 4066 NONAME ; bool QDeclarativeTextEdit::selectByMouse(void) const
+	?setHeight@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4067 NONAME ; void QDeclarativeParentChange::setHeight(class QDeclarativeScriptString)
+	?start@QDeclarativeItemPrivate@@SAXAAVQElapsedTimer@@@Z @ 4068 NONAME ; void QDeclarativeItemPrivate::start(class QElapsedTimer &)
+	?showInputPanelOnFocusChanged@QDeclarativeTextInput@@IAEX_N@Z @ 4069 NONAME ; void QDeclarativeTextInput::showInputPanelOnFocusChanged(bool)
+	?x@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4070 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::x(void) const
+	?selectByMouseChanged@QDeclarativeTextInput@@IAEX_N@Z @ 4071 NONAME ; void QDeclarativeTextInput::selectByMouseChanged(bool)
+	?width@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4072 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::width(void) const
+	?openSoftwareInputPanel@QDeclarativeTextEdit@@QAEXXZ @ 4073 NONAME ; void QDeclarativeTextEdit::openSoftwareInputPanel(void)
+	?cursorRectangleChanged@QDeclarativeTextEdit@@IAEXXZ @ 4074 NONAME ; void QDeclarativeTextEdit::cursorRectangleChanged(void)
+	?cursorRectangle@QDeclarativeTextEdit@@QBE?AVQRect@@XZ @ 4075 NONAME ; class QRect QDeclarativeTextEdit::cursorRectangle(void) const
 
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 3368e4c..a1e05e2 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -2125,9 +2125,9 @@ EXPORTS
 	?addText@QPainterPath@@QAEXMMABVQFont@@ABVQString@@@Z @ 2124 NONAME ; void QPainterPath::addText(float, float, class QFont const &, class QString const &)
 	?addToGroup@QGraphicsItemGroup@@QAEXPAVQGraphicsItem@@@Z @ 2125 NONAME ; void QGraphicsItemGroup::addToGroup(class QGraphicsItem *)
 	?addToIndex@QGraphicsItem@@IAEXXZ @ 2126 NONAME ; void QGraphicsItem::addToIndex(void)
-	?addToPolygon@QBezier@@QBEXPAVQPolygonF@@@Z @ 2127 NONAME ; void QBezier::addToPolygon(class QPolygonF *) const
-	?addToPolygonIterative@QBezier@@QBEXPAVQPolygonF@@@Z @ 2128 NONAME ; void QBezier::addToPolygonIterative(class QPolygonF *) const
-	?addToPolygonMixed@QBezier@@QBEXPAVQPolygonF@@@Z @ 2129 NONAME ; void QBezier::addToPolygonMixed(class QPolygonF *) const
+	?addToPolygon@QBezier@@QBEXPAVQPolygonF@@@Z @ 2127 NONAME ABSENT ; void QBezier::addToPolygon(class QPolygonF *) const
+	?addToPolygonIterative@QBezier@@QBEXPAVQPolygonF@@@Z @ 2128 NONAME ABSENT ; void QBezier::addToPolygonIterative(class QPolygonF *) const
+	?addToPolygonMixed@QBezier@@QBEXPAVQPolygonF@@@Z @ 2129 NONAME ABSENT ; void QBezier::addToPolygonMixed(class QPolygonF *) const
 	?addToolBar@QMainWindow@@QAEPAVQToolBar@@ABVQString@@@Z @ 2130 NONAME ; class QToolBar * QMainWindow::addToolBar(class QString const &)
 	?addToolBar@QMainWindow@@QAEXPAVQToolBar@@@Z @ 2131 NONAME ; void QMainWindow::addToolBar(class QToolBar *)
 	?addToolBar@QMainWindow@@QAEXW4ToolBarArea@Qt@@PAVQToolBar@@@Z @ 2132 NONAME ; void QMainWindow::addToolBar(enum Qt::ToolBarArea, class QToolBar *)
@@ -3207,7 +3207,7 @@ EXPORTS
 	?cursorWordForward@QLineControl@@QAEX_N@Z @ 3206 NONAME ; void QLineControl::cursorWordForward(bool)
 	?cursorWordForward@QLineEdit@@QAEX_N@Z @ 3207 NONAME ; void QLineEdit::cursorWordForward(bool)
 	?curveThreshold@QPainterPathStroker@@QBEMXZ @ 3208 NONAME ; float QPainterPathStroker::curveThreshold(void) const
-	?curveThreshold@QStroker@@QBEMXZ @ 3209 NONAME ; float QStroker::curveThreshold(void) const
+	?curveThreshold@QStroker@@QBEMXZ @ 3209 NONAME ABSENT ; float QStroker::curveThreshold(void) const
 	?customButtonClicked@QWizard@@IAEXH@Z @ 3210 NONAME ; void QWizard::customButtonClicked(int)
 	?customColor@QColorDialog@@SAIH@Z @ 3211 NONAME ; unsigned int QColorDialog::customColor(int)
 	?customContextMenuRequested@QWidget@@IAEXABVQPoint@@@Z @ 3212 NONAME ; void QWidget::customContextMenuRequested(class QPoint const &)
@@ -3853,7 +3853,7 @@ EXPORTS
 	?draw@QLineControl@@QAEXPAVQPainter@@ABVQPoint@@ABVQRect@@H@Z @ 3852 NONAME ; void QLineControl::draw(class QPainter *, class QPoint const &, class QRect const &, int)
 	?draw@QPaintBuffer@@QBEXPAVQPainter@@H@Z @ 3853 NONAME ; void QPaintBuffer::draw(class QPainter *, int) const
 	?draw@QPaintEngineEx@@UAEXABVQVectorPath@@@Z @ 3854 NONAME ; void QPaintEngineEx::draw(class QVectorPath const &)
-	?draw@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@H@Z @ 3855 NONAME ; void QPainterReplayer::draw(class QPaintBuffer const &, class QPainter *, int)
+	?draw@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@H@Z @ 3855 NONAME ABSENT ; void QPainterReplayer::draw(class QPaintBuffer const &, class QPainter *, int)
 	?draw@QPixmapBlurFilter@@UBEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQRectF@@@Z @ 3856 NONAME ; void QPixmapBlurFilter::draw(class QPainter *, class QPointF const &, class QPixmap const &, class QRectF const &) const
 	?draw@QPixmapColorizeFilter@@UBEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQRectF@@@Z @ 3857 NONAME ; void QPixmapColorizeFilter::draw(class QPainter *, class QPointF const &, class QPixmap const &, class QRectF const &) const
 	?draw@QPixmapConvolutionFilter@@UBEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQRectF@@@Z @ 3858 NONAME ; void QPixmapConvolutionFilter::draw(class QPainter *, class QPointF const &, class QPixmap const &, class QRectF const &) const
@@ -3961,7 +3961,7 @@ EXPORTS
 	?drawPixmap@QPainter@@QAEXHHABVQPixmap@@HHHH@Z @ 3960 NONAME ; void QPainter::drawPixmap(int, int, class QPixmap const &, int, int, int, int)
 	?drawPixmap@QPainter@@QAEXHHHHABVQPixmap@@@Z @ 3961 NONAME ; void QPainter::drawPixmap(int, int, int, int, class QPixmap const &)
 	?drawPixmap@QPainter@@QAEXHHHHABVQPixmap@@HHHH@Z @ 3962 NONAME ; void QPainter::drawPixmap(int, int, int, int, class QPixmap const &, int, int, int, int)
-	?drawPixmaps@QPaintEngineEx@@UAEXPBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 3963 NONAME ; void QPaintEngineEx::drawPixmaps(struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
+	?drawPixmaps@QPaintEngineEx@@UAEXPBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 3963 NONAME ABSENT ; void QPaintEngineEx::drawPixmaps(struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
 	?drawPoint@QPainter@@QAEXABVQPoint@@@Z @ 3964 NONAME ; void QPainter::drawPoint(class QPoint const &)
 	?drawPoint@QPainter@@QAEXABVQPointF@@@Z @ 3965 NONAME ; void QPainter::drawPoint(class QPointF const &)
 	?drawPoint@QPainter@@QAEXHH@Z @ 3966 NONAME ; void QPainter::drawPoint(int, int)
@@ -4417,8 +4417,8 @@ EXPORTS
 	?findData@QComboBox@@QBEHABVQVariant@@HV?$QFlags@W4MatchFlag@Qt@@@@@Z @ 4416 NONAME ; int QComboBox::findData(class QVariant const &, int, class QFlags<enum Qt::MatchFlag>) const
 	?findFont@QFontDatabase@@CAPAVQFontEngine@@HPBVQFontPrivate@@ABUQFontDef@@@Z @ 4417 NONAME ; class QFontEngine * QFontDatabase::findFont(int, class QFontPrivate const *, struct QFontDef const &)
 	?findInMask@QLineControl@@ABEHH_N0VQChar@@@Z @ 4418 NONAME ; int QLineControl::findInMask(int, bool, bool, class QChar) const
-	?findIntersections@QBezier@@SA?AV?$QVector@U?$QPair@MM@@@@ABV1@0@Z @ 4419 NONAME ; class QVector<struct QPair<float, float> > QBezier::findIntersections(class QBezier const &, class QBezier const &)
-	?findIntersections@QBezier@@SA_NABV1@0PAV?$QVector@U?$QPair@MM@@@@@Z @ 4420 NONAME ; bool QBezier::findIntersections(class QBezier const &, class QBezier const &, class QVector<struct QPair<float, float> > *)
+	?findIntersections@QBezier@@SA?AV?$QVector@U?$QPair@MM@@@@ABV1@0@Z @ 4419 NONAME ABSENT ; class QVector<struct QPair<float, float> > QBezier::findIntersections(class QBezier const &, class QBezier const &)
+	?findIntersections@QBezier@@SA_NABV1@0PAV?$QVector@U?$QPair@MM@@@@@Z @ 4420 NONAME ABSENT ; bool QBezier::findIntersections(class QBezier const &, class QBezier const &, class QVector<struct QPair<float, float> > *)
 	?findItem@QTextEngine@@QBEHH@Z @ 4421 NONAME ; int QTextEngine::findItem(int) const
 	?findItems@QListWidget@@QBE?AV?$QList@PAVQListWidgetItem@@@@ABVQString@@V?$QFlags@W4MatchFlag@Qt@@@@@Z @ 4422 NONAME ; class QList<class QListWidgetItem *> QListWidget::findItems(class QString const &, class QFlags<enum Qt::MatchFlag>) const
 	?findItems@QStandardItemModel@@QBE?AV?$QList@PAVQStandardItem@@@@ABVQString@@V?$QFlags@W4MatchFlag@Qt@@@@H@Z @ 4423 NONAME ; class QList<class QStandardItem *> QStandardItemModel::findItems(class QString const &, class QFlags<enum Qt::MatchFlag>, int) const
@@ -7206,10 +7206,10 @@ EXPORTS
 	?parseTerm@Parser@QCss@@QAE_NPAUValue@2@@Z @ 7205 NONAME ; bool QCss::Parser::parseTerm(struct QCss::Value *)
 	?passwordCharacter@QLineControl@@QBE?AVQChar@@XZ @ 7206 NONAME ; class QChar QLineControl::passwordCharacter(void) const
 	?passwordEchoEditing@QLineControl@@QBE_NXZ @ 7207 NONAME ; bool QLineControl::passwordEchoEditing(void) const
-	?paste@QLineControl@@QAEXXZ @ 7208 NONAME ; void QLineControl::paste(void)
+	?paste@QLineControl@@QAEXXZ @ 7208 NONAME ABSENT ; void QLineControl::paste(void)
 	?paste@QLineEdit@@QAEXXZ @ 7209 NONAME ; void QLineEdit::paste(void)
 	?paste@QPlainTextEdit@@QAEXXZ @ 7210 NONAME ; void QPlainTextEdit::paste(void)
-	?paste@QTextControl@@QAEXXZ @ 7211 NONAME ; void QTextControl::paste(void)
+	?paste@QTextControl@@QAEXXZ @ 7211 NONAME ABSENT ; void QTextControl::paste(void)
 	?paste@QTextEdit@@QAEXXZ @ 7212 NONAME ; void QTextEdit::paste(void)
 	?path@QGraphicsPathItem@@QBE?AVQPainterPath@@XZ @ 7213 NONAME ; class QPainterPath QGraphicsPathItem::path(void) const
 	?pathFromIndex@QCompleter@@UBE?AVQString@@ABVQModelIndex@@@Z @ 7214 NONAME ; class QString QCompleter::pathFromIndex(class QModelIndex const &) const
@@ -7291,7 +7291,7 @@ EXPORTS
 	?polishEvent@QGraphicsWidget@@MAEXXZ @ 7290 NONAME ; void QGraphicsWidget::polishEvent(void)
 	?polygon@QGraphicsPolygonItem@@QBE?AVQPolygonF@@XZ @ 7291 NONAME ; class QPolygonF QGraphicsPolygonItem::polygon(void) const
 	?polygonFlags@QVectorPath@@SAIW4PolygonDrawMode@QPaintEngine@@@Z @ 7292 NONAME ; unsigned int QVectorPath::polygonFlags(enum QPaintEngine::PolygonDrawMode)
-	?populate@QTextureGlyphCache@@QAEXABVQTextItemInt@@ABV?$QVarLengthArray@I$0BAA@@@ABV?$QVarLengthArray@UQFixedPoint@@$0BAA@@@@Z @ 7293 NONAME ; void QTextureGlyphCache::populate(class QTextItemInt const &, class QVarLengthArray<unsigned int, 256> const &, class QVarLengthArray<struct QFixedPoint, 256> const &)
+	?populate@QTextureGlyphCache@@QAEXABVQTextItemInt@@ABV?$QVarLengthArray@I$0BAA@@@ABV?$QVarLengthArray@UQFixedPoint@@$0BAA@@@@Z @ 7293 NONAME ABSENT ; void QTextureGlyphCache::populate(class QTextItemInt const &, class QVarLengthArray<unsigned int, 256> const &, class QVarLengthArray<struct QFixedPoint, 256> const &)
 	?popup@QCompleter@@QBEPAVQAbstractItemView@@XZ @ 7294 NONAME ; class QAbstractItemView * QCompleter::popup(void) const
 	?popup@QMenu@@QAEXABVQPoint@@PAVQAction@@@Z @ 7295 NONAME ; void QMenu::popup(class QPoint const &, class QAction *)
 	?popupMode@QToolButton@@QBE?AW4ToolButtonPopupMode@1@XZ @ 7296 NONAME ; enum QToolButton::ToolButtonPopupMode QToolButton::popupMode(void) const
@@ -7389,7 +7389,7 @@ EXPORTS
 	?qAlpha@@YAHI@Z @ 7388 NONAME ; int qAlpha(unsigned int)
 	?qBlue@@YAHI@Z @ 7389 NONAME ; int qBlue(unsigned int)
 	?qDrawBorderPixmap@@YAXPAVQPainter@@ABVQRect@@ABVQMargins@@ABVQPixmap@@12ABUQTileRules@@V?$QFlags@W4DrawingHint@QDrawBorderPixmap@@@@@Z @ 7390 NONAME ; void qDrawBorderPixmap(class QPainter *, class QRect const &, class QMargins const &, class QPixmap const &, class QRect const &, class QMargins const &, struct QTileRules const &, class QFlags<enum QDrawBorderPixmap::DrawingHint>)
-	?qDrawPixmaps@@YAXPAVQPainter@@PBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 7391 NONAME ; void qDrawPixmaps(class QPainter *, struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
+	?qDrawPixmaps@@YAXPAVQPainter@@PBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 7391 NONAME ABSENT ; void qDrawPixmaps(class QPainter *, struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
 	?qDrawPlainRect@@YAXPAVQPainter@@ABVQRect@@ABVQColor@@HPBVQBrush@@@Z @ 7392 NONAME ; void qDrawPlainRect(class QPainter *, class QRect const &, class QColor const &, int, class QBrush const *)
 	?qDrawPlainRect@@YAXPAVQPainter@@HHHHABVQColor@@HPBVQBrush@@@Z @ 7393 NONAME ; void qDrawPlainRect(class QPainter *, int, int, int, int, class QColor const &, int, class QBrush const *)
 	?qDrawShadeLine@@YAXPAVQPainter@@ABVQPoint@@1ABVQPalette@@_NHH@Z @ 7394 NONAME ; void qDrawShadeLine(class QPainter *, class QPoint const &, class QPoint const &, class QPalette const &, bool, int, int)
@@ -8769,7 +8769,7 @@ EXPORTS
 	?setCursorWidth@QTextEdit@@QAEXH@Z @ 8768 NONAME ; void QTextEdit::setCursorWidth(int)
 	?setCursor_sys@QWidgetPrivate@@QAEXABVQCursor@@@Z @ 8769 NONAME ; void QWidgetPrivate::setCursor_sys(class QCursor const &)
 	?setCurveThreshold@QPainterPathStroker@@QAEXM@Z @ 8770 NONAME ; void QPainterPathStroker::setCurveThreshold(float)
-	?setCurveThreshold@QStroker@@QAEXM@Z @ 8771 NONAME ; void QStroker::setCurveThreshold(float)
+	?setCurveThreshold@QStroker@@QAEXM@Z @ 8771 NONAME ABSENT ; void QStroker::setCurveThreshold(float)
 	?setCustomColor@QColorDialog@@SAXHI@Z @ 8772 NONAME ; void QColorDialog::setCustomColor(int, unsigned int)
 	?setDashOffset@QDashStroker@@QAEXM@Z @ 8773 NONAME ; void QDashStroker::setDashOffset(float)
 	?setDashOffset@QPainterPathStroker@@QAEXM@Z @ 8774 NONAME ; void QPainterPathStroker::setDashOffset(float)
@@ -10501,7 +10501,7 @@ EXPORTS
 	?speed@QMovie@@QBEHXZ @ 10500 NONAME ; int QMovie::speed(void) const
 	?split@QBezier@@QBEXPAV1@0@Z @ 10501 NONAME ; void QBezier::split(class QBezier *, class QBezier *) const
 	?split@QItemSelection@@SAXABVQItemSelectionRange@@0PAV1@@Z @ 10502 NONAME ; void QItemSelection::split(class QItemSelectionRange const &, class QItemSelectionRange const &, class QItemSelection *)
-	?splitAtIntersections@QBezier@@QAE?AV?$QVector@V?$QList@VQBezier@@@@@@AAV1@@Z @ 10503 NONAME ; class QVector<class QList<class QBezier> > QBezier::splitAtIntersections(class QBezier &)
+	?splitAtIntersections@QBezier@@QAE?AV?$QVector@V?$QList@VQBezier@@@@@@AAV1@@Z @ 10503 NONAME ABSENT ; class QVector<class QList<class QBezier> > QBezier::splitAtIntersections(class QBezier &)
 	?splitCell@QTextTable@@QAEXHHHH@Z @ 10504 NONAME ; void QTextTable::splitCell(int, int, int, int)
 	?splitDockWidget@QMainWindow@@QAEXPAVQDockWidget@@0W4Orientation@Qt@@@Z @ 10505 NONAME ; void QMainWindow::splitDockWidget(class QDockWidget *, class QDockWidget *, enum Qt::Orientation)
 	?splitItem@QTextEngine@@ABEXHH@Z @ 10506 NONAME ; void QTextEngine::splitItem(int, int) const
@@ -10990,7 +10990,7 @@ EXPORTS
 	?toPointF@QVector2D@@QBE?AVQPointF@@XZ @ 10989 NONAME ; class QPointF QVector2D::toPointF(void) const
 	?toPointF@QVector3D@@QBE?AVQPointF@@XZ @ 10990 NONAME ; class QPointF QVector3D::toPointF(void) const
 	?toPointF@QVector4D@@QBE?AVQPointF@@XZ @ 10991 NONAME ; class QPointF QVector4D::toPointF(void) const
-	?toPolygon@QBezier@@QBE?AVQPolygonF@@XZ @ 10992 NONAME ; class QPolygonF QBezier::toPolygon(void) const
+	?toPolygon@QBezier@@QBE?AVQPolygonF@@XZ @ 10992 NONAME ABSENT ; class QPolygonF QBezier::toPolygon(void) const
 	?toPolygon@QPolygonF@@QBE?AVQPolygon@@XZ @ 10993 NONAME ; class QPolygon QPolygonF::toPolygon(void) const
 	?toPrevious@QDataWidgetMapper@@QAEXXZ @ 10994 NONAME ; void QDataWidgetMapper::toPrevious(void)
 	?toReversed@QPainterPath@@QBE?AV1@XZ @ 10995 NONAME ; class QPainterPath QPainterPath::toReversed(void) const
@@ -12549,18 +12549,18 @@ EXPORTS
 	?updateAncestorFlags@QGraphicsItemPrivate@@QAEXXZ @ 12548 NONAME ; void QGraphicsItemPrivate::updateAncestorFlags(void)
 	?updateChildWithGraphicsEffectFlagRecursively@QGraphicsItemPrivate@@QAEXXZ @ 12549 NONAME ; void QGraphicsItemPrivate::updateChildWithGraphicsEffectFlagRecursively(void)
 	?api@QEglContext@@QBE?AW4API@QEgl@@XZ @ 12550 NONAME ; enum QEgl::API QEglContext::api(void) const
-	?display@QEglContext@@SAHXZ @ 12551 NONAME ; int QEglContext::display(void)
+	?display@QEglContext@@SAHXZ @ 12551 NONAME ABSENT ; int QEglContext::display(void)
 	?isOpacityNull@QGraphicsItemPrivate@@SA_NM@Z @ 12552 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(float)
 	?chooseConfig@QEglContext@@QAE_NABVQEglProperties@@W4PixelFormatMatch@QEgl@@@Z @ 12553 NONAME ; bool QEglContext::chooseConfig(class QEglProperties const &, enum QEgl::PixelFormatMatch)
 	?destroySurface@QEglContext@@QAEXH@Z @ 12554 NONAME ; void QEglContext::destroySurface(int)
 	?lazyDoneCurrent@QEglContext@@QAE_NXZ @ 12555 NONAME ; bool QEglContext::lazyDoneCurrent(void)
-	?waitNative@QEglContext@@QAEXXZ @ 12556 NONAME ; void QEglContext::waitNative(void)
+	?waitNative@QEglContext@@QAEXXZ @ 12556 NONAME ABSENT ; void QEglContext::waitNative(void)
 	?context@QEglContext@@QBEHXZ @ 12557 NONAME ; int QEglContext::context(void) const
-	?configAttrib@QEglContext@@QBE_NHPAH@Z @ 12558 NONAME ; bool QEglContext::configAttrib(int, int *) const
+	?configAttrib@QEglContext@@QBE_NHPAH@Z @ 12558 NONAME ABSENT ; bool QEglContext::configAttrib(int, int *) const
 	??0QEglProperties@@QAE@ABV0@@Z @ 12559 NONAME ; QEglProperties::QEglProperties(class QEglProperties const &)
 	?config@QEglContext@@QBEHXZ @ 12560 NONAME ; int QEglContext::config(void) const
 	?clearFocusHelper@QGraphicsItemPrivate@@QAEX_N@Z @ 12561 NONAME ; void QGraphicsItemPrivate::clearFocusHelper(bool)
-	?error@QEglContext@@SAHXZ @ 12562 NONAME ; int QEglContext::error(void)
+	?error@QEglContext@@SAHXZ @ 12562 NONAME ABSENT ; int QEglContext::error(void)
 	?swapBuffers@QEglContext@@QAE_NH@Z @ 12563 NONAME ; bool QEglContext::swapBuffers(int)
 	?canKeypadNavigate@QWidgetPrivate@@SA_NW4Orientation@Qt@@@Z @ 12564 NONAME ; bool QWidgetPrivate::canKeypadNavigate(enum Qt::Orientation)
 	?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12565 NONAME ; bool QFontDatabase::removeAllApplicationFonts(void)
@@ -12569,44 +12569,240 @@ EXPORTS
 	?makeCurrent@QEglContext@@QAE_NH@Z @ 12568 NONAME ; bool QEglContext::makeCurrent(int)
 	?isPixmapCached@QImagePixmapCleanupHooks@@SA_NABVQPixmap@@@Z @ 12569 NONAME ; bool QImagePixmapCleanupHooks::isPixmapCached(class QPixmap const &)
 	?createSurface@QEglContext@@QAEHPAVQPaintDevice@@PBVQEglProperties@@@Z @ 12570 NONAME ; int QEglContext::createSurface(class QPaintDevice *, class QEglProperties const *)
-	?dumpAllConfigs@QEglContext@@QAEXXZ @ 12571 NONAME ; void QEglContext::dumpAllConfigs(void)
+	?dumpAllConfigs@QEglContext@@QAEXXZ @ 12571 NONAME ABSENT ; void QEglContext::dumpAllConfigs(void)
 	?reduceConfiguration@QEglProperties@@QAE_NXZ @ 12572 NONAME ; bool QEglProperties::reduceConfiguration(void)
-	?nativeDisplay@QEglContext@@CAHXZ @ 12573 NONAME ; int QEglContext::nativeDisplay(void)
+	?nativeDisplay@QEglContext@@CAHXZ @ 12573 NONAME ABSENT ; int QEglContext::nativeDisplay(void)
 	?getGlyphBearings@QFontEngine@@UAEXIPAM0@Z @ 12574 NONAME ; void QFontEngine::getGlyphBearings(unsigned int, float *, float *)
 	?removeValue@QEglProperties@@QAE_NH@Z @ 12575 NONAME ; bool QEglProperties::removeValue(int)
 	?toString@QEglProperties@@QBE?AVQString@@XZ @ 12576 NONAME ; class QString QEglProperties::toString(void) const
 	?isOpacityNull@QGraphicsItemPrivate@@QBE_NXZ @ 12577 NONAME ; bool QGraphicsItemPrivate::isOpacityNull(void) const
-	?dumpAllConfigs@QEglProperties@@SAXXZ @ 12578 NONAME ; void QEglProperties::dumpAllConfigs(void)
+	?dumpAllConfigs@QEglProperties@@SAXXZ @ 12578 NONAME ABSENT ; void QEglProperties::dumpAllConfigs(void)
 	?inTabWidget@QWidgetPrivate@@SA_NPAVQWidget@@@Z @ 12579 NONAME ; bool QWidgetPrivate::inTabWidget(class QWidget *)
-	?configProperties@QEglContext@@QBE?AVQEglProperties@@H@Z @ 12580 NONAME ; class QEglProperties QEglContext::configProperties(int) const
+	?configProperties@QEglContext@@QBE?AVQEglProperties@@H@Z @ 12580 NONAME ABSENT ; class QEglProperties QEglContext::configProperties(int) const
 	?properties@QEglProperties@@QBEPBHXZ @ 12581 NONAME ; int const * QEglProperties::properties(void) const
 	?destroyContext@QEglContext@@QAEXXZ @ 12582 NONAME ; void QEglContext::destroyContext(void)
 	??0QEglContext@@QAE@XZ @ 12583 NONAME ; QEglContext::QEglContext(void)
 	??1QEglContext@@QAE@XZ @ 12584 NONAME ; QEglContext::~QEglContext(void)
 	?isValid@QEglContext@@QBE_NXZ @ 12585 NONAME ; bool QEglContext::isValid(void) const
 	?value@QEglProperties@@QBEHH@Z @ 12586 NONAME ; int QEglProperties::value(int) const
-	?clearError@QEglContext@@SAXXZ @ 12587 NONAME ; void QEglContext::clearError(void)
+	?clearError@QEglContext@@SAXXZ @ 12587 NONAME ABSENT ; void QEglContext::clearError(void)
 	??0QEglProperties@@QAE@H@Z @ 12588 NONAME ; QEglProperties::QEglProperties(int)
 	?setValue@QEglProperties@@QAEXHH@Z @ 12589 NONAME ; void QEglProperties::setValue(int, int)
 	?setPaintDeviceFormat@QEglProperties@@QAEXPAVQPaintDevice@@@Z @ 12590 NONAME ; void QEglProperties::setPaintDeviceFormat(class QPaintDevice *)
 	?isImageCached@QImagePixmapCleanupHooks@@SA_NABVQImage@@@Z @ 12591 NONAME ; bool QImagePixmapCleanupHooks::isImageCached(class QImage const &)
 	?setRenderableType@QEglProperties@@QAEXW4API@QEgl@@@Z @ 12592 NONAME ; void QEglProperties::setRenderableType(enum QEgl::API)
 	?setContext@QEglContext@@QAEXH@Z @ 12593 NONAME ; void QEglContext::setContext(int)
-	?waitClient@QEglContext@@QAEXXZ @ 12594 NONAME ; void QEglContext::waitClient(void)
+	?waitClient@QEglContext@@QAEXXZ @ 12594 NONAME ABSENT ; void QEglContext::waitClient(void)
 	?isEmpty@QEglProperties@@QBE_NXZ @ 12595 NONAME ; bool QEglProperties::isEmpty(void) const
-	?dpy@QEglContext@@0HA @ 12596 NONAME ; int QEglContext::dpy
+	?dpy@QEglContext@@0HA @ 12596 NONAME ABSENT ; int QEglContext::dpy
 	?isSharing@QEglContext@@QBE_NXZ @ 12597 NONAME ; bool QEglContext::isSharing(void) const
 	?isCurrent@QEglContext@@QBE_NXZ @ 12598 NONAME ; bool QEglContext::isCurrent(void) const
 	??0QEglProperties@@QAE@XZ @ 12599 NONAME ; QEglProperties::QEglProperties(void)
-	?extensions@QEglContext@@SA?AVQString@@XZ @ 12600 NONAME ; class QString QEglContext::extensions(void)
+	?extensions@QEglContext@@SA?AVQString@@XZ @ 12600 NONAME ABSENT ; class QString QEglContext::extensions(void)
 	?setCurrentContext@QEglContext@@CAXW4API@QEgl@@PAV1@@Z @ 12601 NONAME ; void QEglContext::setCurrentContext(enum QEgl::API, class QEglContext *)
 	??1QEglProperties@@QAE@XZ @ 12602 NONAME ; QEglProperties::~QEglProperties(void)
 	?createContext@QEglContext@@QAE_NPAV1@PBVQEglProperties@@@Z @ 12603 NONAME ; bool QEglContext::createContext(class QEglContext *, class QEglProperties const *)
 	?setConfig@QEglContext@@QAEXH@Z @ 12604 NONAME ; void QEglContext::setConfig(int)
-	?hasExtension@QEglContext@@SA_NPBD@Z @ 12605 NONAME ; bool QEglContext::hasExtension(char const *)
+	?hasExtension@QEglContext@@SA_NPBD@Z @ 12605 NONAME ABSENT ; bool QEglContext::hasExtension(char const *)
 	?doneCurrent@QEglContext@@QAE_NXZ @ 12606 NONAME ; bool QEglContext::doneCurrent(void)
 	?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12607 NONAME ; void QEglProperties::setPixelFormat(enum QImage::Format)
 	?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12608 NONAME ; class QEglContext * QEglContext::currentContext(enum QEgl::API)
 	?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N1@Z @ 12609 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool, bool)
-	?errorString@QEglContext@@SA?AVQString@@H@Z @ 12610 NONAME ; class QString QEglContext::errorString(int)
+	?errorString@QEglContext@@SA?AVQString@@H@Z @ 12610 NONAME ABSENT ; class QString QEglContext::errorString(int)
+	?positionInBlock@QTextCursor@@QBEHXZ @ 12611 NONAME ; int QTextCursor::positionInBlock(void) const
+	?height@QGraphicsItemPrivate@@UBEMXZ @ 12612 NONAME ; float QGraphicsItemPrivate::height(void) const
+	?clearUndoRedoStacks@QTextDocument@@QAEXW4Stacks@1@@Z @ 12613 NONAME ; void QTextDocument::clearUndoRedoStacks(enum QTextDocument::Stacks)
+	?mapToViewRect@QGraphicsViewPrivate@@QBE?AVQRect@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12614 NONAME ; class QRect QGraphicsViewPrivate::mapToViewRect(class QGraphicsItem const *, class QRectF const &) const
+	?findItems@QGraphicsViewPrivate@@QBE?AV?$QList@PAVQGraphicsItem@@@@ABVQRegion@@PA_NABVQTransform@@@Z @ 12615 NONAME ; class QList<class QGraphicsItem *> QGraphicsViewPrivate::findItems(class QRegion const &, bool *, class QTransform const &) const
+	?constScanLine@QImage@@QBEPBEH@Z @ 12616 NONAME ; unsigned char const * QImage::constScanLine(int) const
+	?text@QStaticText@@QBE?AVQString@@XZ @ 12617 NONAME ; class QString QStaticText::text(void) const
+	?updateLastCenterPoint@QGraphicsViewPrivate@@QAEXXZ @ 12618 NONAME ; void QGraphicsViewPrivate::updateLastCenterPoint(void)
+	?sideWidget@QWizard@@QBEPAVQWidget@@XZ @ 12619 NONAME ; class QWidget * QWizard::sideWidget(void) const
+	?verticalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12620 NONAME ; long long QGraphicsViewPrivate::verticalScroll(void) const
+	?fileInfoList@QZipReader@@QBE?AV?$QList@UFileInfo@QZipReader@@@@XZ @ 12621 NONAME ; class QList<struct QZipReader::FileInfo> QZipReader::fileInfoList(void) const
+	?setSideWidget@QWizard@@QAEXPAVQWidget@@@Z @ 12622 NONAME ; void QWizard::setSideWidget(class QWidget *)
+	?paste@QLineControl@@QAEXW4Mode@QClipboard@@@Z @ 12623 NONAME ; void QLineControl::paste(enum QClipboard::Mode)
+	?performanceHint@QStaticText@@QBE?AW4PerformanceHint@1@XZ @ 12624 NONAME ; enum QStaticText::PerformanceHint QStaticText::performanceHint(void) const
+	?frameStartIndex@QPaintBuffer@@QBEHH@Z @ 12625 NONAME ; int QPaintBuffer::frameStartIndex(int) const
+	??0QAbstractScrollAreaPrivate@@QAE@XZ @ 12626 NONAME ; QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate(void)
+	?_q_setViewportCursor@QGraphicsViewPrivate@@QAEXABVQCursor@@@Z @ 12627 NONAME ; void QGraphicsViewPrivate::_q_setViewportCursor(class QCursor const &)
+	?display@QEglContext@@QAEHXZ @ 12628 NONAME ; int QEglContext::display(void)
+	?setPartialUpdateSupport@QWindowSurface@@IAEX_N@Z @ 12629 NONAME ; void QWindowSurface::setPartialUpdateSupport(bool)
+	?transformChanged@QGraphicsItemPrivate@@UAEXXZ @ 12630 NONAME ; void QGraphicsItemPrivate::transformChanged(void)
+	?setUserData@QStaticTextItem@@QAEXPAVQStaticTextUserData@@@Z @ 12631 NONAME ; void QStaticTextItem::setUserData(class QStaticTextUserData *)
+	?isValid@FileInfo@QZipReader@@QBE_NXZ @ 12632 NONAME ; bool QZipReader::FileInfo::isValid(void) const
+	?hasSelectedText@QLabel@@QBE_NXZ @ 12633 NONAME ; bool QLabel::hasSelectedText(void) const
+	?size@QStaticText@@QBE?AVQSizeF@@XZ @ 12634 NONAME ; class QSizeF QStaticText::size(void) const
+	?processCommands@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@HH@Z @ 12635 NONAME ; void QPainterReplayer::processCommands(class QPaintBuffer const &, class QPainter *, int, int)
+	?defaultConfig@QEgl@@YAHHW4API@1@V?$QFlags@W4ConfigOption@QEgl@@@@@Z @ 12636 NONAME ; int QEgl::defaultConfig(int, enum QEgl::API, class QFlags<enum QEgl::ConfigOption>)
+	??0QZipReader@@QAE@PAVQIODevice@@@Z @ 12637 NONAME ; QZipReader::QZipReader(class QIODevice *)
+	?configAttrib@QEglContext@@QBEHH@Z @ 12638 NONAME ; int QEglContext::configAttrib(int) const
+	?setAutoFillBackground@QGraphicsWidget@@QAEX_N@Z @ 12639 NONAME ; void QGraphicsWidget::setAutoFillBackground(bool)
+	??4QStaticText@@QAEAAV0@ABV0@@Z @ 12640 NONAME ; class QStaticText & QStaticText::operator=(class QStaticText const &)
+	?updateRegion@QGraphicsViewPrivate@@QAE_NABVQRectF@@ABVQTransform@@@Z @ 12641 NONAME ; bool QGraphicsViewPrivate::updateRegion(class QRectF const &, class QTransform const &)
+	??9QStaticText@@QBE_NABV0@@Z @ 12642 NONAME ; bool QStaticText::operator!=(class QStaticText const &) const
+	??_EQGraphicsViewPrivate@@UAE@I@Z @ 12643 NONAME ; QGraphicsViewPrivate::~QGraphicsViewPrivate(unsigned int)
+	?status@QZipReader@@QBE?AW4Status@1@XZ @ 12644 NONAME ; enum QZipReader::Status QZipReader::status(void) const
+	?autoFillBackground@QGraphicsWidget@@QBE_NXZ @ 12645 NONAME ; bool QGraphicsWidget::autoFillBackground(void) const
+	?createTextureData@QImageTextureGlyphCache@@UAEXHH@Z @ 12646 NONAME ; void QImageTextureGlyphCache::createTextureData(int, int)
+	?image@QImageTextureGlyphCache@@QBEABVQImage@@XZ @ 12647 NONAME ; class QImage const & QImageTextureGlyphCache::image(void) const
+	?extensions@QEgl@@YA?AVQString@@XZ @ 12648 NONAME ; class QString QEgl::extensions(void)
+	?pageRemoved@QWizard@@IAEXH@Z @ 12649 NONAME ; void QWizard::pageRemoved(int)
+	?init@QAbstractScrollAreaPrivate@@QAEXXZ @ 12650 NONAME ; void QAbstractScrollAreaPrivate::init(void)
+	?mapRectToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABVQRect@@@Z @ 12651 NONAME ; class QRectF QGraphicsViewPrivate::mapRectToScene(class QRect const &) const
+	?width@QGraphicsItemPrivate@@UBEMXZ @ 12652 NONAME ; float QGraphicsItemPrivate::width(void) const
+	?toPolygon@QBezier@@QBE?AVQPolygonF@@M@Z @ 12653 NONAME ; class QPolygonF QBezier::toPolygon(float) const
+	?freeStyleOptionsArray@QGraphicsViewPrivate@@QAEXPAVQStyleOptionGraphicsItem@@@Z @ 12654 NONAME ; void QGraphicsViewPrivate::freeStyleOptionsArray(class QStyleOptionGraphicsItem *)
+	?visibilityChanged@QToolBar@@IAEX_N@Z @ 12655 NONAME ; void QToolBar::visibilityChanged(bool)
+	?updateInputMethodSensitivity@QGraphicsViewPrivate@@QAEXXZ @ 12656 NONAME ; void QGraphicsViewPrivate::updateInputMethodSensitivity(void)
+	?glyphMargin@QImageTextureGlyphCache@@UBEHXZ @ 12657 NONAME ; int QImageTextureGlyphCache::glyphMargin(void) const
+	?setTextFormat@QStaticText@@QAEXW4TextFormat@Qt@@@Z @ 12658 NONAME ; void QStaticText::setTextFormat(enum Qt::TextFormat)
+	?storeDragDropEvent@QGraphicsViewPrivate@@QAEXPBVQGraphicsSceneDragDropEvent@@@Z @ 12659 NONAME ; void QGraphicsViewPrivate::storeDragDropEvent(class QGraphicsSceneDragDropEvent const *)
+	?updateRect@QGraphicsViewPrivate@@QAE_NABVQRect@@@Z @ 12660 NONAME ; bool QGraphicsViewPrivate::updateRect(class QRect const &)
+	?fileData@QZipReader@@QBE?AVQByteArray@@ABVQString@@@Z @ 12661 NONAME ; class QByteArray QZipReader::fileData(class QString const &) const
+	?translateTouchEvent@QGraphicsViewPrivate@@SAXPAV1@PAVQTouchEvent@@@Z @ 12662 NONAME ; void QGraphicsViewPrivate::translateTouchEvent(class QGraphicsViewPrivate *, class QTouchEvent *)
+	?dispatchPendingUpdateRequests@QGraphicsViewPrivate@@QAEXXZ @ 12663 NONAME ; void QGraphicsViewPrivate::dispatchPendingUpdateRequests(void)
+	?updatePaintedViewBoundingRects@QGraphicsItemPrivate@@QAEX_N@Z @ 12664 NONAME ; void QGraphicsItemPrivate::updatePaintedViewBoundingRects(bool)
+	?setHeight@QGraphicsItemPrivate@@UAEXM@Z @ 12665 NONAME ; void QGraphicsItemPrivate::setHeight(float)
+	?isValidColor@QColor@@SA_NABVQString@@@Z @ 12666 NONAME ; bool QColor::isValidColor(class QString const &)
+	??0QStaticTextItem@@QAE@XZ @ 12667 NONAME ; QStaticTextItem::QStaticTextItem(void)
+	?updateMicroFocus@QGraphicsItem@@IAEXXZ @ 12668 NONAME ; void QGraphicsItem::updateMicroFocus(void)
+	??1QStaticText@@QAE@XZ @ 12669 NONAME ; QStaticText::~QStaticText(void)
+	?nativePixmap@QEgl@@YAPAXPAVQPixmap@@@Z @ 12670 NONAME ; void * QEgl::nativePixmap(class QPixmap *)
+	?render@QWidgetPrivate@@QAEXPAVQPaintDevice@@ABVQPoint@@ABVQRegion@@V?$QFlags@W4RenderFlag@QWidget@@@@_N@Z @ 12671 NONAME ; void QWidgetPrivate::render(class QPaintDevice *, class QPoint const &, class QRegion const &, class QFlags<enum QWidget::RenderFlag>, bool)
+	?constBits@QImage@@QBEPBEXZ @ 12672 NONAME ; unsigned char const * QImage::constBits(void) const
+	??8QStaticText@@QBE_NABV0@@Z @ 12673 NONAME ; bool QStaticText::operator==(class QStaticText const &) const
+	??0FileInfo@QZipReader@@QAE@XZ @ 12674 NONAME ; QZipReader::FileInfo::FileInfo(void)
+	?q_func@QGraphicsViewPrivate@@ABEPBVQGraphicsView@@XZ @ 12675 NONAME ; class QGraphicsView const * QGraphicsViewPrivate::q_func(void) const
+	?textFormat@QStaticText@@QBE?AW4TextFormat@Qt@@XZ @ 12676 NONAME ; enum Qt::TextFormat QStaticText::textFormat(void) const
+	?isReadable@QZipReader@@QBE_NXZ @ 12677 NONAME ; bool QZipReader::isReadable(void) const
+	?getPixmapCursor@QApplicationPrivate@@QAE?AVQPixmap@@W4CursorShape@Qt@@@Z @ 12678 NONAME ; class QPixmap QApplicationPrivate::getPixmapCursor(enum Qt::CursorShape)
+	?entryInfoAt@QZipReader@@QBE?AUFileInfo@1@H@Z @ 12679 NONAME ; struct QZipReader::FileInfo QZipReader::entryInfoAt(int) const
+	?children_append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12680 NONAME ; void QGraphicsItemPrivate::children_append(class QDeclarativeListProperty<class QGraphicsObject> *, class QGraphicsObject *)
+	?hasPartialUpdateSupport@QWindowSurface@@QBE_NXZ @ 12681 NONAME ; bool QWindowSurface::hasPartialUpdateSupport(void) const
+	?storeMouseEvent@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12682 NONAME ; void QGraphicsViewPrivate::storeMouseEvent(class QMouseEvent *)
+	?mapToScene@QGraphicsViewPrivate@@QBE?AVQPointF@@ABV2@@Z @ 12683 NONAME ; class QPointF QGraphicsViewPrivate::mapToScene(class QPointF const &) const
+	?display@QEgl@@YAHXZ @ 12684 NONAME ; int QEgl::display(void)
+	?drawStaticText@QPainter@@QAEXABVQPoint@@ABVQStaticText@@@Z @ 12685 NONAME ; void QPainter::drawStaticText(class QPoint const &, class QStaticText const &)
+	?fillTexture@QImageTextureGlyphCache@@UAEXABUCoord@QTextureGlyphCache@@I@Z @ 12686 NONAME ; void QImageTextureGlyphCache::fillTexture(struct QTextureGlyphCache::Coord const &, unsigned int)
+	?addToPolygon@QBezier@@QBEXPAVQPolygonF@@M@Z @ 12687 NONAME ; void QBezier::addToPolygon(class QPolygonF *, float) const
+	?eglCreateImageKHR@QEgl@@YAHHHHHPBH@Z @ 12688 NONAME ; int QEgl::eglCreateImageKHR(int, int, int, int, int const *)
+	?resetWidth@QGraphicsItemPrivate@@UAEXXZ @ 12689 NONAME ; void QGraphicsItemPrivate::resetWidth(void)
+	?detach@QStaticText@@AAEXXZ @ 12690 NONAME ; void QStaticText::detach(void)
+	?totalUsed@QPixmapCache@@SAHXZ @ 12691 NONAME ; int QPixmapCache::totalUsed(void)
+	??0QKeySequence@@QAE@ABVQString@@W4SequenceFormat@0@@Z @ 12692 NONAME ; QKeySequence::QKeySequence(class QString const &, enum QKeySequence::SequenceFormat)
+	?device@QZipReader@@QBEPAVQIODevice@@XZ @ 12693 NONAME ; class QIODevice * QZipReader::device(void) const
+	?hasExtension@QEgl@@YA_NPBD@Z @ 12694 NONAME ; bool QEgl::hasExtension(char const *)
+	?mapRectFromScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12695 NONAME ; class QRectF QGraphicsViewPrivate::mapRectFromScene(class QRectF const &) const
+	?commandDescription@QPaintBuffer@@QBE?AVQString@@H@Z @ 12696 NONAME ; class QString QPaintBuffer::commandDescription(int) const
+	?layoutChanged@QGraphicsWidget@@IAEXXZ @ 12697 NONAME ; void QGraphicsWidget::layoutChanged(void)
+	??0QGraphicsViewPrivate@@QAE@XZ @ 12698 NONAME ; QGraphicsViewPrivate::QGraphicsViewPrivate(void)
+	?anchorAt@QPlainTextEdit@@QBE?AVQString@@ABVQPoint@@@Z @ 12699 NONAME ; class QString QPlainTextEdit::anchorAt(class QPoint const &) const
+	?getSubRange@QBezier@@QBE?AV1@MM@Z @ 12700 NONAME ; class QBezier QBezier::getSubRange(float, float) const
+	?replaceScrollBar@QAbstractScrollAreaPrivate@@QAEXPAVQScrollBar@@W4Orientation@Qt@@@Z @ 12701 NONAME ; void QAbstractScrollAreaPrivate::replaceScrollBar(class QScrollBar *, enum Qt::Orientation)
+	?mapToViewRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12702 NONAME ; class QRegion QGraphicsViewPrivate::mapToViewRegion(class QGraphicsItem const *, class QRectF const &) const
+	?allPixmaps@QPixmapCache@@SA?AV?$QList@U?$QPair@VQString@@VQPixmap@@@@@@XZ @ 12703 NONAME ; class QList<struct QPair<class QString, class QPixmap> > QPixmapCache::allPixmaps(void)
+	??_EQAbstractScrollAreaPrivate@@UAE@I@Z @ 12704 NONAME ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(unsigned int)
+	?pageAdded@QWizard@@IAEXH@Z @ 12705 NONAME ; void QWizard::pageAdded(int)
+	?populate@QTextureGlyphCache@@QAEXPAVQFontEngine@@HPBIPBUQFixedPoint@@@Z @ 12706 NONAME ; void QTextureGlyphCache::populate(class QFontEngine *, int, unsigned int const *, struct QFixedPoint const *)
+	??1QStaticTextItem@@QAE@XZ @ 12707 NONAME ; QStaticTextItem::~QStaticTextItem(void)
+	?populateSceneDragDropEvent@QGraphicsViewPrivate@@QAEXPAVQGraphicsSceneDragDropEvent@@PAVQDropEvent@@@Z @ 12708 NONAME ; void QGraphicsViewPrivate::populateSceneDragDropEvent(class QGraphicsSceneDragDropEvent *, class QDropEvent *)
+	?updateAll@QGraphicsViewPrivate@@QAEXXZ @ 12709 NONAME ; void QGraphicsViewPrivate::updateAll(void)
+	?nativeWindow@QEgl@@YAPAXPAVQWidget@@@Z @ 12710 NONAME ; void * QEgl::nativeWindow(class QWidget *)
+	?children_count@QGraphicsItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@@Z @ 12711 NONAME ; int QGraphicsItemPrivate::children_count(class QDeclarativeListProperty<class QGraphicsObject> *)
+	?allocStyleOptionsArray@QGraphicsViewPrivate@@QAEPAVQStyleOptionGraphicsItem@@H@Z @ 12712 NONAME ; class QStyleOptionGraphicsItem * QGraphicsViewPrivate::allocStyleOptionsArray(int)
+	?resizeTextureData@QImageTextureGlyphCache@@UAEXHH@Z @ 12713 NONAME ; void QImageTextureGlyphCache::resizeTextureData(int, int)
+	?drawPixmapFragments@QPainter@@QAEXPBVPixmapFragment@1@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12714 NONAME ; void QPainter::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>)
+	?setColorFromString@QColor@@AAE_NABVQString@@@Z @ 12715 NONAME ; bool QColor::setColorFromString(class QString const &)
+	??1QAbstractScrollAreaPrivate@@UAE@XZ @ 12716 NONAME ; QAbstractScrollAreaPrivate::~QAbstractScrollAreaPrivate(void)
+	?setText@QStaticText@@QAEXABVQString@@@Z @ 12717 NONAME ; void QStaticText::setText(class QString const &)
+	?bitPlaneCount@QImage@@QBEHXZ @ 12718 NONAME ; int QImage::bitPlaneCount(void) const
+	?_q_unsetViewportCursor@QGraphicsViewPrivate@@QAEXXZ @ 12719 NONAME ; void QGraphicsViewPrivate::_q_unsetViewportCursor(void)
+	?setUpdateClip@QGraphicsViewPrivate@@QAEXPAVQGraphicsItem@@@Z @ 12720 NONAME ; void QGraphicsViewPrivate::setUpdateClip(class QGraphicsItem *)
+	?resetHeight@QGraphicsItemPrivate@@UAEXXZ @ 12721 NONAME ; void QGraphicsItemPrivate::resetHeight(void)
+	?runtimeData@QPixmapData@@UBEPAV1@XZ @ 12722 NONAME ; class QPixmapData * QPixmapData::runtimeData(void) const
+	?selectedText@QLabel@@QBE?AVQString@@XZ @ 12723 NONAME ; class QString QLabel::selectedText(void) const
+	?childrenList@QGraphicsItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQGraphicsObject@@@@XZ @ 12724 NONAME ; class QDeclarativeListProperty<class QGraphicsObject> QGraphicsItemPrivate::childrenList(void)
+	?childrenChanged@QGraphicsObject@@IAEXXZ @ 12725 NONAME ; void QGraphicsObject::childrenChanged(void)
+	?recalculateContentSize@QGraphicsViewPrivate@@QAEXXZ @ 12726 NONAME ; void QGraphicsViewPrivate::recalculateContentSize(void)
+	?heightChanged@QGraphicsObject@@IAEXXZ @ 12727 NONAME ; void QGraphicsObject::heightChanged(void)
+	?name@QIcon@@QBE?AVQString@@XZ @ 12728 NONAME ; class QString QIcon::name(void) const
+	?errorString@QEgl@@YA?AVQString@@H@Z @ 12729 NONAME ; class QString QEgl::errorString(int)
+	??4FileInfo@QZipReader@@QAEAAU01@ABU01@@Z @ 12730 NONAME ; struct QZipReader::FileInfo & QZipReader::FileInfo::operator=(struct QZipReader::FileInfo const &)
+	??1QGraphicsViewPrivate@@UAE@XZ @ 12731 NONAME ; QGraphicsViewPrivate::~QGraphicsViewPrivate(void)
+	?chooseConfig@QEgl@@YAHPBVQEglProperties@@W4PixelFormatMatch@1@@Z @ 12732 NONAME ; int QEgl::chooseConfig(class QEglProperties const *, enum QEgl::PixelFormatMatch)
+	?prependGraphicsTransform@QGraphicsItemPrivate@@QAEXPAVQGraphicsTransform@@@Z @ 12733 NONAME ; void QGraphicsItemPrivate::prependGraphicsTransform(class QGraphicsTransform *)
+	?eglDestroyImageKHR@QEgl@@YAHHH@Z @ 12734 NONAME ; int QEgl::eglDestroyImageKHR(int, int)
+	?qt_draw_glyphs@@YAXPAVQPainter@@PBIPBVQPointF@@H@Z @ 12735 NONAME ; void qt_draw_glyphs(class QPainter *, unsigned int const *, class QPointF const *, int)
+	?isEmpty@QItemSelectionRange@@QBE_NXZ @ 12736 NONAME ; bool QItemSelectionRange::isEmpty(void) const
+	?count@QZipReader@@QBEHXZ @ 12737 NONAME ; int QZipReader::count(void) const
+	?centerView@QGraphicsViewPrivate@@QAEXW4ViewportAnchor@QGraphicsView@@@Z @ 12738 NONAME ; void QGraphicsViewPrivate::centerView(enum QGraphicsView::ViewportAnchor)
+	?contentsOffset@QAbstractScrollAreaPrivate@@UBE?AVQPoint@@XZ @ 12739 NONAME ; class QPoint QAbstractScrollAreaPrivate::contentsOffset(void) const
+	?_q_vslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12740 NONAME ; void QAbstractScrollAreaPrivate::_q_vslide(int)
+	??1QZipReader@@QAE@XZ @ 12741 NONAME ; QZipReader::~QZipReader(void)
+	??_EQImageTextureGlyphCache@@UAE@I@Z @ 12742 NONAME ; QImageTextureGlyphCache::~QImageTextureGlyphCache(unsigned int)
+	?drawPixmapFragments@QPaintEngineEx@@UAEXPBVPixmapFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12743 NONAME ; void QPaintEngineEx::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>)
+	?nativeDisplay@QEgl@@YAHXZ @ 12744 NONAME ; int QEgl::nativeDisplay(void)
+	?layoutChildren@QAbstractScrollAreaPrivate@@QAEXXZ @ 12745 NONAME ; void QAbstractScrollAreaPrivate::layoutChildren(void)
+	?horizontalScroll@QGraphicsViewPrivate@@QBE_JXZ @ 12746 NONAME ; long long QGraphicsViewPrivate::horizontalScroll(void) const
+	?updateRectF@QGraphicsViewPrivate@@QAE_NABVQRectF@@@Z @ 12747 NONAME ; bool QGraphicsViewPrivate::updateRectF(class QRectF const &)
+	?setPlaceholderText@QLineEdit@@QAEXABVQString@@@Z @ 12748 NONAME ; void QLineEdit::setPlaceholderText(class QString const &)
+	?resizeEvent@QSplitterHandle@@MAEXPAVQResizeEvent@@@Z @ 12749 NONAME ; void QSplitterHandle::resizeEvent(class QResizeEvent *)
+	?drawStaticText@QPainter@@QAEXHHABVQStaticText@@@Z @ 12750 NONAME ; void QPainter::drawStaticText(int, int, class QStaticText const &)
+	?setSelection@QLabel@@QAEXHH@Z @ 12751 NONAME ; void QLabel::setSelection(int, int)
+	?q_func@QAbstractScrollAreaPrivate@@AAEPAVQAbstractScrollArea@@XZ @ 12752 NONAME ; class QAbstractScrollArea * QAbstractScrollAreaPrivate::q_func(void)
+	?updateMicroFocus@QGraphicsObject@@IAEXXZ @ 12753 NONAME ; void QGraphicsObject::updateMicroFocus(void)
+	?drawStaticText@QPainter@@QAEXABVQPointF@@ABVQStaticText@@@Z @ 12754 NONAME ; void QPainter::drawStaticText(class QPointF const &, class QStaticText const &)
+	?processPendingUpdates@QGraphicsViewPrivate@@QAEXXZ @ 12755 NONAME ; void QGraphicsViewPrivate::processPendingUpdates(void)
+	?rubberBandRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQWidget@@ABVQRect@@@Z @ 12756 NONAME ; class QRegion QGraphicsViewPrivate::rubberBandRegion(class QWidget const *, class QRect const &) const
+	?children_at@QGraphicsItemPrivate@@SAPAVQGraphicsObject@@PAV?$QDeclarativeListProperty@VQGraphicsObject@@@@H@Z @ 12757 NONAME ; class QGraphicsObject * QGraphicsItemPrivate::children_at(class QDeclarativeListProperty<class QGraphicsObject> *, int)
+	?widthChanged@QGraphicsObject@@IAEXXZ @ 12758 NONAME ; void QGraphicsObject::widthChanged(void)
+	?_q_showOrHideScrollBars@QAbstractScrollAreaPrivate@@QAEXXZ @ 12759 NONAME ; void QAbstractScrollAreaPrivate::_q_showOrHideScrollBars(void)
+	?mouseMoveEventHandler@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12760 NONAME ; void QGraphicsViewPrivate::mouseMoveEventHandler(class QMouseEvent *)
+	?replayLastMouseEvent@QGraphicsViewPrivate@@QAEXXZ @ 12761 NONAME ; void QGraphicsViewPrivate::replayLastMouseEvent(void)
+	??0QStaticText@@QAE@ABVQString@@@Z @ 12762 NONAME ; QStaticText::QStaticText(class QString const &)
+	?close@QZipReader@@QAEXXZ @ 12763 NONAME ; void QZipReader::close(void)
+	?geometryChanged@QGraphicsWidget@@IAEXXZ @ 12764 NONAME ; void QGraphicsWidget::geometryChanged(void)
+	?setCurveThreshold@QStrokerOps@@QAEXM@Z @ 12765 NONAME ; void QStrokerOps::setCurveThreshold(float)
+	?_q_hslide@QAbstractScrollAreaPrivate@@QAEXH@Z @ 12766 NONAME ; void QAbstractScrollAreaPrivate::_q_hslide(int)
+	?selectionStart@QLabel@@QBEHXZ @ 12767 NONAME ; int QLabel::selectionStart(void) const
+	??0QStaticText@@QAE@XZ @ 12768 NONAME ; QStaticText::QStaticText(void)
+	?curveThreshold@QStrokerOps@@QBEMXZ @ 12769 NONAME ; float QStrokerOps::curveThreshold(void) const
+	?iconName@QIconEngineV2@@QAE?AVQString@@XZ @ 12770 NONAME ; class QString QIconEngineV2::iconName(void)
+	?mapBy@QBezier@@QBE?AV1@ABVQTransform@@@Z @ 12771 NONAME ; class QBezier QBezier::mapBy(class QTransform const &) const
+	??0QZipReader@@QAE@ABVQString@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 12772 NONAME ; QZipReader::QZipReader(class QString const &, class QFlags<enum QIODevice::OpenModeFlag>)
+	?flushDetachedPixmaps@QPixmapCache@@SAXXZ @ 12773 NONAME ; void QPixmapCache::flushDetachedPixmaps(void)
+	?exists@QZipReader@@QBE_NXZ @ 12774 NONAME ; bool QZipReader::exists(void) const
+	?prepare@QStaticText@@QAEXABVQTransform@@ABVQFont@@@Z @ 12775 NONAME ; void QStaticText::prepare(class QTransform const &, class QFont const &)
+	?paste@QTextControl@@QAEXW4Mode@QClipboard@@@Z @ 12776 NONAME ; void QTextControl::paste(enum QClipboard::Mode)
+	?horizontalAdvance@QTextLine@@QBEMXZ @ 12777 NONAME ; float QTextLine::horizontalAdvance(void) const
+	?setCurveThresholdFromTransform@QStrokerOps@@QAEXABVQTransform@@@Z @ 12778 NONAME ; void QStrokerOps::setCurveThresholdFromTransform(class QTransform const &)
+	?textWidth@QStaticText@@QBEMXZ @ 12779 NONAME ; float QStaticText::textWidth(void) const
+	?create@PixmapFragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12780 NONAME ; class QPainter::PixmapFragment QPainter::PixmapFragment::create(class QPointF const &, class QRectF const &, float, float, float, float)
+	?extractAll@QZipReader@@QBE_NABVQString@@@Z @ 12781 NONAME ; bool QZipReader::extractAll(class QString const &) const
+	??0FileInfo@QZipReader@@QAE@ABU01@@Z @ 12782 NONAME ; QZipReader::FileInfo::FileInfo(struct QZipReader::FileInfo const &)
+	?setTextWidth@QStaticText@@QAEXM@Z @ 12783 NONAME ; void QStaticText::setTextWidth(float)
+	?fixup@QIntValidator@@UBEXAAVQString@@@Z @ 12784 NONAME ; void QIntValidator::fixup(class QString &) const
+	?dumpAllConfigs@QEgl@@YAXXZ @ 12785 NONAME ; void QEgl::dumpAllConfigs(void)
+	?assign@QKeySequence@@AAEHABVQString@@W4SequenceFormat@1@@Z @ 12786 NONAME ; int QKeySequence::assign(class QString const &, enum QKeySequence::SequenceFormat)
+	?q_func@QAbstractScrollAreaPrivate@@ABEPBVQAbstractScrollArea@@XZ @ 12787 NONAME ; class QAbstractScrollArea const * QAbstractScrollAreaPrivate::q_func(void) const
+	?mapToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12788 NONAME ; class QRectF QGraphicsViewPrivate::mapToScene(class QRectF const &) const
+	?updateScroll@QGraphicsViewPrivate@@QAEXXZ @ 12789 NONAME ; void QGraphicsViewPrivate::updateScroll(void)
+	?directoryLoaded@QFileSystemModel@@IAEXABVQString@@@Z @ 12790 NONAME ; void QFileSystemModel::directoryLoaded(class QString const &)
+	?placeholderText@QLineEdit@@QBE?AVQString@@XZ @ 12791 NONAME ; class QString QLineEdit::placeholderText(void) const
+	?setWidth@QGraphicsItemPrivate@@UAEXM@Z @ 12792 NONAME ; void QGraphicsItemPrivate::setWidth(float)
+	?q_func@QGraphicsViewPrivate@@AAEPAVQGraphicsView@@XZ @ 12793 NONAME ; class QGraphicsView * QGraphicsViewPrivate::q_func(void)
+	?setDeviceType@QEglProperties@@QAEXH@Z @ 12794 NONAME ; void QEglProperties::setDeviceType(int)
+	?convertFromImage@QPixmap@@QAE_NABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12795 NONAME ; bool QPixmap::convertFromImage(class QImage const &, class QFlags<enum Qt::ImageConversionFlag>)
+	?processCommands@QPaintBuffer@@QBEHPAVQPainter@@HH@Z @ 12796 NONAME ; int QPaintBuffer::processCommands(class QPainter *, int, int) const
+	?glyphPadding@QTextureGlyphCache@@UBEHXZ @ 12797 NONAME ; int QTextureGlyphCache::glyphPadding(void) const
+	??1FileInfo@QZipReader@@QAE@XZ @ 12798 NONAME ; QZipReader::FileInfo::~FileInfo(void)
+	?scrollBarPolicyChanged@QAbstractScrollAreaPrivate@@UAEXW4Orientation@Qt@@W4ScrollBarPolicy@3@@Z @ 12799 NONAME ; void QAbstractScrollAreaPrivate::scrollBarPolicyChanged(enum Qt::Orientation, enum Qt::ScrollBarPolicy)
+	?createSurface@QEgl@@YAHPAVQPaintDevice@@HPBVQEglProperties@@@Z @ 12800 NONAME ; int QEgl::createSurface(class QPaintDevice *, int, class QEglProperties const *)
+	?viewportEvent@QAbstractScrollAreaPrivate@@QAE_NPAVQEvent@@@Z @ 12801 NONAME ; bool QAbstractScrollAreaPrivate::viewportEvent(class QEvent *)
+	?frameEndIndex@QPaintBuffer@@QBEHH@Z @ 12802 NONAME ; int QPaintBuffer::frameEndIndex(int) const
+	??1QImageTextureGlyphCache@@UAE@XZ @ 12803 NONAME ; QImageTextureGlyphCache::~QImageTextureGlyphCache(void)
+	?setPerformanceHint@QStaticText@@QAEXW4PerformanceHint@1@@Z @ 12804 NONAME ; void QStaticText::setPerformanceHint(enum QStaticText::PerformanceHint)
+	??0QStaticText@@QAE@ABV0@@Z @ 12805 NONAME ; QStaticText::QStaticText(class QStaticText const &)
+	??0QImageTextureGlyphCache@@QAE@W4Type@QFontEngineGlyphCache@@ABVQTransform@@@Z @ 12806 NONAME ; QImageTextureGlyphCache::QImageTextureGlyphCache(enum QFontEngineGlyphCache::Type, class QTransform const &)
 
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index 5dc282c..0590d39 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -622,9 +622,9 @@ EXPORTS
 	_ZN14QObjectPrivate14deleteChildrenEv @ 621 NONAME
 	_ZN14QObjectPrivate14setDeleteWatchEPS_Pi @ 622 NONAME
 	_ZN14QObjectPrivate16resetDeleteWatchEPS_Pii @ 623 NONAME
-	_ZN14QObjectPrivate16setCurrentSenderEP7QObjectPNS_6SenderE @ 624 NONAME
+	_ZN14QObjectPrivate16setCurrentSenderEP7QObjectPNS_6SenderE @ 624 NONAME ABSENT
 	_ZN14QObjectPrivate16setParent_helperEP7QObject @ 625 NONAME
-	_ZN14QObjectPrivate18resetCurrentSenderEP7QObjectPNS_6SenderES3_ @ 626 NONAME
+	_ZN14QObjectPrivate18resetCurrentSenderEP7QObjectPNS_6SenderES3_ @ 626 NONAME ABSENT
 	_ZN14QObjectPrivate19_q_reregisterTimersEPv @ 627 NONAME
 	_ZN14QObjectPrivate19moveToThread_helperEv @ 628 NONAME
 	_ZN14QObjectPrivate20cleanConnectionListsEv @ 629 NONAME
@@ -803,9 +803,9 @@ EXPORTS
 	_ZN16QCoreApplicationD0Ev @ 802 NONAME
 	_ZN16QCoreApplicationD1Ev @ 803 NONAME
 	_ZN16QCoreApplicationD2Ev @ 804 NONAME
-	_ZN16QDeclarativeDataD0Ev @ 805 NONAME
-	_ZN16QDeclarativeDataD1Ev @ 806 NONAME
-	_ZN16QDeclarativeDataD2Ev @ 807 NONAME
+	_ZN16QDeclarativeDataD0Ev @ 805 NONAME ABSENT
+	_ZN16QDeclarativeDataD1Ev @ 806 NONAME ABSENT
+	_ZN16QDeclarativeDataD2Ev @ 807 NONAME ABSENT
 	_ZN16QEventTransition11qt_metacallEN11QMetaObject4CallEiPPv @ 808 NONAME
 	_ZN16QEventTransition11qt_metacastEPKc @ 809 NONAME
 	_ZN16QEventTransition12onTransitionEP6QEvent @ 810 NONAME
@@ -3332,7 +3332,7 @@ EXPORTS
 	_ZTI15QPauseAnimation @ 3331 NONAME
 	_ZTI15QSocketNotifier @ 3332 NONAME
 	_ZTI16QCoreApplication @ 3333 NONAME
-	_ZTI16QDeclarativeData @ 3334 NONAME
+	_ZTI16QDeclarativeData @ 3334 NONAME ABSENT
 	_ZTI16QEventTransition @ 3335 NONAME
 	_ZTI16QIODevicePrivate @ 3336 NONAME
 	_ZTI16QTextCodecPlugin @ 3337 NONAME
@@ -3407,7 +3407,7 @@ EXPORTS
 	_ZTV15QPauseAnimation @ 3406 NONAME
 	_ZTV15QSocketNotifier @ 3407 NONAME
 	_ZTV16QCoreApplication @ 3408 NONAME
-	_ZTV16QDeclarativeData @ 3409 NONAME
+	_ZTV16QDeclarativeData @ 3409 NONAME ABSENT
 	_ZTV16QEventTransition @ 3410 NONAME
 	_ZTV16QIODevicePrivate @ 3411 NONAME
 	_ZTV16QTextCodecPlugin @ 3412 NONAME
@@ -3654,4 +3654,55 @@ EXPORTS
 	_Z40QBasicAtomicPointer_fetchAndStoreReleasePVPvS_ @ 3653 NONAME
 	_ZN10QTextCodec11validCodecsEv @ 3654 NONAME
 	_ZN20QStateMachinePrivate12clearHistoryEv @ 3655 NONAME
+	_Z14qDecodeDataUrlRK4QUrl @ 3656 NONAME
+	_Z18qDetectCPUFeaturesv @ 3657 NONAME
+	_ZN10QByteArray10setRawDataEPKcj @ 3658 NONAME
+	_ZN10QByteArray7replaceEiiPKci @ 3659 NONAME
+	_ZN12QTextDecoderC1EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3660 NONAME
+	_ZN12QTextDecoderC2EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3661 NONAME
+	_ZN12QTextEncoderC1EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3662 NONAME
+	_ZN12QTextEncoderC2EPK10QTextCodec6QFlagsINS0_14ConversionFlagEE @ 3663 NONAME
+	_ZN13QElapsedTimer10invalidateEv @ 3664 NONAME
+	_ZN13QElapsedTimer11isMonotonicEv @ 3665 NONAME
+	_ZN13QElapsedTimer5startEv @ 3666 NONAME
+	_ZN13QElapsedTimer7restartEv @ 3667 NONAME
+	_ZN13QElapsedTimer9clockTypeEv @ 3668 NONAME
+	_ZN23QCoreApplicationPrivate11symbianInitEv @ 3669 NONAME
+	_ZN23QEventDispatcherSymbian11qt_metacallEN11QMetaObject4CallEiPPv @ 3670 NONAME
+	_ZN23QEventDispatcherSymbian11qt_metacastEPKc @ 3671 NONAME
+	_ZN23QEventDispatcherSymbian12selectThreadEv @ 3672 NONAME
+	_ZN23QEventDispatcherSymbian16staticMetaObjectE @ 3673 NONAME DATA 16
+	_ZN23QEventDispatcherSymbian19getStaticMetaObjectEv @ 3674 NONAME
+	_ZN24QAbstractDeclarativeData13parentChangedE @ 3675 NONAME DATA 4
+	_ZN24QAbstractDeclarativeData9destroyedE @ 3676 NONAME DATA 4
+	_ZN7QString10setRawDataEPK5QChari @ 3677 NONAME
+	_ZN7QStringC1EPK5QChar @ 3678 NONAME
+	_ZN7QStringC2EPK5QChar @ 3679 NONAME
+	_ZN8QVariantC1ERK12QEasingCurve @ 3680 NONAME
+	_ZN8QVariantC2ERK12QEasingCurve @ 3681 NONAME
+	_ZN9QDateTime18currentDateTimeUtcEv @ 3682 NONAME
+	_ZN9QDateTime18setMSecsSinceEpochEx @ 3683 NONAME
+	_ZN9QDateTime19fromMSecsSinceEpochEx @ 3684 NONAME
+	_ZN9QDateTime22currentMSecsSinceEpochEv @ 3685 NONAME
+	_ZN9QListData11detach_growEPii @ 3686 NONAME
+	_ZN9QListData6appendEi @ 3687 NONAME
+	_ZN9QListData6detachEi @ 3688 NONAME
+	_ZN9QMetaType15registerTypedefEPKci @ 3689 NONAME
+	_ZN9QMetaType23registerStreamOperatorsEiPFvR11QDataStreamPKvEPFvS1_PvE @ 3690 NONAME
+	_ZNK10QTextCodec11makeDecoderE6QFlagsINS_14ConversionFlagEE @ 3691 NONAME
+	_ZNK10QTextCodec11makeEncoderE6QFlagsINS_14ConversionFlagEE @ 3692 NONAME
+	_ZNK13QElapsedTimer10hasExpiredEx @ 3693 NONAME
+	_ZNK13QElapsedTimer19msecsSinceReferenceEv @ 3694 NONAME
+	_ZNK13QElapsedTimer6secsToERKS_ @ 3695 NONAME
+	_ZNK13QElapsedTimer7elapsedEv @ 3696 NONAME
+	_ZNK13QElapsedTimer7isValidEv @ 3697 NONAME
+	_ZNK13QElapsedTimer7msecsToERKS_ @ 3698 NONAME
+	_ZNK23QEventDispatcherSymbian10metaObjectEv @ 3699 NONAME
+	_ZNK6QState11transitionsEv @ 3700 NONAME
+	_ZNK8QVariant13toEasingCurveEv @ 3701 NONAME
+	_ZNK9QDateTime17toMSecsSinceEpochEv @ 3702 NONAME
+	_ZNK9QDateTime7msecsToERKS_ @ 3703 NONAME
+	_ZlsR11QDataStreamRK12QEasingCurve @ 3704 NONAME
+	_ZltRK13QElapsedTimerS1_ @ 3705 NONAME
+	_ZrsR11QDataStreamR12QEasingCurve @ 3706 NONAME
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index a26e193..320a780 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -1019,7 +1019,7 @@ EXPORTS
 	_ZN21QDeclarativeFlickable11setContentYEf @ 1018 NONAME
 	_ZN21QDeclarativeFlickable11visibleAreaEv @ 1019 NONAME
 	_ZN21QDeclarativeFlickable12flickStartedEv @ 1020 NONAME
-	_ZN21QDeclarativeFlickable12setOverShootEb @ 1021 NONAME
+	_ZN21QDeclarativeFlickable12setOverShootEb @ 1021 NONAME ABSENT
 	_ZN21QDeclarativeFlickable13flickableDataEv @ 1022 NONAME
 	_ZN21QDeclarativeFlickable13movementEndedEv @ 1023 NONAME
 	_ZN21QDeclarativeFlickable13movingChangedEv @ 1024 NONAME
@@ -1037,7 +1037,7 @@ EXPORTS
 	_ZN21QDeclarativeFlickable15movementStartedEv @ 1036 NONAME
 	_ZN21QDeclarativeFlickable15setContentWidthEf @ 1037 NONAME
 	_ZN21QDeclarativeFlickable16movementStartingEv @ 1038 NONAME
-	_ZN21QDeclarativeFlickable16overShootChangedEv @ 1039 NONAME
+	_ZN21QDeclarativeFlickable16overShootChangedEv @ 1039 NONAME ABSENT
 	_ZN21QDeclarativeFlickable16sceneEventFilterEP13QGraphicsItemP6QEvent @ 1040 NONAME
 	_ZN21QDeclarativeFlickable16setContentHeightEf @ 1041 NONAME
 	_ZN21QDeclarativeFlickable16staticMetaObjectE @ 1042 NONAME DATA 16
@@ -1294,15 +1294,15 @@ EXPORTS
 	_ZN22QDeclarativeExpression19getStaticMetaObjectEv @ 1293 NONAME
 	_ZN22QDeclarativeExpression23setNotifyOnValueChangedEb @ 1294 NONAME
 	_ZN22QDeclarativeExpression5valueEPb @ 1295 NONAME ABSENT
-	_ZN22QDeclarativeExpressionC1EP19QDeclarativeContextRK7QStringP7QObject @ 1296 NONAME
+	_ZN22QDeclarativeExpressionC1EP19QDeclarativeContextRK7QStringP7QObject @ 1296 NONAME ABSENT
 	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataPvP20QDeclarativeRefCountP7QObjectRK7QStringiR29QDeclarativeExpressionPrivate @ 1297 NONAME
-	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataRK7QStringP7QObject @ 1298 NONAME
-	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataRK7QStringP7QObjectR29QDeclarativeExpressionPrivate @ 1299 NONAME
+	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataRK7QStringP7QObject @ 1298 NONAME ABSENT
+	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataRK7QStringP7QObjectR29QDeclarativeExpressionPrivate @ 1299 NONAME ABSENT
 	_ZN22QDeclarativeExpressionC1Ev @ 1300 NONAME
-	_ZN22QDeclarativeExpressionC2EP19QDeclarativeContextRK7QStringP7QObject @ 1301 NONAME
+	_ZN22QDeclarativeExpressionC2EP19QDeclarativeContextRK7QStringP7QObject @ 1301 NONAME ABSENT
 	_ZN22QDeclarativeExpressionC2EP23QDeclarativeContextDataPvP20QDeclarativeRefCountP7QObjectRK7QStringiR29QDeclarativeExpressionPrivate @ 1302 NONAME
-	_ZN22QDeclarativeExpressionC2EP23QDeclarativeContextDataRK7QStringP7QObject @ 1303 NONAME
-	_ZN22QDeclarativeExpressionC2EP23QDeclarativeContextDataRK7QStringP7QObjectR29QDeclarativeExpressionPrivate @ 1304 NONAME
+	_ZN22QDeclarativeExpressionC2EP23QDeclarativeContextDataRK7QStringP7QObject @ 1303 NONAME ABSENT
+	_ZN22QDeclarativeExpressionC2EP23QDeclarativeContextDataRK7QStringP7QObjectR29QDeclarativeExpressionPrivate @ 1304 NONAME ABSENT
 	_ZN22QDeclarativeExpressionC2Ev @ 1305 NONAME
 	_ZN22QDeclarativeExpressionD0Ev @ 1306 NONAME
 	_ZN22QDeclarativeExpressionD1Ev @ 1307 NONAME
@@ -1457,7 +1457,7 @@ EXPORTS
 	_ZN23QDeclarativeEngineDebugC1EP27QDeclarativeDebugConnectionP7QObject @ 1456 NONAME
 	_ZN23QDeclarativeEngineDebugC2EP27QDeclarativeDebugConnectionP7QObject @ 1457 NONAME
 	_ZN23QDeclarativeItemPrivate10resetWidthEv @ 1458 NONAME
-	_ZN23QDeclarativeItemPrivate11currentTimeEv @ 1459 NONAME
+	_ZN23QDeclarativeItemPrivate11currentTimeEv @ 1459 NONAME ABSENT
 	_ZN23QDeclarativeItemPrivate11data_appendEP24QDeclarativeListPropertyI7QObjectEPS1_ @ 1460 NONAME
 	_ZN23QDeclarativeItemPrivate11resetHeightEv @ 1461 NONAME
 	_ZN23QDeclarativeItemPrivate12focusChangedEb @ 1462 NONAME
@@ -1470,12 +1470,12 @@ EXPORTS
 	_ZN23QDeclarativeItemPrivate15transform_countEP24QDeclarativeListPropertyI18QGraphicsTransformE @ 1469 NONAME
 	_ZN23QDeclarativeItemPrivate16resources_appendEP24QDeclarativeListPropertyI7QObjectEPS1_ @ 1470 NONAME
 	_ZN23QDeclarativeItemPrivate16transform_appendEP24QDeclarativeListPropertyI18QGraphicsTransformEPS1_ @ 1471 NONAME
-	_ZN23QDeclarativeItemPrivate17setConsistentTimeEi @ 1472 NONAME
+	_ZN23QDeclarativeItemPrivate17setConsistentTimeEi @ 1472 NONAME ABSENT
 	_ZN23QDeclarativeItemPrivate24removeItemChangeListenerEP30QDeclarativeItemChangeListener6QFlagsINS_10ChangeTypeEE @ 1473 NONAME
-	_ZN23QDeclarativeItemPrivate5startER5QTime @ 1474 NONAME
+	_ZN23QDeclarativeItemPrivate5startER5QTime @ 1474 NONAME ABSENT
 	_ZN23QDeclarativeItemPrivate6statesEv @ 1475 NONAME
-	_ZN23QDeclarativeItemPrivate7elapsedER5QTime @ 1476 NONAME
-	_ZN23QDeclarativeItemPrivate7restartER5QTime @ 1477 NONAME
+	_ZN23QDeclarativeItemPrivate7elapsedER5QTime @ 1476 NONAME ABSENT
+	_ZN23QDeclarativeItemPrivate7restartER5QTime @ 1477 NONAME ABSENT
 	_ZN23QDeclarativeItemPrivate8setWidthEf @ 1478 NONAME
 	_ZN23QDeclarativeItemPrivate9setHeightEf @ 1479 NONAME
 	_ZN23QDeclarativePaintedItem10clearCacheEv @ 1480 NONAME
@@ -1600,23 +1600,23 @@ EXPORTS
 	_ZN24QDeclarativeListAccessorD2Ev @ 1599 NONAME
 	_ZN24QDeclarativeParentChange11qt_metacallEN11QMetaObject4CallEiPPv @ 1600 NONAME
 	_ZN24QDeclarativeParentChange11qt_metacastEPKc @ 1601 NONAME
-	_ZN24QDeclarativeParentChange11setRotationEf @ 1602 NONAME
+	_ZN24QDeclarativeParentChange11setRotationEf @ 1602 NONAME ABSENT
 	_ZN24QDeclarativeParentChange12isReversableEv @ 1603 NONAME
 	_ZN24QDeclarativeParentChange13copyOriginalsEP23QDeclarativeActionEvent @ 1604 NONAME ABSENT
 	_ZN24QDeclarativeParentChange13saveOriginalsEv @ 1605 NONAME
 	_ZN24QDeclarativeParentChange16staticMetaObjectE @ 1606 NONAME DATA 16
 	_ZN24QDeclarativeParentChange17saveCurrentValuesEv @ 1607 NONAME
 	_ZN24QDeclarativeParentChange19getStaticMetaObjectEv @ 1608 NONAME
-	_ZN24QDeclarativeParentChange4setXEf @ 1609 NONAME
-	_ZN24QDeclarativeParentChange4setYEf @ 1610 NONAME
+	_ZN24QDeclarativeParentChange4setXEf @ 1609 NONAME ABSENT
+	_ZN24QDeclarativeParentChange4setYEf @ 1610 NONAME ABSENT
 	_ZN24QDeclarativeParentChange6rewindEv @ 1611 NONAME
 	_ZN24QDeclarativeParentChange7actionsEv @ 1612 NONAME
 	_ZN24QDeclarativeParentChange7executeEv @ 1613 NONAME ABSENT
 	_ZN24QDeclarativeParentChange7reverseEv @ 1614 NONAME ABSENT
 	_ZN24QDeclarativeParentChange8overrideEP23QDeclarativeActionEvent @ 1615 NONAME
-	_ZN24QDeclarativeParentChange8setScaleEf @ 1616 NONAME
-	_ZN24QDeclarativeParentChange8setWidthEf @ 1617 NONAME
-	_ZN24QDeclarativeParentChange9setHeightEf @ 1618 NONAME
+	_ZN24QDeclarativeParentChange8setScaleEf @ 1616 NONAME ABSENT
+	_ZN24QDeclarativeParentChange8setWidthEf @ 1617 NONAME ABSENT
+	_ZN24QDeclarativeParentChange9setHeightEf @ 1618 NONAME ABSENT
 	_ZN24QDeclarativeParentChange9setObjectEP16QDeclarativeItem @ 1619 NONAME
 	_ZN24QDeclarativeParentChange9setParentEP16QDeclarativeItem @ 1620 NONAME
 	_ZN24QDeclarativeParentChangeC1EP7QObject @ 1621 NONAME
@@ -2496,7 +2496,7 @@ EXPORTS
 	_ZNK20QDeclarativeRepeater5countEv @ 2495 NONAME
 	_ZNK20QDeclarativeRepeater5modelEv @ 2496 NONAME
 	_ZNK20QDeclarativeRepeater8delegateEv @ 2497 NONAME
-	_ZNK20QDeclarativeTextEdit10cursorRectEv @ 2498 NONAME
+	_ZNK20QDeclarativeTextEdit10cursorRectEv @ 2498 NONAME ABSENT
 	_ZNK20QDeclarativeTextEdit10isReadOnlyEv @ 2499 NONAME
 	_ZNK20QDeclarativeTextEdit10metaObjectEv @ 2500 NONAME
 	_ZNK20QDeclarativeTextEdit10textFormatEv @ 2501 NONAME
@@ -2536,7 +2536,7 @@ EXPORTS
 	_ZNK20QMetaPropertyBuilder8isStoredEv @ 2535 NONAME
 	_ZNK20QMetaPropertyBuilder9isDynamicEv @ 2536 NONAME
 	_ZNK21QDeclarativeComponent10metaObjectEv @ 2537 NONAME
-	_ZNK21QDeclarativeComponent12errorsStringEv @ 2538 NONAME
+	_ZNK21QDeclarativeComponent12errorsStringEv @ 2538 NONAME ABSENT
 	_ZNK21QDeclarativeComponent15creationContextEv @ 2539 NONAME
 	_ZNK21QDeclarativeComponent3urlEv @ 2540 NONAME
 	_ZNK21QDeclarativeComponent6errorsEv @ 2541 NONAME
@@ -2593,7 +2593,7 @@ EXPORTS
 	_ZNK21QDeclarativeFlickable8isAtXEndEv @ 2592 NONAME
 	_ZNK21QDeclarativeFlickable8isAtYEndEv @ 2593 NONAME
 	_ZNK21QDeclarativeFlickable8isMovingEv @ 2594 NONAME
-	_ZNK21QDeclarativeFlickable9overShootEv @ 2595 NONAME
+	_ZNK21QDeclarativeFlickable9overShootEv @ 2595 NONAME ABSENT
 	_ZNK21QDeclarativeImageBase10metaObjectEv @ 2596 NONAME
 	_ZNK21QDeclarativeImageBase10sourceSizeEv @ 2597 NONAME
 	_ZNK21QDeclarativeImageBase12asynchronousEv @ 2598 NONAME
@@ -3602,4 +3602,59 @@ EXPORTS
 	_ZNK21QDeclarativeFlickable20isMovingHorizontallyEv @ 3601 NONAME
 	_ZNK21QDeclarativeFlickable22isFlickingHorizontallyEv @ 3602 NONAME
 	_ZThn16_N18QDeclarativeLoader17componentCompleteEv @ 3603 NONAME
+	_ZN16QDeclarativeText18paintedSizeChangedEv @ 3604 NONAME
+	_ZN20QDeclarativePathView5eventEP6QEvent @ 3605 NONAME
+	_ZN20QDeclarativeTextEdit12focusInEventEP11QFocusEvent @ 3606 NONAME
+	_ZN20QDeclarativeTextEdit13focusOutEventEP11QFocusEvent @ 3607 NONAME
+	_ZN20QDeclarativeTextEdit16setSelectByMouseEb @ 3608 NONAME
+	_ZN20QDeclarativeTextEdit18paintedSizeChangedEv @ 3609 NONAME
+	_ZN20QDeclarativeTextEdit20selectByMouseChangedEb @ 3610 NONAME
+	_ZN20QDeclarativeTextEdit22cursorRectangleChangedEv @ 3611 NONAME
+	_ZN20QDeclarativeTextEdit22openSoftwareInputPanelEv @ 3612 NONAME
+	_ZN20QDeclarativeTextEdit23closeSoftwareInputPanelEv @ 3613 NONAME
+	_ZN20QDeclarativeTextEdit24setShowInputPanelOnFocusEb @ 3614 NONAME
+	_ZN20QDeclarativeTextEdit28showInputPanelOnFocusChangedEb @ 3615 NONAME
+	_ZN21QDeclarativeTextInput12focusInEventEP11QFocusEvent @ 3616 NONAME
+	_ZN21QDeclarativeTextInput13focusOutEventEP11QFocusEvent @ 3617 NONAME
+	_ZN21QDeclarativeTextInput16setSelectByMouseEb @ 3618 NONAME
+	_ZN21QDeclarativeTextInput20selectByMouseChangedEb @ 3619 NONAME
+	_ZN21QDeclarativeTextInput22openSoftwareInputPanelEv @ 3620 NONAME
+	_ZN21QDeclarativeTextInput23closeSoftwareInputPanelEv @ 3621 NONAME
+	_ZN21QDeclarativeTextInput24setShowInputPanelOnFocusEb @ 3622 NONAME
+	_ZN21QDeclarativeTextInput28showInputPanelOnFocusChangedEb @ 3623 NONAME
+	_ZN22QDeclarativeExpressionC1EP19QDeclarativeContextP7QObjectRK7QStringS3_ @ 3624 NONAME
+	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataP7QObjectRK7QString @ 3625 NONAME
+	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataP7QObjectRK7QStringR29QDeclarativeExpressionPrivate @ 3626 NONAME
+	_ZN22QDeclarativeExpressionC2EP19QDeclarativeContextP7QObjectRK7QStringS3_ @ 3627 NONAME
+	_ZN22QDeclarativeExpressionC2EP23QDeclarativeContextDataP7QObjectRK7QString @ 3628 NONAME
+	_ZN22QDeclarativeExpressionC2EP23QDeclarativeContextDataP7QObjectRK7QStringR29QDeclarativeExpressionPrivate @ 3629 NONAME
+	_ZN23QDeclarativeItemPrivate17setConsistentTimeEx @ 3630 NONAME
+	_ZN23QDeclarativeItemPrivate5startER13QElapsedTimer @ 3631 NONAME
+	_ZN23QDeclarativeItemPrivate7elapsedER13QElapsedTimer @ 3632 NONAME
+	_ZN23QDeclarativeItemPrivate7restartER13QElapsedTimer @ 3633 NONAME
+	_ZN24QDeclarativeParentChange11setRotationE24QDeclarativeScriptString @ 3634 NONAME
+	_ZN24QDeclarativeParentChange4setXE24QDeclarativeScriptString @ 3635 NONAME
+	_ZN24QDeclarativeParentChange4setYE24QDeclarativeScriptString @ 3636 NONAME
+	_ZN24QDeclarativeParentChange8setScaleE24QDeclarativeScriptString @ 3637 NONAME
+	_ZN24QDeclarativeParentChange8setWidthE24QDeclarativeScriptString @ 3638 NONAME
+	_ZN24QDeclarativeParentChange9setHeightE24QDeclarativeScriptString @ 3639 NONAME
+	_ZN24QDeclarativeXmlListModel10queryErrorEPvRK7QString @ 3640 NONAME
+	_ZNK16QDeclarativeText12paintedWidthEv @ 3641 NONAME
+	_ZNK16QDeclarativeText13paintedHeightEv @ 3642 NONAME
+	_ZNK20QDeclarativeTextEdit12paintedWidthEv @ 3643 NONAME
+	_ZNK20QDeclarativeTextEdit13paintedHeightEv @ 3644 NONAME
+	_ZNK20QDeclarativeTextEdit13selectByMouseEv @ 3645 NONAME
+	_ZNK20QDeclarativeTextEdit15cursorRectangleEv @ 3646 NONAME
+	_ZNK20QDeclarativeTextEdit21showInputPanelOnFocusEv @ 3647 NONAME
+	_ZNK21QDeclarativeComponent11errorStringEv @ 3648 NONAME
+	_ZNK21QDeclarativeTextInput13selectByMouseEv @ 3649 NONAME
+	_ZNK21QDeclarativeTextInput21showInputPanelOnFocusEv @ 3650 NONAME
+	_ZNK23QDeclarativePaintedItem12boundingRectEv @ 3651 NONAME
+	_ZNK24QDeclarativeXmlListModel11errorStringEv @ 3652 NONAME
+	_ZNK24QDeclarativeXmlListModel3getEi @ 3653 NONAME
+	_ZThn8_N20QDeclarativeTextEdit12focusInEventEP11QFocusEvent @ 3654 NONAME
+	_ZThn8_N20QDeclarativeTextEdit13focusOutEventEP11QFocusEvent @ 3655 NONAME
+	_ZThn8_N21QDeclarativeTextInput12focusInEventEP11QFocusEvent @ 3656 NONAME
+	_ZThn8_N21QDeclarativeTextInput13focusOutEventEP11QFocusEvent @ 3657 NONAME
+	_ZThn8_NK23QDeclarativePaintedItem12boundingRectEv @ 3658 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index cfe2630..8aafde9 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -1,7 +1,7 @@
 EXPORTS
 	_Z11qFadeEffectP7QWidgeti @ 1 NONAME
 	_Z11qt_image_idRK6QImage @ 2 NONAME
-	_Z12qDrawPixmapsP8QPainterPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS1_11DrawingHintEE @ 3 NONAME
+	_Z12qDrawPixmapsP8QPainterPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS1_11DrawingHintEE @ 3 NONAME ABSENT
 	_Z12qt_pixmap_idRK7QPixmap @ 4 NONAME
 	_Z13qDrawWinPanelP8QPainterRK5QRectRK8QPalettebPK6QBrush @ 5 NONAME
 	_Z13qDrawWinPanelP8QPainteriiiiRK8QPalettebPK6QBrush @ 6 NONAME
@@ -1834,7 +1834,7 @@ EXPORTS
 	_ZN12QLineControl4initERK7QString @ 1833 NONAME
 	_ZN12QLineControl5clearEv @ 1834 NONAME
 	_ZN12QLineControl5fixupEv @ 1835 NONAME
-	_ZN12QLineControl5pasteEv @ 1836 NONAME
+	_ZN12QLineControl5pasteEv @ 1836 NONAME ABSENT
 	_ZN12QLineControl6insertERK7QString @ 1837 NONAME
 	_ZN12QLineControl8acceptedEv @ 1838 NONAME
 	_ZN12QLineControl8completeEi @ 1839 NONAME
@@ -2148,7 +2148,7 @@ EXPORTS
 	_ZN12QTextControl4undoEv @ 2147 NONAME
 	_ZN12QTextControl5clearEv @ 2148 NONAME
 	_ZN12QTextControl5eventEP6QEvent @ 2149 NONAME
-	_ZN12QTextControl5pasteEv @ 2150 NONAME
+	_ZN12QTextControl5pasteEv @ 2150 NONAME ABSENT
 	_ZN12QTextControl6appendERK7QString @ 2151 NONAME
 	_ZN12QTextControl7setHtmlERK7QString @ 2152 NONAME
 	_ZN12QTextControl8setFocusEbN2Qt11FocusReasonE @ 2153 NONAME
@@ -2906,7 +2906,7 @@ EXPORTS
 	_ZN14QPaintEngineEx10drawPointsEPK7QPointFi @ 2905 NONAME
 	_ZN14QPaintEngineEx11drawEllipseERK5QRect @ 2906 NONAME
 	_ZN14QPaintEngineEx11drawEllipseERK6QRectF @ 2907 NONAME
-	_ZN14QPaintEngineEx11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 2908 NONAME
+	_ZN14QPaintEngineEx11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 2908 NONAME ABSENT
 	_ZN14QPaintEngineEx11drawPolygonEPK6QPointiN12QPaintEngine15PolygonDrawModeE @ 2909 NONAME
 	_ZN14QPaintEngineEx11drawPolygonEPK7QPointFiN12QPaintEngine15PolygonDrawModeE @ 2910 NONAME
 	_ZN14QPaintEngineEx11updateStateERK17QPaintEngineState @ 2911 NONAME
@@ -3726,7 +3726,7 @@ EXPORTS
 	_ZN16QFileSystemModelD1Ev @ 3725 NONAME
 	_ZN16QFileSystemModelD2Ev @ 3726 NONAME
 	_ZN16QPainterReplayer14setupTransformEP8QPainter @ 3727 NONAME
-	_ZN16QPainterReplayer4drawERK12QPaintBufferP8QPainteri @ 3728 NONAME
+	_ZN16QPainterReplayer4drawERK12QPaintBufferP8QPainteri @ 3728 NONAME ABSENT
 	_ZN16QPainterReplayer7processERK19QPaintBufferCommand @ 3729 NONAME
 	_ZN16QRegExpValidator11qt_metacallEN11QMetaObject4CallEiPPv @ 3730 NONAME
 	_ZN16QRegExpValidator11qt_metacastEPKc @ 3731 NONAME
@@ -4223,7 +4223,7 @@ EXPORTS
 	_ZN18QTextBlockUserDataD0Ev @ 4222 NONAME
 	_ZN18QTextBlockUserDataD1Ev @ 4223 NONAME
 	_ZN18QTextBlockUserDataD2Ev @ 4224 NONAME
-	_ZN18QTextureGlyphCache8populateERK12QTextItemIntRK15QVarLengthArrayIjLi256EERKS3_I11QFixedPointLi256EE @ 4225 NONAME
+	_ZN18QTextureGlyphCache8populateERK12QTextItemIntRK15QVarLengthArrayIjLi256EERKS3_I11QFixedPointLi256EE @ 4225 NONAME ABSENT
 	_ZN19QAbstractProxyModel11qt_metacallEN11QMetaObject4CallEiPPv @ 4226 NONAME
 	_ZN19QAbstractProxyModel11qt_metacastEPKc @ 4227 NONAME
 	_ZN19QAbstractProxyModel13setHeaderDataEiN2Qt11OrientationERK8QVarianti @ 4228 NONAME
@@ -5907,9 +5907,9 @@ EXPORTS
 	_ZN7QActionD1Ev @ 5906 NONAME
 	_ZN7QActionD2Ev @ 5907 NONAME
 	_ZN7QBezier10fromPointsERK7QPointFS2_S2_S2_ @ 5908 NONAME
-	_ZN7QBezier17findIntersectionsERKS_S1_ @ 5909 NONAME
-	_ZN7QBezier17findIntersectionsERKS_S1_P7QVectorI5QPairIffEE @ 5910 NONAME
-	_ZN7QBezier20splitAtIntersectionsERS_ @ 5911 NONAME
+	_ZN7QBezier17findIntersectionsERKS_S1_ @ 5909 NONAME ABSENT
+	_ZN7QBezier17findIntersectionsERKS_S1_P7QVectorI5QPairIffEE @ 5910 NONAME ABSENT
+	_ZN7QBezier20splitAtIntersectionsERS_ @ 5911 NONAME ABSENT
 	_ZN7QBitmap8fromDataERK5QSizePKhN6QImage6FormatE @ 5912 NONAME
 	_ZN7QBitmap9fromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 5913 NONAME
 	_ZN7QBitmapC1ERK5QSize @ 5914 NONAME
@@ -9899,17 +9899,17 @@ EXPORTS
 	_ZNK7QAction9statusTipEv @ 9898 NONAME
 	_ZNK7QAction9whatsThisEv @ 9899 NONAME
 	_ZNK7QBezier10addIfCloseEPff @ 9900 NONAME
-	_ZNK7QBezier12addToPolygonEP9QPolygonF @ 9901 NONAME
+	_ZNK7QBezier12addToPolygonEP9QPolygonF @ 9901 NONAME ABSENT
 	_ZNK7QBezier16bezierOnIntervalEff @ 9902 NONAME
-	_ZNK7QBezier17addToPolygonMixedEP9QPolygonF @ 9903 NONAME
+	_ZNK7QBezier17addToPolygonMixedEP9QPolygonF @ 9903 NONAME ABSENT
 	_ZNK7QBezier17stationaryYPointsERfS0_ @ 9904 NONAME
-	_ZNK7QBezier21addToPolygonIterativeEP9QPolygonF @ 9905 NONAME
+	_ZNK7QBezier21addToPolygonIterativeEP9QPolygonF @ 9905 NONAME ABSENT
 	_ZNK7QBezier5tForYEfff @ 9906 NONAME
 	_ZNK7QBezier6boundsEv @ 9907 NONAME
 	_ZNK7QBezier6lengthEf @ 9908 NONAME
 	_ZNK7QBezier7shiftedEPS_iff @ 9909 NONAME
 	_ZNK7QBezier9tAtLengthEf @ 9910 NONAME
-	_ZNK7QBezier9toPolygonEv @ 9911 NONAME
+	_ZNK7QBezier9toPolygonEv @ 9911 NONAME ABSENT
 	_ZNK7QBitmap11transformedERK10QTransform @ 9912 NONAME
 	_ZNK7QBitmap11transformedERK7QMatrix @ 9913 NONAME
 	_ZNK7QBitmapcv8QVariantEv @ 9914 NONAME
@@ -11741,23 +11741,23 @@ EXPORTS
 	_ZN11QVectorPathD2Ev @ 11740 NONAME
 	_ZNK11QVectorPath12addCacheDataEP14QPaintEngineExPvPFvS1_S2_E @ 11741 NONAME
 	_ZNK20QGraphicsItemPrivate20discardUpdateRequestEbbb @ 11742 NONAME
-	_ZN11QEglContext10extensionsEv @ 11743 NONAME
+	_ZN11QEglContext10extensionsEv @ 11743 NONAME ABSENT
 	_ZN11QEglContext10getDisplayEP12QPaintDevice @ 11744 NONAME ABSENT
-	_ZN11QEglContext10waitClientEv @ 11745 NONAME
-	_ZN11QEglContext10waitNativeEv @ 11746 NONAME
+	_ZN11QEglContext10waitClientEv @ 11745 NONAME ABSENT
+	_ZN11QEglContext10waitNativeEv @ 11746 NONAME ABSENT
 	_ZN11QEglContext11doneCurrentEv @ 11747 NONAME
-	_ZN11QEglContext11errorStringEi @ 11748 NONAME
+	_ZN11QEglContext11errorStringEi @ 11748 NONAME ABSENT
 	_ZN11QEglContext11makeCurrentEi @ 11749 NONAME
 	_ZN11QEglContext11openDisplayEP12QPaintDevice @ 11750 NONAME ABSENT
 	_ZN11QEglContext11swapBuffersEi @ 11751 NONAME
 	_ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME
-	_ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME
+	_ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME ABSENT
 	_ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME
 	_ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME
 	_ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME
 	_ZN11QEglContext14defaultDisplayEP12QPaintDevice @ 11757 NONAME ABSENT
 	_ZN11QEglContext14destroySurfaceEi @ 11758 NONAME
-	_ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME
+	_ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME ABSENT
 	_ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME
 	_ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME
 	_ZN11QEglContext7destroyEv @ 11762 NONAME ABSENT
@@ -11766,7 +11766,7 @@ EXPORTS
 	_ZN11QEglContextD1Ev @ 11765 NONAME
 	_ZN11QEglContextD2Ev @ 11766 NONAME
 	_ZN14QEglProperties11removeValueEi @ 11767 NONAME
-	_ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME
+	_ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME ABSENT
 	_ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME
 	_ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME
 	_ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME
@@ -11776,8 +11776,8 @@ EXPORTS
 	_ZN14QEglPropertiesC1Ev @ 11775 NONAME
 	_ZN14QEglPropertiesC2Ei @ 11776 NONAME
 	_ZN14QEglPropertiesC2Ev @ 11777 NONAME
-	_ZNK11QEglContext12configAttribEiPi @ 11778 NONAME
-	_ZNK11QEglContext16configPropertiesEi @ 11779 NONAME
+	_ZNK11QEglContext12configAttribEiPi @ 11778 NONAME ABSENT
+	_ZNK11QEglContext16configPropertiesEi @ 11779 NONAME ABSENT
 	_ZNK11QEglContext7isValidEv @ 11780 NONAME
 	_ZNK11QEglContext9isCurrentEv @ 11781 NONAME
 	_ZNK14QEglProperties5valueEi @ 11782 NONAME
@@ -11805,12 +11805,12 @@ EXPORTS
 	_ZN24QImagePixmapCleanupHooks34executePixmapDataModificationHooksEP11QPixmapData @ 11804 NONAME
 	_ZN9QS60Style10timerEventEP11QTimerEvent @ 11805 NONAME
 	_ZN9QS60Style11eventFilterEP7QObjectP6QEvent @ 11806 NONAME
-	_ZN11QEglContext10clearErrorEv @ 11807 NONAME
-	_ZN11QEglContext13nativeDisplayEv @ 11808 NONAME
+	_ZN11QEglContext10clearErrorEv @ 11807 NONAME ABSENT
+	_ZN11QEglContext13nativeDisplayEv @ 11808 NONAME ABSENT
 	_ZN11QEglContext14destroyContextEv @ 11809 NONAME
-	_ZN11QEglContext3dpyE @ 11810 NONAME DATA 4
-	_ZN11QEglContext5errorEv @ 11811 NONAME
-	_ZN11QEglContext7displayEv @ 11812 NONAME
+	_ZN11QEglContext3dpyE @ 11810 NONAME DATA 4 ABSENT
+	_ZN11QEglContext5errorEv @ 11811 NONAME ABSENT
+	_ZN11QEglContext7displayEv @ 11812 NONAME ABSENT
 	_ZN11QFontEngine16getGlyphBearingsEjPfS0_ @ 11813 NONAME
 	_ZN12QLineControl17updateDisplayTextEb @ 11814 NONAME
 	_ZN13QFontDatabase25removeAllApplicationFontsEv @ 11815 NONAME
@@ -11820,4 +11820,190 @@ EXPORTS
 	_ZN20QGraphicsItemPrivate16clearFocusHelperEb @ 11819 NONAME
 	_ZN24QImagePixmapCleanupHooks13isImageCachedERK6QImage @ 11820 NONAME
 	_ZN24QImagePixmapCleanupHooks14isPixmapCachedERK7QPixmap @ 11821 NONAME
+	_Z14qt_draw_glyphsP8QPainterPKjPK7QPointFi @ 11822 NONAME
+	_ZN10QZipReader5closeEv @ 11823 NONAME
+	_ZN10QZipReader8FileInfoC1ERKS0_ @ 11824 NONAME
+	_ZN10QZipReader8FileInfoC1Ev @ 11825 NONAME
+	_ZN10QZipReader8FileInfoC2ERKS0_ @ 11826 NONAME
+	_ZN10QZipReader8FileInfoC2Ev @ 11827 NONAME
+	_ZN10QZipReader8FileInfoD1Ev @ 11828 NONAME
+	_ZN10QZipReader8FileInfoD2Ev @ 11829 NONAME
+	_ZN10QZipReader8FileInfoaSERKS0_ @ 11830 NONAME
+	_ZN10QZipReaderC1EP9QIODevice @ 11831 NONAME
+	_ZN10QZipReaderC1ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11832 NONAME
+	_ZN10QZipReaderC2EP9QIODevice @ 11833 NONAME
+	_ZN10QZipReaderC2ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 11834 NONAME
+	_ZN10QZipReaderD1Ev @ 11835 NONAME
+	_ZN10QZipReaderD2Ev @ 11836 NONAME
+	_ZN11QStaticText12setTextWidthEf @ 11837 NONAME
+	_ZN11QStaticText13setTextFormatEN2Qt10TextFormatE @ 11838 NONAME
+	_ZN11QStaticText18setPerformanceHintENS_15PerformanceHintE @ 11839 NONAME
+	_ZN11QStaticText6detachEv @ 11840 NONAME
+	_ZN11QStaticText7prepareERK10QTransformRK5QFont @ 11841 NONAME
+	_ZN11QStaticText7setTextERK7QString @ 11842 NONAME
+	_ZN11QStaticTextC1ERK7QString @ 11843 NONAME
+	_ZN11QStaticTextC1ERKS_ @ 11844 NONAME
+	_ZN11QStaticTextC1Ev @ 11845 NONAME
+	_ZN11QStaticTextC2ERK7QString @ 11846 NONAME
+	_ZN11QStaticTextC2ERKS_ @ 11847 NONAME
+	_ZN11QStaticTextC2Ev @ 11848 NONAME
+	_ZN11QStaticTextD1Ev @ 11849 NONAME
+	_ZN11QStaticTextD2Ev @ 11850 NONAME
+	_ZN11QStaticTextaSERKS_ @ 11851 NONAME
+	_ZN12QKeySequence6assignERK7QStringNS_14SequenceFormatE @ 11852 NONAME
+	_ZN12QKeySequenceC1ERK7QStringNS_14SequenceFormatE @ 11853 NONAME
+	_ZN12QKeySequenceC2ERK7QStringNS_14SequenceFormatE @ 11854 NONAME
+	_ZN12QLineControl5pasteEN10QClipboard4ModeE @ 11855 NONAME
+	_ZN12QPixmapCache10allPixmapsEv @ 11856 NONAME
+	_ZN12QPixmapCache20flushDetachedPixmapsEv @ 11857 NONAME
+	_ZN12QPixmapCache9totalUsedEv @ 11858 NONAME
+	_ZN12QTextControl5pasteEN10QClipboard4ModeE @ 11859 NONAME
+	_ZN13QGraphicsItem16updateMicroFocusEv @ 11860 NONAME
+	_ZN13QIconEngineV28iconNameEv @ 11861 NONAME
+	_ZN13QTextDocument19clearUndoRedoStacksENS_6StacksE @ 11862 NONAME
+	_ZN14QEglProperties13setDeviceTypeEi @ 11863 NONAME
+	_ZN14QPaintEngineEx19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 11864 NONAME
+	_ZN14QWidgetPrivate6renderEP12QPaintDeviceRK6QPointRK7QRegion6QFlagsIN7QWidget10RenderFlagEEb @ 11865 NONAME
+	_ZN14QWindowSurface23setPartialUpdateSupportEb @ 11866 NONAME
+	_ZN15QGraphicsObject12widthChangedEv @ 11867 NONAME
+	_ZN15QGraphicsObject13heightChangedEv @ 11868 NONAME
+	_ZN15QGraphicsObject15childrenChangedEv @ 11869 NONAME
+	_ZN15QGraphicsObject16updateMicroFocusEv @ 11870 NONAME
+	_ZN15QGraphicsWidget13layoutChangedEv @ 11871 NONAME
+	_ZN15QGraphicsWidget15geometryChangedEv @ 11872 NONAME
+	_ZN15QGraphicsWidget21setAutoFillBackgroundEb @ 11873 NONAME
+	_ZN15QSplitterHandle11resizeEventEP12QResizeEvent @ 11874 NONAME
+	_ZN16QFileSystemModel15directoryLoadedERK7QString @ 11875 NONAME
+	_ZN16QPainterReplayer15processCommandsERK12QPaintBufferP8QPainterii @ 11876 NONAME
+	_ZN18QTextureGlyphCache8populateEP11QFontEngineiPKjPK11QFixedPoint @ 11877 NONAME
+	_ZN19QApplicationPrivate15getPixmapCursorEN2Qt11CursorShapeE @ 11878 NONAME
+	_ZN20QGraphicsItemPrivate10resetWidthEv @ 11879 NONAME
+	_ZN20QGraphicsItemPrivate11children_atEP24QDeclarativeListPropertyI15QGraphicsObjectEi @ 11880 NONAME
+	_ZN20QGraphicsItemPrivate11resetHeightEv @ 11881 NONAME
+	_ZN20QGraphicsItemPrivate12childrenListEv @ 11882 NONAME
+	_ZN20QGraphicsItemPrivate14children_countEP24QDeclarativeListPropertyI15QGraphicsObjectE @ 11883 NONAME
+	_ZN20QGraphicsItemPrivate15children_appendEP24QDeclarativeListPropertyI15QGraphicsObjectEPS1_ @ 11884 NONAME
+	_ZN20QGraphicsItemPrivate24prependGraphicsTransformEP18QGraphicsTransform @ 11885 NONAME
+	_ZN20QGraphicsItemPrivate30updatePaintedViewBoundingRectsEb @ 11886 NONAME
+	_ZN20QGraphicsItemPrivate8setWidthEf @ 11887 NONAME
+	_ZN20QGraphicsItemPrivate9setHeightEf @ 11888 NONAME
+	_ZN20QGraphicsViewPrivate10centerViewEN13QGraphicsView14ViewportAnchorE @ 11889 NONAME
+	_ZN20QGraphicsViewPrivate10updateRectERK5QRect @ 11890 NONAME
+	_ZN20QGraphicsViewPrivate12updateRegionERK6QRectFRK10QTransform @ 11891 NONAME
+	_ZN20QGraphicsViewPrivate12updateScrollEv @ 11892 NONAME
+	_ZN20QGraphicsViewPrivate13setUpdateClipEP13QGraphicsItem @ 11893 NONAME
+	_ZN20QGraphicsViewPrivate15storeMouseEventEP11QMouseEvent @ 11894 NONAME
+	_ZN20QGraphicsViewPrivate18storeDragDropEventEPK27QGraphicsSceneDragDropEvent @ 11895 NONAME
+	_ZN20QGraphicsViewPrivate19translateTouchEventEPS_P11QTouchEvent @ 11896 NONAME
+	_ZN20QGraphicsViewPrivate20_q_setViewportCursorERK7QCursor @ 11897 NONAME
+	_ZN20QGraphicsViewPrivate20replayLastMouseEventEv @ 11898 NONAME
+	_ZN20QGraphicsViewPrivate21freeStyleOptionsArrayEP24QStyleOptionGraphicsItem @ 11899 NONAME
+	_ZN20QGraphicsViewPrivate21mouseMoveEventHandlerEP11QMouseEvent @ 11900 NONAME
+	_ZN20QGraphicsViewPrivate21processPendingUpdatesEv @ 11901 NONAME
+	_ZN20QGraphicsViewPrivate21updateLastCenterPointEv @ 11902 NONAME
+	_ZN20QGraphicsViewPrivate22_q_unsetViewportCursorEv @ 11903 NONAME
+	_ZN20QGraphicsViewPrivate22allocStyleOptionsArrayEi @ 11904 NONAME
+	_ZN20QGraphicsViewPrivate22recalculateContentSizeEv @ 11905 NONAME
+	_ZN20QGraphicsViewPrivate26populateSceneDragDropEventEP27QGraphicsSceneDragDropEventP10QDropEvent @ 11906 NONAME
+	_ZN20QGraphicsViewPrivate28updateInputMethodSensitivityEv @ 11907 NONAME
+	_ZN20QGraphicsViewPrivateC1Ev @ 11908 NONAME
+	_ZN20QGraphicsViewPrivateC2Ev @ 11909 NONAME
+	_ZN23QImageTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj @ 11910 NONAME
+	_ZN23QImageTextureGlyphCache17createTextureDataEii @ 11911 NONAME
+	_ZN23QImageTextureGlyphCache17resizeTextureDataEii @ 11912 NONAME
+	_ZN26QAbstractScrollAreaPrivate14layoutChildrenEv @ 11913 NONAME
+	_ZN26QAbstractScrollAreaPrivate16replaceScrollBarEP10QScrollBarN2Qt11OrientationE @ 11914 NONAME
+	_ZN26QAbstractScrollAreaPrivate23_q_showOrHideScrollBarsEv @ 11915 NONAME
+	_ZN26QAbstractScrollAreaPrivate4initEv @ 11916 NONAME
+	_ZN26QAbstractScrollAreaPrivate9_q_hslideEi @ 11917 NONAME
+	_ZN26QAbstractScrollAreaPrivate9_q_vslideEi @ 11918 NONAME
+	_ZN26QAbstractScrollAreaPrivateC1Ev @ 11919 NONAME
+	_ZN26QAbstractScrollAreaPrivateC2Ev @ 11920 NONAME
+	_ZN4QEgl10extensionsEv @ 11921 NONAME
+	_ZN4QEgl11errorStringEi @ 11922 NONAME
+	_ZN4QEgl12chooseConfigEPK14QEglPropertiesNS_16PixelFormatMatchE @ 11923 NONAME
+	_ZN4QEgl12hasExtensionEPKc @ 11924 NONAME
+	_ZN4QEgl12nativePixmapEP7QPixmap @ 11925 NONAME
+	_ZN4QEgl12nativeWindowEP7QWidget @ 11926 NONAME
+	_ZN4QEgl13createSurfaceEP12QPaintDeviceiPK14QEglProperties @ 11927 NONAME
+	_ZN4QEgl13defaultConfigEiNS_3APIE6QFlagsINS_12ConfigOptionEE @ 11928 NONAME
+	_ZN4QEgl13nativeDisplayEv @ 11929 NONAME
+	_ZN4QEgl14dumpAllConfigsEv @ 11930 NONAME
+	_ZN4QEgl17eglCreateImageKHREiiiiPKi @ 11931 NONAME
+	_ZN4QEgl18eglDestroyImageKHREii @ 11932 NONAME
+	_ZN4QEgl7displayEv @ 11933 NONAME
+	_ZN6QColor12isValidColorERK7QString @ 11934 NONAME
+	_ZN6QColor18setColorFromStringERK7QString @ 11935 NONAME
+	_ZN6QLabel12setSelectionEii @ 11936 NONAME
+	_ZN7QPixmap16convertFromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 11937 NONAME
+	_ZN7QWizard11pageRemovedEi @ 11938 NONAME
+	_ZN7QWizard13setSideWidgetEP7QWidget @ 11939 NONAME
+	_ZN7QWizard9pageAddedEi @ 11940 NONAME
+	_ZN8QPainter14PixmapFragment6createERK7QPointFRK6QRectFffff @ 11941 NONAME
+	_ZN8QPainter14drawStaticTextERK7QPointFRK11QStaticText @ 11942 NONAME
+	_ZN8QPainter19drawPixmapFragmentsEPKNS_14PixmapFragmentEiRK7QPixmap6QFlagsINS_18PixmapFragmentHintEE @ 11943 NONAME
+	_ZN8QToolBar17visibilityChangedEb @ 11944 NONAME
+	_ZN9QLineEdit18setPlaceholderTextERK7QString @ 11945 NONAME
+	_ZNK10QZipReader10extractAllERK7QString @ 11946 NONAME
+	_ZNK10QZipReader10isReadableEv @ 11947 NONAME
+	_ZNK10QZipReader11entryInfoAtEi @ 11948 NONAME
+	_ZNK10QZipReader12fileInfoListEv @ 11949 NONAME
+	_ZNK10QZipReader5countEv @ 11950 NONAME
+	_ZNK10QZipReader6deviceEv @ 11951 NONAME
+	_ZNK10QZipReader6existsEv @ 11952 NONAME
+	_ZNK10QZipReader6statusEv @ 11953 NONAME
+	_ZNK10QZipReader8FileInfo7isValidEv @ 11954 NONAME
+	_ZNK10QZipReader8fileDataERK7QString @ 11955 NONAME
+	_ZNK11QEglContext12configAttribEi @ 11956 NONAME
+	_ZNK11QStaticText10textFormatEv @ 11957 NONAME
+	_ZNK11QStaticText15performanceHintEv @ 11958 NONAME
+	_ZNK11QStaticText4sizeEv @ 11959 NONAME
+	_ZNK11QStaticText4textEv @ 11960 NONAME
+	_ZNK11QStaticText9textWidthEv @ 11961 NONAME
+	_ZNK11QStaticTexteqERKS_ @ 11962 NONAME
+	_ZNK11QStaticTextneERKS_ @ 11963 NONAME
+	_ZNK11QTextCursor15positionInBlockEv @ 11964 NONAME
+	_ZNK12QPaintBuffer13frameEndIndexEi @ 11965 NONAME
+	_ZNK12QPaintBuffer15frameStartIndexEi @ 11966 NONAME
+	_ZNK12QPaintBuffer15processCommandsEP8QPainterii @ 11967 NONAME
+	_ZNK12QPaintBuffer18commandDescriptionEi @ 11968 NONAME
+	_ZNK13QIntValidator5fixupER7QString @ 11969 NONAME
+	_ZNK14QPlainTextEdit8anchorAtERK6QPoint @ 11970 NONAME
+	_ZNK14QWindowSurface23hasPartialUpdateSupportEv @ 11971 NONAME
+	_ZNK15QGraphicsWidget18autoFillBackgroundEv @ 11972 NONAME
+	_ZNK19QItemSelectionRange7isEmptyEv @ 11973 NONAME
+	_ZNK20QGraphicsItemPrivate5widthEv @ 11974 NONAME
+	_ZNK20QGraphicsItemPrivate6heightEv @ 11975 NONAME
+	_ZNK20QGraphicsViewPrivate10mapToSceneERK6QRectF @ 11976 NONAME
+	_ZNK20QGraphicsViewPrivate10mapToSceneERK7QPointF @ 11977 NONAME
+	_ZNK20QGraphicsViewPrivate13mapToViewRectEPK13QGraphicsItemRK6QRectF @ 11978 NONAME
+	_ZNK20QGraphicsViewPrivate14mapRectToSceneERK5QRect @ 11979 NONAME
+	_ZNK20QGraphicsViewPrivate14verticalScrollEv @ 11980 NONAME
+	_ZNK20QGraphicsViewPrivate15mapToViewRegionEPK13QGraphicsItemRK6QRectF @ 11981 NONAME
+	_ZNK20QGraphicsViewPrivate16horizontalScrollEv @ 11982 NONAME
+	_ZNK20QGraphicsViewPrivate16mapRectFromSceneERK6QRectF @ 11983 NONAME
+	_ZNK20QGraphicsViewPrivate16rubberBandRegionEPK7QWidgetRK5QRect @ 11984 NONAME
+	_ZNK20QGraphicsViewPrivate9findItemsERK7QRegionPbRK10QTransform @ 11985 NONAME
+	_ZNK23QImageTextureGlyphCache11glyphMarginEv @ 11986 NONAME
+	_ZNK26QAbstractScrollAreaPrivate14contentsOffsetEv @ 11987 NONAME
+	_ZNK5QIcon4nameEv @ 11988 NONAME
+	_ZNK6QImage13bitPlaneCountEv @ 11989 NONAME
+	_ZNK6QImage13constScanLineEi @ 11990 NONAME
+	_ZNK6QImage9constBitsEv @ 11991 NONAME
+	_ZNK6QLabel12selectedTextEv @ 11992 NONAME
+	_ZNK6QLabel14selectionStartEv @ 11993 NONAME
+	_ZNK6QLabel15hasSelectedTextEv @ 11994 NONAME
+	_ZNK7QBezier11getSubRangeEff @ 11995 NONAME
+	_ZNK7QBezier12addToPolygonEP9QPolygonFf @ 11996 NONAME
+	_ZNK7QBezier5mapByERK10QTransform @ 11997 NONAME
+	_ZNK7QBezier9toPolygonEf @ 11998 NONAME
+	_ZNK7QWizard10sideWidgetEv @ 11999 NONAME
+	_ZNK9QLineEdit15placeholderTextEv @ 12000 NONAME
+	_ZNK9QTextLine17horizontalAdvanceEv @ 12001 NONAME
+	_ZTI20QGraphicsViewPrivate @ 12002 NONAME
+	_ZTI23QImageTextureGlyphCache @ 12003 NONAME
+	_ZTI26QAbstractScrollAreaPrivate @ 12004 NONAME
+	_ZTV20QGraphicsViewPrivate @ 12005 NONAME
+	_ZTV23QImageTextureGlyphCache @ 12006 NONAME
+	_ZTV26QAbstractScrollAreaPrivate @ 12007 NONAME
 
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def
index 77c36b4..3cc3644 100644
--- a/src/s60installs/eabi/QtNetworku.def
+++ b/src/s60installs/eabi/QtNetworku.def
@@ -994,5 +994,174 @@ EXPORTS
 	_ZN15QNetworkRequest20setOriginatingObjectEP7QObject @ 993 NONAME
 	_ZNK15QNetworkRequest17originatingObjectEv @ 994 NONAME
 	_Z19qt_qhostinfo_lookupRK7QStringP7QObjectPKcPbPi @ 995 NONAME
-	_Z24qt_qhostinfo_clear_cachev @ 996 NONAME
+	_Z24qt_qhostinfo_clear_cachev @ 996 NONAME ABSENT
+	_Z35qNetworkConfigurationManagerPrivatev @ 997 NONAME
+	_ZN10QTcpServer20addPendingConnectionEP10QTcpSocket @ 998 NONAME
+	_ZN13QBearerEngine11qt_metacallEN11QMetaObject4CallEiPPv @ 999 NONAME
+	_ZN13QBearerEngine11qt_metacastEPKc @ 1000 NONAME
+	_ZN13QBearerEngine15updateCompletedEv @ 1001 NONAME
+	_ZN13QBearerEngine16staticMetaObjectE @ 1002 NONAME DATA 16
+	_ZN13QBearerEngine18configurationAddedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1003 NONAME
+	_ZN13QBearerEngine19getStaticMetaObjectEv @ 1004 NONAME
+	_ZN13QBearerEngine20configurationChangedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1005 NONAME
+	_ZN13QBearerEngine20configurationRemovedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1006 NONAME
+	_ZN13QBearerEngineC2EP7QObject @ 1007 NONAME
+	_ZN13QBearerEngineD0Ev @ 1008 NONAME
+	_ZN13QBearerEngineD1Ev @ 1009 NONAME
+	_ZN13QBearerEngineD2Ev @ 1010 NONAME
+	_ZN15QNetworkRequest11setPriorityENS_8PriorityE @ 1011 NONAME
+	_ZN15QNetworkSession11qt_metacallEN11QMetaObject4CallEiPPv @ 1012 NONAME
+	_ZN15QNetworkSession11qt_metacastEPKc @ 1013 NONAME
+	_ZN15QNetworkSession12stateChangedENS_5StateE @ 1014 NONAME
+	_ZN15QNetworkSession13connectNotifyEPKc @ 1015 NONAME
+	_ZN15QNetworkSession13waitForOpenedEi @ 1016 NONAME
+	_ZN15QNetworkSession16disconnectNotifyEPKc @ 1017 NONAME
+	_ZN15QNetworkSession16staticMetaObjectE @ 1018 NONAME DATA 16
+	_ZN15QNetworkSession18setSessionPropertyERK7QStringRK8QVariant @ 1019 NONAME
+	_ZN15QNetworkSession19getStaticMetaObjectEv @ 1020 NONAME
+	_ZN15QNetworkSession25newConfigurationActivatedEv @ 1021 NONAME
+	_ZN15QNetworkSession29preferredConfigurationChangedERK21QNetworkConfigurationb @ 1022 NONAME
+	_ZN15QNetworkSession4openEv @ 1023 NONAME
+	_ZN15QNetworkSession4stopEv @ 1024 NONAME
+	_ZN15QNetworkSession5closeEv @ 1025 NONAME
+	_ZN15QNetworkSession5errorENS_12SessionErrorE @ 1026 NONAME
+	_ZN15QNetworkSession6acceptEv @ 1027 NONAME
+	_ZN15QNetworkSession6closedEv @ 1028 NONAME
+	_ZN15QNetworkSession6ignoreEv @ 1029 NONAME
+	_ZN15QNetworkSession6openedEv @ 1030 NONAME
+	_ZN15QNetworkSession6rejectEv @ 1031 NONAME
+	_ZN15QNetworkSession7migrateEv @ 1032 NONAME
+	_ZN15QNetworkSessionC1ERK21QNetworkConfigurationP7QObject @ 1033 NONAME
+	_ZN15QNetworkSessionC2ERK21QNetworkConfigurationP7QObject @ 1034 NONAME
+	_ZN15QNetworkSessionD0Ev @ 1035 NONAME
+	_ZN15QNetworkSessionD1Ev @ 1036 NONAME
+	_ZN15QNetworkSessionD2Ev @ 1037 NONAME
+	_ZN19QBearerEnginePlugin11qt_metacallEN11QMetaObject4CallEiPPv @ 1038 NONAME
+	_ZN19QBearerEnginePlugin11qt_metacastEPKc @ 1039 NONAME
+	_ZN19QBearerEnginePlugin16staticMetaObjectE @ 1040 NONAME DATA 16
+	_ZN19QBearerEnginePlugin19getStaticMetaObjectEv @ 1041 NONAME
+	_ZN19QBearerEnginePluginC2EP7QObject @ 1042 NONAME
+	_ZN19QBearerEnginePluginD0Ev @ 1043 NONAME
+	_ZN19QBearerEnginePluginD1Ev @ 1044 NONAME
+	_ZN19QBearerEnginePluginD2Ev @ 1045 NONAME
+	_ZN21QNetworkAccessManager16setConfigurationERK21QNetworkConfiguration @ 1046 NONAME
+	_ZN21QNetworkAccessManager17sendCustomRequestERK15QNetworkRequestRK10QByteArrayP9QIODevice @ 1047 NONAME
+	_ZN21QNetworkAccessManager20setNetworkAccessibleENS_20NetworkAccessibilityE @ 1048 NONAME
+	_ZN21QNetworkAccessManager23networkSessionConnectedEv @ 1049 NONAME
+	_ZN21QNetworkAccessManager24networkAccessibleChangedENS_20NetworkAccessibilityE @ 1050 NONAME
+	_ZN21QNetworkConfigurationC1ERKS_ @ 1051 NONAME
+	_ZN21QNetworkConfigurationC1Ev @ 1052 NONAME
+	_ZN21QNetworkConfigurationC2ERKS_ @ 1053 NONAME
+	_ZN21QNetworkConfigurationC2Ev @ 1054 NONAME
+	_ZN21QNetworkConfigurationD1Ev @ 1055 NONAME
+	_ZN21QNetworkConfigurationD2Ev @ 1056 NONAME
+	_ZN21QNetworkConfigurationaSERKS_ @ 1057 NONAME
+	_ZN22QNetworkSessionPrivate11qt_metacallEN11QMetaObject4CallEiPPv @ 1058 NONAME
+	_ZN22QNetworkSessionPrivate11qt_metacastEPKc @ 1059 NONAME
+	_ZN22QNetworkSessionPrivate12stateChangedEN15QNetworkSession5StateE @ 1060 NONAME
+	_ZN22QNetworkSessionPrivate16staticMetaObjectE @ 1061 NONAME DATA 16
+	_ZN22QNetworkSessionPrivate19getStaticMetaObjectEv @ 1062 NONAME
+	_ZN22QNetworkSessionPrivate25newConfigurationActivatedEv @ 1063 NONAME
+	_ZN22QNetworkSessionPrivate25quitPendingWaitsForOpenedEv @ 1064 NONAME
+	_ZN22QNetworkSessionPrivate29preferredConfigurationChangedERK21QNetworkConfigurationb @ 1065 NONAME
+	_ZN22QNetworkSessionPrivate5errorEN15QNetworkSession12SessionErrorE @ 1066 NONAME
+	_ZN22QNetworkSessionPrivate6closedEv @ 1067 NONAME
+	_ZN28QNetworkConfigurationManager11qt_metacallEN11QMetaObject4CallEiPPv @ 1068 NONAME
+	_ZN28QNetworkConfigurationManager11qt_metacastEPKc @ 1069 NONAME
+	_ZN28QNetworkConfigurationManager15updateCompletedEv @ 1070 NONAME
+	_ZN28QNetworkConfigurationManager16staticMetaObjectE @ 1071 NONAME DATA 16
+	_ZN28QNetworkConfigurationManager18configurationAddedERK21QNetworkConfiguration @ 1072 NONAME
+	_ZN28QNetworkConfigurationManager18onlineStateChangedEb @ 1073 NONAME
+	_ZN28QNetworkConfigurationManager19getStaticMetaObjectEv @ 1074 NONAME
+	_ZN28QNetworkConfigurationManager20configurationChangedERK21QNetworkConfiguration @ 1075 NONAME
+	_ZN28QNetworkConfigurationManager20configurationRemovedERK21QNetworkConfiguration @ 1076 NONAME
+	_ZN28QNetworkConfigurationManager20updateConfigurationsEv @ 1077 NONAME
+	_ZN28QNetworkConfigurationManagerC1EP7QObject @ 1078 NONAME
+	_ZN28QNetworkConfigurationManagerC2EP7QObject @ 1079 NONAME
+	_ZN28QNetworkConfigurationManagerD0Ev @ 1080 NONAME
+	_ZN28QNetworkConfigurationManagerD1Ev @ 1081 NONAME
+	_ZN28QNetworkConfigurationManagerD2Ev @ 1082 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate11pollEnginesEv @ 1083 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate11qt_metacallEN11QMetaObject4CallEiPPv @ 1084 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate11qt_metacastEPKc @ 1085 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate12capabilitiesEv @ 1086 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate12startPollingEv @ 1087 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate13enablePollingEv @ 1088 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate14disablePollingEv @ 1089 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate16staticMetaObjectE @ 1090 NONAME DATA 16
+	_ZN35QNetworkConfigurationManagerPrivate17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1091 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate18configurationAddedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1092 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate18configurationAddedERK21QNetworkConfiguration @ 1093 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate18onlineStateChangedEb @ 1094 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate19getStaticMetaObjectEv @ 1095 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate20configurationChangedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1096 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate20configurationChangedERK21QNetworkConfiguration @ 1097 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate20configurationRemovedE28QExplicitlySharedDataPointerI28QNetworkConfigurationPrivateE @ 1098 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate20configurationRemovedERK21QNetworkConfiguration @ 1099 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate20defaultConfigurationEv @ 1100 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate20updateConfigurationsEv @ 1101 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate27configurationFromIdentifierERK7QString @ 1102 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate27configurationUpdateCompleteEv @ 1103 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate31performAsyncConfigurationUpdateEv @ 1104 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate5abortEv @ 1105 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate7enginesEv @ 1106 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate8isOnlineEv @ 1107 NONAME
+	_ZN35QNetworkConfigurationManagerPrivateC1Ev @ 1108 NONAME
+	_ZN35QNetworkConfigurationManagerPrivateC2Ev @ 1109 NONAME
+	_ZN35QNetworkConfigurationManagerPrivateD0Ev @ 1110 NONAME
+	_ZN35QNetworkConfigurationManagerPrivateD1Ev @ 1111 NONAME
+	_ZN35QNetworkConfigurationManagerPrivateD2Ev @ 1112 NONAME
+	_ZNK13QBearerEngine10metaObjectEv @ 1113 NONAME
+	_ZNK13QBearerEngine15requiresPollingEv @ 1114 NONAME
+	_ZNK13QBearerEngine19configurationsInUseEv @ 1115 NONAME
+	_ZNK13QNetworkReply14rawHeaderPairsEv @ 1116 NONAME
+	_ZNK15QNetworkRequest8priorityEv @ 1117 NONAME
+	_ZNK15QNetworkSession10activeTimeEv @ 1118 NONAME
+	_ZNK15QNetworkSession10metaObjectEv @ 1119 NONAME
+	_ZNK15QNetworkSession11errorStringEv @ 1120 NONAME
+	_ZNK15QNetworkSession12bytesWrittenEv @ 1121 NONAME
+	_ZNK15QNetworkSession13bytesReceivedEv @ 1122 NONAME
+	_ZNK15QNetworkSession13configurationEv @ 1123 NONAME
+	_ZNK15QNetworkSession15sessionPropertyERK7QString @ 1124 NONAME
+	_ZNK15QNetworkSession5errorEv @ 1125 NONAME
+	_ZNK15QNetworkSession5stateEv @ 1126 NONAME
+	_ZNK15QNetworkSession6isOpenEv @ 1127 NONAME
+	_ZNK15QNetworkSession9interfaceEv @ 1128 NONAME
+	_ZNK19QBearerEnginePlugin10metaObjectEv @ 1129 NONAME
+	_ZNK21QNetworkAccessManager13configurationEv @ 1130 NONAME
+	_ZNK21QNetworkAccessManager17networkAccessibleEv @ 1131 NONAME
+	_ZNK21QNetworkAccessManager19activeConfigurationEv @ 1132 NONAME
+	_ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME
+	_ZNK21QNetworkConfiguration10identifierEv @ 1134 NONAME
+	_ZNK21QNetworkConfiguration18isRoamingAvailableEv @ 1135 NONAME
+	_ZNK21QNetworkConfiguration4nameEv @ 1136 NONAME
+	_ZNK21QNetworkConfiguration4typeEv @ 1137 NONAME
+	_ZNK21QNetworkConfiguration5stateEv @ 1138 NONAME
+	_ZNK21QNetworkConfiguration7isValidEv @ 1139 NONAME
+	_ZNK21QNetworkConfiguration7purposeEv @ 1140 NONAME
+	_ZNK21QNetworkConfiguration8childrenEv @ 1141 NONAME
+	_ZNK21QNetworkConfigurationeqERKS_ @ 1142 NONAME
+	_ZNK22QNetworkSessionPrivate10metaObjectEv @ 1143 NONAME
+	_ZNK28QNetworkConfigurationManager10metaObjectEv @ 1144 NONAME
+	_ZNK28QNetworkConfigurationManager12capabilitiesEv @ 1145 NONAME
+	_ZNK28QNetworkConfigurationManager17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1146 NONAME
+	_ZNK28QNetworkConfigurationManager20defaultConfigurationEv @ 1147 NONAME
+	_ZNK28QNetworkConfigurationManager27configurationFromIdentifierERK7QString @ 1148 NONAME
+	_ZNK28QNetworkConfigurationManager8isOnlineEv @ 1149 NONAME
+	_ZNK35QNetworkConfigurationManagerPrivate10metaObjectEv @ 1150 NONAME
+	_ZTI13QBearerEngine @ 1151 NONAME
+	_ZTI15QNetworkSession @ 1152 NONAME
+	_ZTI19QBearerEnginePlugin @ 1153 NONAME
+	_ZTI22QNetworkSessionPrivate @ 1154 NONAME
+	_ZTI28QNetworkConfigurationManager @ 1155 NONAME
+	_ZTI29QBearerEngineFactoryInterface @ 1156 NONAME
+	_ZTI35QNetworkConfigurationManagerPrivate @ 1157 NONAME
+	_ZTV13QBearerEngine @ 1158 NONAME
+	_ZTV15QNetworkSession @ 1159 NONAME
+	_ZTV19QBearerEnginePlugin @ 1160 NONAME
+	_ZTV22QNetworkSessionPrivate @ 1161 NONAME
+	_ZTV28QNetworkConfigurationManager @ 1162 NONAME
+	_ZTV35QNetworkConfigurationManagerPrivate @ 1163 NONAME
+	_ZThn8_N19QBearerEnginePluginD0Ev @ 1164 NONAME
+	_ZThn8_N19QBearerEnginePluginD1Ev @ 1165 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index cf226c5..15fda9a 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -31,7 +31,7 @@ EXPORTS
 	_ZN14QVGPaintEngine10penChangedEv @ 30 NONAME
 	_ZN14QVGPaintEngine11drawEllipseERK5QRect @ 31 NONAME
 	_ZN14QVGPaintEngine11drawEllipseERK6QRectF @ 32 NONAME
-	_ZN14QVGPaintEngine11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 33 NONAME
+	_ZN14QVGPaintEngine11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 33 NONAME ABSENT
 	_ZN14QVGPaintEngine11drawPolygonEPK6QPointiN12QPaintEngine15PolygonDrawModeE @ 34 NONAME
 	_ZN14QVGPaintEngine11drawPolygonEPK7QPointFiN12QPaintEngine15PolygonDrawModeE @ 35 NONAME
 	_ZN14QVGPaintEngine12brushChangedEv @ 36 NONAME
@@ -198,4 +198,7 @@ EXPORTS
 	_ZTV12QVGImagePool @ 197 NONAME
 	_ZN25QVGEGLWindowSurfaceDirect6scrollEP7QWidgetRK7QRegionii @ 198 NONAME
 	_ZNK25QVGEGLWindowSurfaceDirect22supportsStaticContentsEv @ 199 NONAME
+	_ZN14QVGPaintEngine16drawCachedGlyphsEiPKjRK5QFontP11QFontEngineRK7QPointFPK11QFixedPoint @ 200 NONAME
+	_ZN14QVGPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 201 NONAME
+	_ZN14QVGPaintEngine19drawPixmapFragmentsEPKN8QPainter14PixmapFragmentEiRK7QPixmap6QFlagsINS0_18PixmapFragmentHintEE @ 202 NONAME
 
-- 
cgit v0.12


From 63c46022ca82ee76e4abf60952cf1379f50333c0 Mon Sep 17 00:00:00 2001
From: Shane Kearns <shane.kearns@accenture.com>
Date: Fri, 28 May 2010 16:55:11 +0100
Subject: Fix location of QtMultimedia def files

With the removal of QMediaServices, the multimedia sources were moved up
one level. Therefore they don't need a special case location for the def
files anymore, as the standard rule of ../s60installs used for Qt
libraries is sufficient.

Reviewed-by: Trust Me
---
 src/multimedia/multimedia.pro | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/multimedia/multimedia.pro b/src/multimedia/multimedia.pro
index 93da612..852322d 100644
--- a/src/multimedia/multimedia.pro
+++ b/src/multimedia/multimedia.pro
@@ -13,7 +13,4 @@ include(video/video.pri)
 
 symbian: {
     TARGET.UID3 = 0x2001E627
-    contains(CONFIG, def_files) {
-        DEF_FILE=../../s60installs
-    }
 }
-- 
cgit v0.12


From e27032a8c5e759a0f7132dfbded5d5eeb9d0bbd3 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Sat, 29 May 2010 16:02:22 +0200
Subject: Updated WebKit to eb07c6f9bd50d0d74e9ac19ade4a2fbd5cece7c7

Changes integrated:

|| <https://webkit.org/b/39488> || [Qt] QtTestBrowser is still called QtLauncher in the code ||
|| <https://webkit.org/b/38722> || [Qt] qwebframe auto test doesn't compile ||
|| <https://webkit.org/b/39491> || [Qt] QtTestBrowser has two graphicsview options that aren't enabled correctly ||
|| <https://webkit.org/b/39063> || [Qt] Tiled backing store checker pattern does not paint correctly when scaling factor is not 1 ||
|| <https://webkit.org/b/39217> || Add an optional "starting node' parameter to scrollRecursively and scrollOverflow of EventHandler ||
|| <https://webkit.org/b/38389> || [Qt] Update the Symbian version for the user agent ||
|| <https://webkit.org/b/35702> || [Qt] Add more support for InputTextController ||
|| <https://webkit.org/b/39513> || [Qt] Using Accelerated Composing the rocket back animation on http://www.the-art-of-web.com/css/css-animation/ works differently as when not using AC. ||
|| <https://webkit.org/b/39609> || [Qt] Running with accelerated compositing enabled sometimes result in a crash ||

Plus autotest fix.
---
 src/3rdparty/webkit/.tag                           |  2 +-
 src/3rdparty/webkit/VERSION                        |  2 +-
 src/3rdparty/webkit/WebCore/ChangeLog              | 72 ++++++++++++++++
 src/3rdparty/webkit/WebCore/WebCore.pro            |  2 +-
 src/3rdparty/webkit/WebCore/page/EventHandler.cpp  | 12 ++-
 src/3rdparty/webkit/WebCore/page/EventHandler.h    |  4 +-
 .../platform/graphics/TiledBackingStore.cpp        |  8 +-
 .../webkit/WebCore/platform/graphics/qt/FontQt.cpp | 20 +++--
 .../platform/graphics/qt/GraphicsLayerQt.cpp       | 11 +--
 .../webkit/WebKit/qt/Api/DerivedSources.pro        |  6 +-
 src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp     | 99 ++++++++++++----------
 src/3rdparty/webkit/WebKit/qt/ChangeLog            | 44 ++++++++++
 src/3rdparty/webkit/WebKit/qt/docs/docs.pri        |  2 +-
 .../WebKit/qt/tests/qwebframe/tst_qwebframe.cpp    |  2 +-
 .../WebKit/qt/tests/qwebpage/tst_qwebpage.cpp      |  9 +-
 15 files changed, 221 insertions(+), 74 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index c4a7dd7..a8729b7 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-eb07c6f9bd50d0d74e9ac19ade4a2fbd5cece7c7
+531b0d7cd2af830f0d17b83b6e4a489794481539
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 0899e3c..53687cf 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        807157e42add842605ec67d9363dd3f1861748ca
+        eb07c6f9bd50d0d74e9ac19ade4a2fbd5cece7c7
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 625faa6..e5ae24f 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,75 @@
+2010-05-13  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39063
+        [Qt] Tiled backing store checker pattern does not paint correctly when scaling factor is not 1
+
+        Use the dirty rect that has been adjusted for scaling instead of the original one.
+
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::paint):
+
+2010-05-24  Kenneth Rohde Christiansen  <kenneth@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Make text filling work together with text stroke.
+
+        When the text has stroke a new QPen was set, overriding the pen
+        set for text filling. This patch fixes that by storing the two
+        pens and using where appropriate.
+
+        * platform/graphics/qt/FontQt.cpp:
+        (WebCore::Font::drawComplexText):
+
+2010-05-17  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Add an optional "starting node' parameter to scrollRecursively and scrollOverflow of EventHandler
+        https://bugs.webkit.org/show_bug.cgi?id=39217
+
+        It would be usefull if scrollOverflow and scrollRecursively methods of EventHandler
+        could receive a parameter to specify where to start scrolling from. Currently they
+        start scrolling from either the current focused node or the node where mouse last
+        pressed on. Patch proposes an aditional starting point as an optional parameter.
+        Since it is optional, all call sites can remain as are, and if a Null node is passed
+        in, both methods work as previously.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::scrollOverflow):
+        (WebCore::EventHandler::scrollRecursively):
+        * page/EventHandler.h:
+
+2010-05-23  Noam Rosenthal  <noam.rosenthal@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Using Accelerated Composing the rocket back animation on http://www.the-art-of-web.com/css/css-animation/ works differently as when not using AC.
+        https://bugs.webkit.org/show_bug.cgi?id=39513
+
+        The value of GraphicsLayer->transform() needs to be changed during the animation, regardless of m_fillsForward.
+        m_fillsForward should only apply at the end of the animation. Based on previous patch by Kenneth Christiansen.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::TransformAnimationQt::applyFrame):
+        (WebCore::OpacityAnimationQt::applyFrame):
+
+2010-05-25  Kenneth Rohde Christiansen  <kenneth.christiansen@openbossa.org>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Running with accelerated compositing enabled sometimes result in a crash
+        https://bugs.webkit.org/show_bug.cgi?id=39609
+
+        Check if we have a scene before applying the workaround for
+        the QGraphicsScene bug where opacity change doesn't always have
+        immediate effect.
+
+        * platform/graphics/qt/GraphicsLayerQt.cpp:
+        (WebCore::OpacityAnimationQt::applyFrame):
+
 2010-05-19  Kenneth Rohde Christiansen  <kenneth@webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 63e78a7..5def728 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -159,7 +159,7 @@ defineTest(addExtraCompiler) {
 
     for(file,input) {
         base = $$basename(file)
-        base ~= s/\\..+//
+        base ~= s/\..+//
         newfile=$$replace(outputRule,\\$\\{QMAKE_FILE_BASE\\},$$base)
         SOURCES += $$newfile
     }
diff --git a/src/3rdparty/webkit/WebCore/page/EventHandler.cpp b/src/3rdparty/webkit/WebCore/page/EventHandler.cpp
index 46dd7ae..c40299c 100644
--- a/src/3rdparty/webkit/WebCore/page/EventHandler.cpp
+++ b/src/3rdparty/webkit/WebCore/page/EventHandler.cpp
@@ -929,9 +929,13 @@ void EventHandler::setMousePressNode(PassRefPtr<Node> node)
     m_mousePressNode = node;
 }
 
-bool EventHandler::scrollOverflow(ScrollDirection direction, ScrollGranularity granularity)
+bool EventHandler::scrollOverflow(ScrollDirection direction, ScrollGranularity granularity, Node* startingNode)
 {
-    Node* node = m_frame->document()->focusedNode();
+    Node* node = startingNode;
+
+    if (!node)
+        node = m_frame->document()->focusedNode();
+
     if (!node)
         node = m_mousePressNode.get();
     
@@ -946,9 +950,9 @@ bool EventHandler::scrollOverflow(ScrollDirection direction, ScrollGranularity g
     return false;
 }
 
-bool EventHandler::scrollRecursively(ScrollDirection direction, ScrollGranularity granularity)
+bool EventHandler::scrollRecursively(ScrollDirection direction, ScrollGranularity granularity, Node* startingNode)
 {
-    bool handled = scrollOverflow(direction, granularity);
+    bool handled = scrollOverflow(direction, granularity, startingNode);
     if (!handled) {
         Frame* frame = m_frame;
         do {
diff --git a/src/3rdparty/webkit/WebCore/page/EventHandler.h b/src/3rdparty/webkit/WebCore/page/EventHandler.h
index 282100d..a94e7bf 100644
--- a/src/3rdparty/webkit/WebCore/page/EventHandler.h
+++ b/src/3rdparty/webkit/WebCore/page/EventHandler.h
@@ -130,9 +130,9 @@ public:
 
     static Frame* subframeForTargetNode(Node*);
 
-    bool scrollOverflow(ScrollDirection, ScrollGranularity);
+    bool scrollOverflow(ScrollDirection, ScrollGranularity, Node* startingNode = 0);
 
-    bool scrollRecursively(ScrollDirection, ScrollGranularity);
+    bool scrollRecursively(ScrollDirection, ScrollGranularity, Node* startingNode = 0);
 
 #if ENABLE(DRAG_SUPPORT)
     bool shouldDragAutoNode(Node*, const IntPoint&) const; // -webkit-user-drag == auto
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp
index f00e792..0250061 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp
@@ -120,9 +120,11 @@ void TiledBackingStore::paint(GraphicsContext* context, const IntRect& rect)
             if (currentTile && currentTile->isReadyToPaint())
                 currentTile->paint(context, dirtyRect);
             else {
-                FloatRect tileRect = tileRectForCoordinate(currentCoordinate);
-                FloatRect target = intersection(tileRect, FloatRect(rect));
-                Tile::paintCheckerPattern(context, target);
+                IntRect tileRect = tileRectForCoordinate(currentCoordinate);
+                IntRect target = intersection(tileRect, dirtyRect);
+                if (target.isEmpty())
+                    continue;
+                Tile::paintCheckerPattern(context, FloatRect(target));
             }
         }
     }
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp
index 1e92dcc..b707f9d 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp
@@ -73,28 +73,31 @@ void Font::drawComplexText(GraphicsContext* ctx, const TextRun& run, const Float
 
     QPainter *p = ctx->platformContext();
 
+    QPen textFillPen;
     if (ctx->textDrawingMode() & cTextFill) {
         if (ctx->fillGradient()) {
             QBrush brush(*ctx->fillGradient()->platformGradient());
             brush.setTransform(ctx->fillGradient()->gradientSpaceTransform());
-            p->setPen(QPen(brush, 0));
+            textFillPen = QPen(brush, 0);
         } else if (ctx->fillPattern()) {
             AffineTransform affine;
-            p->setPen(QPen(QBrush(ctx->fillPattern()->createPlatformPattern(affine)), 0));
+            textFillPen = QPen(QBrush(ctx->fillPattern()->createPlatformPattern(affine)), 0);
         } else
-            p->setPen(QColor(ctx->fillColor()));
+            textFillPen = QPen(QColor(ctx->fillColor()));
     }
 
+    QPen textStrokePen;
     if (ctx->textDrawingMode() & cTextStroke) {
         if (ctx->strokeGradient()) {
             QBrush brush(*ctx->strokeGradient()->platformGradient());
             brush.setTransform(ctx->strokeGradient()->gradientSpaceTransform());
-            p->setPen(QPen(brush, ctx->strokeThickness()));
+            textStrokePen = QPen(brush, ctx->strokeThickness());
         } else if (ctx->strokePattern()) {
             AffineTransform affine;
-            p->setPen(QPen(QBrush(ctx->strokePattern()->createPlatformPattern(affine)), ctx->strokeThickness()));
+            QBrush brush(ctx->strokePattern()->createPlatformPattern(affine));
+            textStrokePen = QPen(brush, ctx->strokeThickness());
         } else
-            p->setPen(QPen(QColor(ctx->strokeColor()), ctx->strokeThickness()));
+            textStrokePen = QPen(QColor(ctx->strokeColor()), ctx->strokeThickness());
     }
 
     String sanitized = Font::normalizeSpaces(String(run.characters(), run.length()));
@@ -163,10 +166,13 @@ void Font::drawComplexText(GraphicsContext* ctx, const TextRun& run, const Float
     if (ctx->textDrawingMode() & cTextStroke) {
         QPainterPath path;
         path.addText(pt, font(), string);
+        p->setPen(textStrokePen);
         p->strokePath(path, p->pen());
     }
-    if (ctx->textDrawingMode() & cTextFill)
+    if (ctx->textDrawingMode() & cTextFill) {
+        p->setPen(textFillPen);
         p->drawText(pt, string, flags, run.padding());
+    }
 }
 
 float Font::floatWidthForComplexText(const TextRun& run, HashSet<const SimpleFontData*>*) const
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
index 969e00a..02bf25e 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsLayerQt.cpp
@@ -1191,9 +1191,9 @@ public:
             transformMatrix.blend(m_sourceMatrix, progress);
         }
 
+        m_layer.data()->m_layer->setTransform(transformMatrix);
+        // We force the actual opacity change, otherwise it would be ignored because of the animation.
         m_layer.data()->setBaseTransform(transformMatrix);
-        if (m_fillsForwards)
-            m_layer.data()->m_layer->setTransform(m_layer.data()->m_baseTransform);
     }
 
     virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
@@ -1231,18 +1231,19 @@ public:
         if (m_fillsForwards)
             setCurrentTime(1);
     }
+
     virtual void applyFrame(const qreal& fromValue, const qreal& toValue, qreal progress)
     {
         qreal opacity = qBound(qreal(0), fromValue + (toValue-fromValue)*progress, qreal(1));
 
         // FIXME: this is a hack, due to a probable QGraphicsScene bug.
         // Without this the opacity change doesn't always have immediate effect.
-        if (!m_layer.data()->opacity() && opacity)
+        if (m_layer.data()->scene() && !m_layer.data()->opacity() && opacity)
             m_layer.data()->scene()->update();
 
+        m_layer.data()->m_layer->setOpacity(opacity);
+        // We force the actual opacity change, otherwise it would be ignored because of the animation.
         m_layer.data()->setOpacity(opacity);
-        if (m_fillsForwards)
-            m_layer.data()->m_layer->setOpacity(opacity);
     }
 
     virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState)
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro b/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
index 22d4c8d..389fb5f 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
+++ b/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
@@ -28,7 +28,7 @@ qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}define QT_QTWEBKIT_MOD
 qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}include $${ESCAPE}<QtNetwork/QtNetwork$${ESCAPE}>$${QUOTE} >> $${qtheader_module.target} &&
 WEBKIT_CLASS_HEADERS = $${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}PWD/QtWebKit
 
-regex = ".*\\sclass\\sQWEBKIT_EXPORT\\s(\\w+)\\s(.*)"
+regex = ".*\sclass\sQWEBKIT_EXPORT\s(\w+)\s(.*)"
 
 for(HEADER, WEBKIT_API_HEADERS) {
     # 1. Append to QtWebKit header that includes all other header files
@@ -70,7 +70,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
         res = $$find(src, $$regex)
         isEmpty(res):break()
 
-        exp = $$replace(src, $$regex, "EXPORTED_CLASS = \\1")
+        exp = $$replace(src, $$regex, "EXPORTED_CLASS = \1")
         eval($$exp)
 
         CLASS_TARGET = "qtheader_$${EXPORTED_CLASS}"
@@ -87,7 +87,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
 
         # Qt's QRegExp does not support inline non-greedy matching,
         # so we'll have to work around it by updating the haystack
-        src = $$replace(src, $$regex, "\\2")
+        src = $$replace(src, $$regex, "\2")
         src_words = $$join(src, $${LITERAL_WHITESPACE})
     }
 }
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 44bd902..b7182b4 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -1294,6 +1294,9 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev)
 {
     WebCore::Frame *frame = page->focusController()->focusedOrMainFrame();
     WebCore::Editor *editor = frame->editor();
+#if QT_VERSION >= 0x040600
+    QInputMethodEvent::Attribute selection(QInputMethodEvent::Selection, 0, 0, QVariant());
+#endif
 
     if (!editor->canEdit()) {
         ev->ignore();
@@ -1310,6 +1313,7 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev)
         renderTextControl = toRenderTextControl(renderer);
 
     Vector<CompositionUnderline> underlines;
+    bool hasSelection = false;
 
     for (int i = 0; i < ev->attributes().size(); ++i) {
         const QInputMethodEvent::Attribute& a = ev->attributes().at(i);
@@ -1333,10 +1337,8 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev)
         }
 #if QT_VERSION >= 0x040600
         case QInputMethodEvent::Selection: {
-            if (renderTextControl) {
-                renderTextControl->setSelectionStart(qMin(a.start, (a.start + a.length)));
-                renderTextControl->setSelectionEnd(qMax(a.start, (a.start + a.length)));
-            }
+            selection = a;
+            hasSelection = true;
             break;
         }
 #endif
@@ -1345,10 +1347,25 @@ void QWebPagePrivate::inputMethodEvent(QInputMethodEvent *ev)
 
     if (!ev->commitString().isEmpty())
         editor->confirmComposition(ev->commitString());
-    else if (!ev->preeditString().isEmpty()) {
+    else {
+        // 1. empty preedit with a selection attribute, and start/end of 0 cancels composition
+        // 2. empty preedit with a selection attribute, and start/end of non-0 updates selection of current preedit text
+        // 3. populated preedit with a selection attribute, and start/end of 0 or non-0 updates selection of supplied preedit text
+        // 4. otherwise event is updating supplied pre-edit text
         QString preedit = ev->preeditString();
-        editor->setComposition(preedit, underlines, preedit.length(), 0);
+#if QT_VERSION >= 0x040600
+        if (hasSelection) {
+            QString text = (renderTextControl) ? QString(renderTextControl->text()) : QString();
+            if (preedit.isEmpty() && selection.start + selection.length > 0)
+                preedit = text;
+            editor->setComposition(preedit, underlines,
+                                   (selection.length < 0) ? selection.start + selection.length : selection.start,
+                                   (selection.length < 0) ? selection.start : selection.start + selection.length);
+        } else
+#endif
+            editor->setComposition(preedit, underlines, preedit.length(), 0);
     }
+
     ev->accept();
 }
 
@@ -3329,12 +3346,37 @@ QString QWebPage::userAgentForUrl(const QUrl&) const
 #elif defined Q_WS_X11
         "X11"
 #elif defined Q_OS_SYMBIAN
-        "SymbianOS"
+        "Symbian"
 #else
         "Unknown"
 #endif
     );
 
+#if defined Q_OS_SYMBIAN
+        QSysInfo::SymbianVersion symbianVersion = QSysInfo::symbianVersion();
+        switch (symbianVersion) {
+        case QSysInfo::SV_9_2:
+            firstPartTemp += QString::fromLatin1("OS/9.2");
+            break;
+        case QSysInfo::SV_9_3:
+            firstPartTemp += QString::fromLatin1("OS/9.3");
+            break;                
+        case QSysInfo::SV_9_4:
+            firstPartTemp += QString::fromLatin1("OS/9.4");
+            break;
+        case QSysInfo::SV_SF_2:
+            firstPartTemp += QString::fromLatin1("/2");
+            break;
+        case QSysInfo::SV_SF_3:
+            firstPartTemp += QString::fromLatin1("/3");
+            break;
+        case QSysInfo::SV_SF_4:
+            firstPartTemp += QString::fromLatin1("/4");
+        default:
+            break;
+        }
+#endif
+
         firstPartTemp += QString::fromLatin1("; ");
 
         // SSL support
@@ -3458,51 +3500,22 @@ QString QWebPage::userAgentForUrl(const QUrl&) const
         firstPartTemp += QString::fromLatin1("Sun Solaris");
 #elif defined Q_OS_ULTRIX
         firstPartTemp += QString::fromLatin1("DEC Ultrix");
-#elif defined Q_OS_SYMBIAN
-        firstPartTemp += QString::fromLatin1("SymbianOS");
-        QSysInfo::SymbianVersion symbianVersion = QSysInfo::symbianVersion();
-        switch (symbianVersion) {
-        case QSysInfo::SV_9_2:
-            firstPartTemp += QString::fromLatin1("/9.2");
-            break;
-        case QSysInfo::SV_9_3:
-            firstPartTemp += QString::fromLatin1("/9.3");
-            break;
-        case QSysInfo::SV_9_4:
-            firstPartTemp += QString::fromLatin1("/9.4");
-            break;
-        case QSysInfo::SV_SF_2:
-            firstPartTemp += QString::fromLatin1("^2");
-            break;
-        case QSysInfo::SV_SF_3:
-            firstPartTemp += QString::fromLatin1("^3");
-            break;
-        case QSysInfo::SV_SF_4:
-            firstPartTemp += QString::fromLatin1("^4");
-            break;
-        default:
-            firstPartTemp += QString::fromLatin1("/Unknown");
-        }
-
-#if defined Q_WS_S60
+#elif defined Q_WS_S60
         firstPartTemp += QLatin1Char(' ');
-        firstPartTemp += QString::fromLatin1("Series60");
         QSysInfo::S60Version s60Version = QSysInfo::s60Version();
         switch (s60Version) {
         case QSysInfo::SV_S60_3_1:
-            firstPartTemp += QString::fromLatin1("/3.1");
+            firstPartTemp += QString::fromLatin1("Series60/3.1");
             break;
         case QSysInfo::SV_S60_3_2:
-            firstPartTemp += QString::fromLatin1("/3.2");
+            firstPartTemp += QString::fromLatin1("Series60/3.2");
             break;
         case QSysInfo::SV_S60_5_0:
-            firstPartTemp += QString::fromLatin1("/5.0");
+            firstPartTemp += QString::fromLatin1("Series60/5.0");
             break;
         default:
-            firstPartTemp += QString::fromLatin1("/Unknown");
+            break;
         }
-#endif
-
 #elif defined Q_OS_UNIX
         firstPartTemp += QString::fromLatin1("UNIX BSD/SYSV system");
 #elif defined Q_OS_UNIXWARE
@@ -3532,8 +3545,8 @@ QString QWebPage::userAgentForUrl(const QUrl&) const
 
         QString thirdPartTemp;
         thirdPartTemp.reserve(150);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
-        thirdPartTemp + QLatin1String(" Mobile Safari/");
+#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
+        thirdPartTemp += QLatin1String(" Mobile Safari/");
 #else
         thirdPartTemp += QLatin1String(" Safari/");
 #endif
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 2f87c7b..79c1ef3 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,47 @@
+2010-04-20  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Add more support for textInputController
+
+        Add support for selectedRange(), setMarkedText(), insertText(),
+        and firstRectForCharacterRange().
+
+        https://bugs.webkit.org/show_bug.cgi?id=35702
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::inputMethodEvent):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::inputMethods):
+
+2010-05-20  Janne Koskinen  <janne.p.koskinen@digia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] WINSCW compile fix for qwebframe test
+        https://bugs.webkit.org/show_bug.cgi?id=38722
+
+        WINSCW cannot determine template type up the hierarchy
+        to common base class.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+
+2010-05-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Update the Symbian version for the user agent
+        https://bugs.webkit.org/show_bug.cgi?id=38389
+
+        Fixes a regression introduced by r58648. Ensure that the "Symbian" string
+        is only listed one time in the User Agent string.
+
+        In addition make an effort to align the User Agent string to already
+        released WebKit based products for Symbian.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+
 2010-05-21  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Symbian build fix.
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/docs.pri b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
index a56ddb4..804817b 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
+++ b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri
@@ -3,7 +3,7 @@ include(../../../WebKit.pri)
 unix {
     QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/bin/qdoc3
 } else {
-    QDOC = $$(QTDIR)\\bin\\qdoc3.exe
+    QDOC = $$(QTDIR)\bin\qdoc3.exe
 }
 
 unix {
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index c53a42d..76fdba3 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -785,7 +785,7 @@ void tst_QWebFrame::getSetStaticProperty()
         QCOMPARE(vm.size(), 3);
         QCOMPARE(vm.value("a").toInt(), 123);
         QCOMPARE(vm.value("b").toString(), QLatin1String("foo"));
-        QCOMPARE(vm.value("c").value<QObject*>(), m_myObject);
+        QCOMPARE(vm.value("c").value<QObject*>(), static_cast<QObject*>(m_myObject));
     }
     QCOMPARE(evalJS("myObject.variantMapProperty.a === 123"), sTrue);
     QCOMPARE(evalJS("myObject.variantMapProperty.b === 'foo'"), sTrue);
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 52dc6bb..19c6bde 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -1450,11 +1450,16 @@ void tst_QWebPage::inputMethods()
     QString selectionValue = variant.value<QString>();
     QCOMPARE(selectionValue, QString("eb"));
 
-    //Set selection with negative length
-    inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 6, -5, QVariant());
+    //Cancel current composition first
+    inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 0, 0, QVariant());
     QInputMethodEvent eventSelection2("",inputAttributes);
     page->event(&eventSelection2);
 
+    //Set selection with negative length
+    inputAttributes << QInputMethodEvent::Attribute(QInputMethodEvent::Selection, 6, -5, QVariant());
+    QInputMethodEvent eventSelection3("",inputAttributes);
+    page->event(&eventSelection3);
+
     //ImAnchorPosition
     variant = page->inputMethodQuery(Qt::ImAnchorPosition);
     anchorPosition =  variant.toInt();
-- 
cgit v0.12


From 130cf33cdc1a1f7c2a0b33fcef0ac63b8163306d Mon Sep 17 00:00:00 2001
From: Alan Alpert <alan.alpert@nokia.com>
Date: Sun, 30 May 2010 10:52:42 +1000
Subject: Some tweaks on the QML-enhanced QtDemo

-don't crash if we aren't showing the FPS
-different method of unloading the QML example when hidden
-fix screwed up background when scaled.
---
 demos/qtdemo/menumanager.cpp | 25 ++++++++++++++++---------
 demos/qtdemo/menumanager.h   |  1 -
 demos/qtdemo/qmlShell.qml    |  1 +
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
index 9e2ba6b..a2ceb0e 100644
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
@@ -378,13 +378,19 @@ void MenuManager::launchQmlExample(const QString &name)
             return;
         }
     }
+    if(!Colors::noBlur){
+        QImage qmlBgImage(this->window->rect().size(), QImage::Format_ARGB32_Premultiplied);
+        QPainter painter(&qmlBgImage);
+        if(Colors::showFps)
+            this->window->fpsLabel->setOpacity(0);
+        this->window->render(&painter);
+        if(Colors::showFps)
+            this->window->fpsLabel->setOpacity(1.0);
+        Qt::ImageConversionFlags convFlags = Qt::AvoidDither | Qt::NoOpaqueDetection;
+        this->declarativeEngine->rootContext()->setContextProperty("bgAppPixmap", QVariant(QPixmap::fromImage(qmlBgImage, convFlags)));
+    }
 
-    QPainter painter(qmlBgImage);
-    this->window->fpsLabel->setOpacity(0);
-    this->window->render(&painter);
-    this->window->fpsLabel->setOpacity(1.0);
-    Qt::ImageConversionFlags convFlags = Qt::AvoidDither | Qt::NoOpaqueDetection;
-    this->declarativeEngine->rootContext()->setContextProperty("bgAppPixmap", QVariant(QPixmap::fromImage(*qmlBgImage, convFlags)));
+    qmlRoot->setProperty("qmlFile", QVariant(""));//unload component
     qmlRoot->setProperty("show", QVariant(true));
     qmlRoot->setProperty("qmlFile", QUrl::fromLocalFile(file.fileName()));
 }
@@ -439,10 +445,11 @@ void MenuManager::init(MainWindow *window)
 
     // Note that we paint the background into a static image for a theorized performance improvement when blurring
     // It has not yet been determined what, if any, speed up this gives (but is left in 'cause the QML expects it now)
-    this->qmlBgImage = new QImage(window->sceneRect().size().toSize(), QImage::Format_ARGB32);
-    this->qmlBgImage->fill(0);
     declarativeEngine->rootContext()->setContextProperty("useBlur", !Colors::noBlur);
-    declarativeEngine->rootContext()->setContextProperty("bgAppPixmap", QVariant(QPixmap::fromImage(*qmlBgImage)));
+    QImage qmlBgImage(this->window->rect().size(), QImage::Format_ARGB32_Premultiplied);
+    qmlBgImage.fill(0);
+    this->declarativeEngine->rootContext()->setContextProperty("bgAppPixmap", QVariant(QPixmap::fromImage(qmlBgImage)));
+
     QDeclarativeComponent component(declarativeEngine, QUrl("qrc:qml/qmlShell.qml"), this);
     qmlRoot = 0;
     if(component.isReady())
diff --git a/demos/qtdemo/menumanager.h b/demos/qtdemo/menumanager.h
index e90e02c..5e14204 100644
--- a/demos/qtdemo/menumanager.h
+++ b/demos/qtdemo/menumanager.h
@@ -85,7 +85,6 @@ public:
 
     QDeclarativeEngine* declarativeEngine;
     QDeclarativeItem *qmlRoot;
-    QImage *qmlBgImage;
 
 private slots:
     void exampleFinished();
diff --git a/demos/qtdemo/qmlShell.qml b/demos/qtdemo/qmlShell.qml
index b9021e8..b1ee79a 100644
--- a/demos/qtdemo/qmlShell.qml
+++ b/demos/qtdemo/qmlShell.qml
@@ -167,6 +167,7 @@ Item {
             SequentialAnimation{
                 PropertyAction { target: bg; property: useBlur?"y":"opacity";}//fade in blurred background only if blurred
                 NumberAnimation{ properties: "opacity"; easing.type: Easing.InQuad; duration: 500}
+                PropertyAction { target: loader; property: "focus"; value: true}//Might be needed to ensure the focus stays with us
             }
         }
     ]
-- 
cgit v0.12


From 8a3eee2e2717f2f6ab3ee3223bf798450b9ef39c Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Sun, 30 May 2010 18:39:10 +0200
Subject: Updated WebKit to 531b0d7cd2af830f0d17b83b6e4a489794481539

Fixes integrated:

|| <https://webkit.org/b/39784> || [Qt] REGRESSION(r59837): Incorrect clipping of TransparencyLayers ||
|| <https://webkit.org/b/39874> || [Qt] Make tiled backing store more configurable ||
|| <https://webkit.org/b/29899> || [Qt] Add a way to stop delayed redirect requests ||
---
 src/3rdparty/webkit/.tag                           |  2 +-
 src/3rdparty/webkit/VERSION                        |  2 +-
 src/3rdparty/webkit/WebCore/ChangeLog              | 33 +++++++++++++
 .../platform/graphics/TiledBackingStore.cpp        | 33 ++++++++++---
 .../WebCore/platform/graphics/TiledBackingStore.h  | 17 +++++++
 .../platform/graphics/qt/GraphicsContextQt.cpp     |  4 +-
 src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp     | 56 ++++++++++++++++++++++
 src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h       |  2 +
 src/3rdparty/webkit/WebKit/qt/ChangeLog            | 36 ++++++++++++++
 .../WebKit/qt/tests/qwebpage/tst_qwebpage.cpp      | 28 ++++++++++-
 10 files changed, 202 insertions(+), 11 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index a8729b7..49b1cbe 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-531b0d7cd2af830f0d17b83b6e4a489794481539
+c58dc2f491a824ac56e31c440fcf7fe16dab09c4
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 53687cf..1db0c55 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        eb07c6f9bd50d0d74e9ac19ade4a2fbd5cece7c7
+        531b0d7cd2af830f0d17b83b6e4a489794481539
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index e5ae24f..daf10fa 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,36 @@
+2010-05-28  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39874
+        [Qt] Make tiled backing store more configurable
+    
+        Make tile size, tile creation delay and tiling area dynamically configurable.
+
+        * platform/graphics/TiledBackingStore.cpp:
+        (WebCore::TiledBackingStore::TiledBackingStore):
+        (WebCore::TiledBackingStore::setTileSize):
+        (WebCore::TiledBackingStore::setTileCreationDelay):
+        (WebCore::TiledBackingStore::setKeepAndCoverAreaMultipliers):
+        (WebCore::TiledBackingStore::createTiles):
+        * platform/graphics/TiledBackingStore.h:
+        (WebCore::TiledBackingStore::tileSize):
+        (WebCore::TiledBackingStore::tileCreationDelay):
+        (WebCore::TiledBackingStore::getKeepAndCoverAreaMultipliers):
+
+2010-05-28  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] REGRESSION(r59837): Incorrect clipping of TransparencyLayers
+        https://bugs.webkit.org/show_bug.cgi?id=39784
+
+        Move coordinate transformation from TransparencyLayer to clipToImageBuffer()
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+        (WebCore::TransparencyLayer::TransparencyLayer):
+        (WebCore::GraphicsContext::clipToImageBuffer):
+
 2010-05-13  Antti Koivisto  <koivisto@iki.fi>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp
index 0250061..1d6f237 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.cpp
@@ -35,6 +35,9 @@ TiledBackingStore::TiledBackingStore(TiledBackingStoreClient* client)
     , m_tileBufferUpdateTimer(new TileTimer(this, &TiledBackingStore::tileBufferUpdateTimerFired))
     , m_tileCreationTimer(new TileTimer(this, &TiledBackingStore::tileCreationTimerFired))
     , m_tileSize(defaultTileWidth, defaultTileHeight)
+    , m_tileCreationDelay(0.01)
+    , m_keepAreaMultiplier(2.f, 3.5f)
+    , m_coverAreaMultiplier(1.5f, 2.5f)
     , m_contentsScale(1.f)
     , m_pendingScale(0)
     , m_contentsFrozen(false)
@@ -46,6 +49,25 @@ TiledBackingStore::~TiledBackingStore()
     delete m_tileBufferUpdateTimer;
     delete m_tileCreationTimer;
 }
+    
+void TiledBackingStore::setTileSize(const IntSize& size)
+{
+    m_tileSize = size;
+    m_tiles.clear();
+    startTileCreationTimer();
+}
+
+void TiledBackingStore::setTileCreationDelay(double delay)
+{
+    m_tileCreationDelay = delay;
+}
+
+void TiledBackingStore::setKeepAndCoverAreaMultipliers(const FloatSize& keepMultiplier, const FloatSize& coverMultiplier)
+{
+    m_keepAreaMultiplier = keepMultiplier;
+    m_coverAreaMultiplier = coverMultiplier;
+    startTileCreationTimer();
+}
 
 void TiledBackingStore::invalidate(const IntRect& contentsDirtyRect)
 {
@@ -188,17 +210,16 @@ void TiledBackingStore::createTiles()
     // Remove tiles that extend outside the current contents rect.
     dropOverhangingTiles();
 
-    // FIXME: Make configurable/adapt to memory.
     IntRect keepRect = visibleRect;
-    keepRect.inflateX(visibleRect.width());
-    keepRect.inflateY(3 * visibleRect.height());
+    keepRect.inflateX(visibleRect.width() * (m_keepAreaMultiplier.width() - 1.f));
+    keepRect.inflateY(visibleRect.height() * (m_keepAreaMultiplier.height() - 1.f));
     keepRect.intersect(contentsRect());
     
     dropTilesOutsideRect(keepRect);
     
     IntRect coverRect = visibleRect;
-    coverRect.inflateX(visibleRect.width() / 2);
-    coverRect.inflateY(2 * visibleRect.height());
+    coverRect.inflateX(visibleRect.width() * (m_coverAreaMultiplier.width() - 1.f));
+    coverRect.inflateY(visibleRect.height() * (m_coverAreaMultiplier.height() - 1.f));
     coverRect.intersect(contentsRect());
     
     // Search for the tile position closest to the viewport center that does not yet contain a tile. 
@@ -240,7 +261,7 @@ void TiledBackingStore::createTiles()
 
     // Keep creating tiles until the whole coverRect is covered.
     if (requiredTileCount)
-        m_tileCreationTimer->startOneShot(0);
+        m_tileCreationTimer->startOneShot(m_tileCreationDelay);
 }
 
 void TiledBackingStore::dropOverhangingTiles()
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.h b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.h
index d12f191..58477db 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.h
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/TiledBackingStore.h
@@ -51,6 +51,20 @@ public:
 
     void invalidate(const IntRect& dirtyRect);
     void paint(GraphicsContext*, const IntRect&);
+    
+    IntSize tileSize() { return m_tileSize; }
+    void setTileSize(const IntSize&);
+    
+    double tileCreationDelay() const { return m_tileCreationDelay; }
+    void setTileCreationDelay(double delay);
+    
+    // Tiled are dropped outside the keep area, and created for cover area. The values a relative to the viewport size.
+    void getKeepAndCoverAreaMultipliers(FloatSize& keepMultiplier, FloatSize& coverMultiplier)
+    {
+        keepMultiplier = m_keepAreaMultiplier;
+        coverMultiplier = m_coverAreaMultiplier;
+    }
+    void setKeepAndCoverAreaMultipliers(const FloatSize& keepMultiplier, const FloatSize& coverMultiplier);    
 
 private:
     void startTileBufferUpdateTimer();
@@ -94,6 +108,9 @@ private:
     TileTimer* m_tileCreationTimer;
 
     IntSize m_tileSize;
+    double m_tileCreationDelay;
+    FloatSize m_keepAreaMultiplier;
+    FloatSize m_coverAreaMultiplier;
     
     IntRect m_previousVisibleRect;
     float m_contentsScale;
diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
index 69121c8..bdb810a 100644
--- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
+++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp
@@ -173,7 +173,7 @@ struct TransparencyLayer : FastAllocBase {
         , alphaMask(alphaMask)
         , saveCounter(1) // see the comment for saveCounter
     {
-        offset = p->transform().mapRect(rect).topLeft();
+        offset = rect.topLeft();
         pixmap.fill(Qt::transparent);
         painter.begin(&pixmap);
         painter.setRenderHint(QPainter::Antialiasing, p->testRenderHint(QPainter::Antialiasing));
@@ -1125,7 +1125,7 @@ void GraphicsContext::clipToImageBuffer(const FloatRect& floatRect, const ImageB
     if (alphaMask.width() != rect.width() || alphaMask.height() != rect.height())
         alphaMask = alphaMask.scaled(rect.width(), rect.height());
 
-    m_data->layers.push(new TransparencyLayer(m_data->p(), rect, 1.0, alphaMask));
+    m_data->layers.push(new TransparencyLayer(m_data->p(), m_data->p()->transform().mapRect(rect), 1.0, alphaMask));
 }
 
 void GraphicsContext::addInnerRoundedRectClip(const IntRect& rect,
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index b7182b4..a61ca2e 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -51,6 +51,7 @@
 #include "EditorClientQt.h"
 #include "SecurityOrigin.h"
 #include "Settings.h"
+#include "TiledBackingStore.h"
 #include "Page.h"
 #include "Pasteboard.h"
 #include "FrameLoader.h"
@@ -1386,7 +1387,42 @@ void QWebPagePrivate::dynamicPropertyChangeEvent(QDynamicPropertyChangeEvent* ev
     } else if (event->propertyName() == "_q_HTMLTokenizerTimeDelay") {
         double timeDelay = q->property("_q_HTMLTokenizerTimeDelay").toDouble();
         q->handle()->page->setCustomHTMLTokenizerTimeDelay(timeDelay);
+    } 
+#if ENABLE(TILED_BACKING_STORE)
+    else if (event->propertyName() == "_q_TiledBackingStoreTileSize") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
+        QSize tileSize = q->property("_q_TiledBackingStoreTileSize").toSize();
+        frame->tiledBackingStore()->setTileSize(tileSize);
+    } else if (event->propertyName() == "_q_TiledBackingStoreTileCreationDelay") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
+        int tileCreationDelay = q->property("_q_TiledBackingStoreTileCreationDelay").toInt();
+        frame->tiledBackingStore()->setTileCreationDelay(static_cast<double>(tileCreationDelay) / 1000.);
+    } else if (event->propertyName() == "_q_TiledBackingStoreKeepAreaMultiplier") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
+        FloatSize keepMultiplier;
+        FloatSize coverMultiplier;
+        frame->tiledBackingStore()->getKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+        QSizeF qSize = q->property("_q_TiledBackingStoreKeepAreaMultiplier").toSizeF();
+        keepMultiplier = FloatSize(qSize.width(), qSize.height());
+        frame->tiledBackingStore()->setKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+    } else if (event->propertyName() == "_q_TiledBackingStoreCoverAreaMultiplier") {
+        WebCore::Frame* frame = QWebFramePrivate::core(q->mainFrame());
+        if (!frame->tiledBackingStore())
+            return;
+        FloatSize keepMultiplier;
+        FloatSize coverMultiplier;
+        frame->tiledBackingStore()->getKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
+        QSizeF qSize = q->property("_q_TiledBackingStoreCoverAreaMultiplier").toSizeF();
+        coverMultiplier = FloatSize(qSize.width(), qSize.height());
+        frame->tiledBackingStore()->setKeepAndCoverAreaMultipliers(keepMultiplier, coverMultiplier);
     }
+#endif
 }
 
 void QWebPagePrivate::shortcutOverrideEvent(QKeyEvent* event)
@@ -1709,6 +1745,7 @@ InspectorController* QWebPagePrivate::inspectorController()
     \value Back Navigate back in the history of navigated links.
     \value Forward Navigate forward in the history of navigated links.
     \value Stop Stop loading the current page.
+    \value StopScheduledPageRefresh Stop all pending page refresh/redirect requests.
     \value Reload Reload the current page.
     \value ReloadAndBypassCache Reload the current page, but do not use any local cache. (Added in Qt 4.6)
     \value Cut Cut the content currently selected into the clipboard.
@@ -2114,6 +2151,15 @@ static void openNewWindow(const QUrl& url, WebCore::Frame* frame)
     }
 }
 
+static void collectChildFrames(QWebFrame* frame, QList<QWebFrame*>& list)
+{
+    list << frame->childFrames();
+    QListIterator<QWebFrame*> it(frame->childFrames());
+    while (it.hasNext()) {
+        collectChildFrames(it.next(), list);
+    }
+}
+
 /*!
     This function can be called to trigger the specified \a action.
     It is also called by QtWebKit if the user triggers the action, for example
@@ -2210,6 +2256,16 @@ void QWebPage::triggerAction(WebAction action, bool)
 #endif
             break;
         }
+        case StopScheduledPageRefresh: {
+            QWebFrame* topFrame = mainFrame();
+            topFrame->d->frame->redirectScheduler()->cancel();
+            QList<QWebFrame*> childFrames;
+            collectChildFrames(topFrame, childFrames);
+            QListIterator<QWebFrame*> it(childFrames);
+            while (it.hasNext())
+                it.next()->d->frame->redirectScheduler()->cancel();
+            break;
+        }
         default:
             command = QWebPagePrivate::editorCommandForWebActions(action);
             break;
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h
index 1adde06..34f675b 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.h
@@ -169,6 +169,8 @@ public:
         AlignLeft,
         AlignRight,
 
+        StopScheduledPageRefresh,
+
         WebActionCount
     };
 
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 79c1ef3..cc2d39a 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,39 @@
+2010-05-28  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+    
+        Add a missing #if ENABLE(), some null checking.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+
+2010-05-28  Antti Koivisto  <koivisto@iki.fi>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        https://bugs.webkit.org/show_bug.cgi?id=39874
+        [Qt] Make tiled backing store more configurable
+    
+        Make tile size, tile creation delay and tiling area dynamically configurable.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::dynamicPropertyChangeEvent):
+
+2010-05-29  Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Added a WebAction to stop all pending page refresh/redirect
+        requests set through the <meta http-equiv="refresh"...> tag.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29899
+
+        * Api/qwebpage.cpp:
+        (QWebPage::triggerAction):
+        * Api/qwebpage.h:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::testStopScheduledPageRefresh):
+
 2010-04-20  Robert Hogan  <robert@webkit.org>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 19c6bde..27f4b27 100644
--- a/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -121,7 +121,8 @@ private slots:
     void originatingObjectInNetworkRequests();
     void testJSPrompt();
     void showModalDialog();
-
+    void testStopScheduledPageRefresh();
+    
 private:
     QWebView* m_view;
     QWebPage* m_page;
@@ -2095,5 +2096,30 @@ void tst_QWebPage::showModalDialog()
     QCOMPARE(res, QString("This is a test"));
 }
 
+void tst_QWebPage::testStopScheduledPageRefresh()
+{    
+    // Without QWebPage::StopScheduledPageRefresh
+    QWebPage page1;
+    page1.setNetworkAccessManager(new TestNetworkManager(&page1));
+    page1.mainFrame()->setHtml("<html><head>"
+                                "<meta http-equiv=\"refresh\"content=\"0;URL=http://qt.nokia.com/favicon.ico\">"
+                                "</head><body><h1>Page redirects immediately...</h1>"
+                                "</body></html>");
+    QVERIFY(::waitForSignal(&page1, SIGNAL(loadFinished(bool))));
+    QTest::qWait(500);
+    QCOMPARE(page1.mainFrame()->url().toString(), QString("http://qt.nokia.com/favicon.ico"));
+    
+    // With QWebPage::StopScheduledPageRefresh
+    QWebPage page2;
+    page2.setNetworkAccessManager(new TestNetworkManager(&page2));
+    page2.mainFrame()->setHtml("<html><head>"
+                               "<meta http-equiv=\"refresh\"content=\"1;URL=http://qt.nokia.com/favicon.ico\">"
+                               "</head><body><h1>Page redirect test with 1 sec timeout...</h1>"
+                               "</body></html>");
+    page2.triggerAction(QWebPage::StopScheduledPageRefresh);
+    QTest::qWait(1500);
+    QCOMPARE(page2.mainFrame()->url().toString(), QString("about:blank"));
+}
+
 QTEST_MAIN(tst_QWebPage)
 #include "tst_qwebpage.moc"
-- 
cgit v0.12


From e66fe7ea65b218dd320cb553bf6669d2a2021657 Mon Sep 17 00:00:00 2001
From: Warwick Allison <warwick.allison@nokia.com>
Date: Fri, 28 May 2010 11:55:11 +1000
Subject: Add selection methods to TextEdit Sufficient to allow different
 selection look and feel (see whacky example)

Task-number: QTBUG-10968
Reviewed-by: Michael Brasser
Reviewed-by: Alan Alpert
---
 examples/declarative/text/edit/edit.qml            | 248 +++++++++++++++++++++
 examples/declarative/text/edit/pics/endHandle.png  | Bin 0 -> 185 bytes
 examples/declarative/text/edit/pics/endHandle.sci  |   5 +
 .../declarative/text/edit/pics/startHandle.png     | Bin 0 -> 178 bytes
 .../declarative/text/edit/pics/startHandle.sci     |   5 +
 src/declarative/QmlChanges.txt                     |   2 +
 .../graphicsitems/qdeclarativetextedit.cpp         | 116 ++++++++++
 .../graphicsitems/qdeclarativetextedit_p.h         |   8 +
 .../graphicsitems/qdeclarativetextinput.cpp        |   4 +-
 .../graphicsitems/qdeclarativetextinput_p.h        |   2 +-
 .../qdeclarativetextedit/MultilineEdit.qml         |  74 ++++++
 .../qdeclarativetextedit/usingMultilineEdit.qml    |  13 ++
 .../qmlvisual/qdeclarativetextinput/LineEdit.qml   |   4 +-
 13 files changed, 476 insertions(+), 5 deletions(-)
 create mode 100644 examples/declarative/text/edit/edit.qml
 create mode 100644 examples/declarative/text/edit/pics/endHandle.png
 create mode 100644 examples/declarative/text/edit/pics/endHandle.sci
 create mode 100644 examples/declarative/text/edit/pics/startHandle.png
 create mode 100644 examples/declarative/text/edit/pics/startHandle.sci
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
 create mode 100644 tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml

diff --git a/examples/declarative/text/edit/edit.qml b/examples/declarative/text/edit/edit.qml
new file mode 100644
index 0000000..2774739
--- /dev/null
+++ b/examples/declarative/text/edit/edit.qml
@@ -0,0 +1,248 @@
+/****************************************************************************
+**
+** 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 QtDeclarative module 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$
+**
+****************************************************************************/
+import Qt 4.7
+
+Rectangle {
+    id: editor
+    color: "lightGrey"
+    width: 640; height: 480
+
+    Rectangle {
+        color: "white"
+        anchors.fill: parent
+        anchors.margins: 20
+
+        BorderImage {
+            id: startHandle
+            source: "pics/startHandle.sci"
+            opacity: 0.0
+            width: 10
+            x: edit.positionToRectangle(edit.selectionStart).x-flick.contentX-width
+            y: edit.positionToRectangle(edit.selectionStart).y-flick.contentY
+            height: edit.positionToRectangle(edit.selectionStart).height
+        }
+
+        BorderImage {
+            id: endHandle
+            source: "pics/endHandle.sci"
+            opacity: 0.0
+            width: 10
+            x: edit.positionToRectangle(edit.selectionEnd).x-flick.contentX
+            y: edit.positionToRectangle(edit.selectionEnd).y-flick.contentY
+            height: edit.positionToRectangle(edit.selectionEnd).height
+        }
+
+        Flickable {
+            id: flick
+
+            anchors.fill: parent
+            contentWidth: edit.paintedWidth
+            contentHeight: edit.paintedHeight
+            interactive: true
+            clip: true
+
+            function ensureVisible(r)
+            {
+                if (contentX >= r.x)
+                    contentX = r.x;
+                else if (contentX+width <= r.x+r.width)
+                    contentX = r.x+r.width-width;
+                if (contentY >= r.y)
+                    contentY = r.y;
+                else if (contentY+height <= r.y+r.height)
+                    contentY = r.y+r.height-height;
+            }
+
+            TextEdit {
+                id: edit
+                width: flick.width
+                height: flick.height
+                focus: true
+                wrapMode: TextEdit.Wrap
+                onCursorRectangleChanged: flick.ensureVisible(cursorRectangle)
+                text: "<h1>Text Selection</h1>"
+                    +"<p>This example is a whacky text selection mechanisms, showing how these can be implemented in the TextEdit element, to cater for whatever style is appropriate for the target platform."
+                    +"<p><b>Press-and-hold</b> to select a word, then drag the selection handles."
+                    +"<p><b>Drag outside the selection</b> to scroll the text."
+                    +"<p><b>Click inside the selection</b> to cut/copy/paste/cancel selection."
+                    +"<p>It's too whacky to let you paste if there is no current selection."
+                MouseArea {
+                    x: -startHandle.width
+                    y: 0
+                    width: parent.width+startHandle.width+endHandle.width
+                    height: parent.height
+                    property string drag: "";
+                    property int pressPos;
+                    onPressAndHold: {
+                        if (editor.state == "") {
+                            edit.cursorPosition = edit.positionAt(mouse.x+x,mouse.y+y);
+                            edit.selectWord();
+                            editor.state = "selection"
+                        }
+                    }
+                    onClicked: {
+                        if (editor.state == "") {
+                            edit.cursorPosition = edit.positionAt(mouse.x+x,mouse.y+y);
+                        }
+                    }
+                    function hitHandle(h,x,y) { return x>=h.x+flick.contentX && x<h.x+flick.contentX+h.width && y>=h.y+flick.contentY && y<h.y+flick.contentY+h.height }
+                    onPressed: {
+                        if (editor.state == "selection") {
+                            if (hitHandle(startHandle,mouse.x+x,mouse.y+y)) {
+                                drag = "start"
+                                flick.interactive = false
+                            } else if (hitHandle(endHandle,mouse.x+x,mouse.y+y)) {
+                                drag = "end"
+                                flick.interactive = false
+                            } else {
+                                var pos = edit.positionAt(mouse.x+x,mouse.y+y);
+                                if (pos >= edit.selectionStart && pos <= edit.selectionEnd) {
+                                    drag = "selection"
+                                    flick.interactive = false
+                                } else {
+                                    drag = ""
+                                    flick.interactive = true
+                                }
+                            }
+                        }
+                    }
+                    onReleased: {
+                        if (editor.state == "selection") {
+                            if (drag == "selection") {
+                                editor.state = "menu"
+                            }
+                            drag = ""
+                        }
+                        flick.interactive = true
+                    }
+                    onPositionChanged: {
+                        if (editor.state == "selection" && drag != "") {
+                            if (drag == "start") {
+                                var pos = edit.positionAt(mouse.x+x+startHandle.width/2,mouse.y+y);
+                                if (edit.selectionEnd < pos)
+                                    edit.selectionEnd = pos;
+                                edit.selectionStart = pos;
+                            } else if (drag == "end") {
+                                var pos = edit.positionAt(mouse.x+x-endHandle.width/2,mouse.y+y);
+                                if (edit.selectionStart > pos)
+                                    edit.selectionStart = pos;
+                                edit.selectionEnd = pos;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            id: menu
+            opacity: 0.0
+            width: 100
+            height: 120
+            anchors.centerIn: parent
+            Rectangle {
+                border.width: 1
+                border.color: "darkBlue"
+                radius: 15
+                color: "#806080FF"
+                anchors.fill: parent
+            }
+            Column {
+                anchors.centerIn: parent
+                spacing: 8
+                Rectangle {
+                    border.width: 1
+                    border.color: "darkBlue"
+                    color: "#ff7090FF"
+                    width: 60
+                    height: 16
+                    Text { anchors.centerIn: parent; text: "Cut" }
+                    MouseArea { anchors.fill: parent;
+                        onClicked: { edit.cut(); editor.state = "" } }
+                }
+                Rectangle {
+                    border.width: 1
+                    border.color: "darkBlue"
+                    color: "#ff7090FF"
+                    width: 60
+                    height: 16
+                    Text { anchors.centerIn: parent; text: "Copy" }
+                    MouseArea { anchors.fill: parent;
+                        onClicked: { edit.copy(); editor.state = "selection" } }
+                }
+                Rectangle {
+                    border.width: 1
+                    border.color: "darkBlue"
+                    color: "#ff7090FF"
+                    width: 60
+                    height: 16
+                    Text { anchors.centerIn: parent; text: "Paste" }
+                    MouseArea { anchors.fill: parent;
+                        onClicked: { edit.paste(); edit.cursorPosition = edit.selectionEnd; editor.state = "" } }
+                }
+                Rectangle {
+                    border.width: 1
+                    border.color: "darkBlue"
+                    color: "#ff7090FF"
+                    width: 60
+                    height: 16
+                    Text { anchors.centerIn: parent; text: "Deselect" }
+                    MouseArea { anchors.fill: parent;
+                        onClicked: { edit.cursorPosition = edit.selectionEnd; edit.selectionStart = edit.selectionEnd; editor.state = "" } }
+                }
+            }
+        }
+    }
+
+    states: [
+        State {
+            name: "selection"
+            PropertyChanges { target: startHandle; opacity: 1.0 }
+            PropertyChanges { target: endHandle; opacity: 1.0 }
+        },
+        State {
+            name: "menu"
+            PropertyChanges { target: startHandle; opacity: 0.5 }
+            PropertyChanges { target: endHandle; opacity: 0.5 }
+            PropertyChanges { target: menu; opacity: 1.0 }
+        }
+    ]
+}
diff --git a/examples/declarative/text/edit/pics/endHandle.png b/examples/declarative/text/edit/pics/endHandle.png
new file mode 100644
index 0000000..1a4bc5d
Binary files /dev/null and b/examples/declarative/text/edit/pics/endHandle.png differ
diff --git a/examples/declarative/text/edit/pics/endHandle.sci b/examples/declarative/text/edit/pics/endHandle.sci
new file mode 100644
index 0000000..4f51f24
--- /dev/null
+++ b/examples/declarative/text/edit/pics/endHandle.sci
@@ -0,0 +1,5 @@
+border.left: 0
+border.top: 6
+border.bottom: 6
+border.right: 6
+source: endHandle.png
diff --git a/examples/declarative/text/edit/pics/startHandle.png b/examples/declarative/text/edit/pics/startHandle.png
new file mode 100644
index 0000000..deedcd5
Binary files /dev/null and b/examples/declarative/text/edit/pics/startHandle.png differ
diff --git a/examples/declarative/text/edit/pics/startHandle.sci b/examples/declarative/text/edit/pics/startHandle.sci
new file mode 100644
index 0000000..f9eae20
--- /dev/null
+++ b/examples/declarative/text/edit/pics/startHandle.sci
@@ -0,0 +1,5 @@
+border.left: 6
+border.top: 6
+border.bottom: 6
+border.right: 0
+source: startHandle.png
diff --git a/src/declarative/QmlChanges.txt b/src/declarative/QmlChanges.txt
index 142920c..0df5f10 100644
--- a/src/declarative/QmlChanges.txt
+++ b/src/declarative/QmlChanges.txt
@@ -14,6 +14,8 @@ Component:
       status property instead
     - errorsString() renamed to errorString()
 
+TextInput xToPosition -> positionAt (to match TextEdit.positionAt)
+
 QList<QObject*> models no longer provide properties in model object.  The
 properties are now updated when the object changes.  An object's property
 "foo" may now be accessed as "foo", modelData.foo" or model.modelData.foo"
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index 9ccb8d2..f8876f2 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -89,6 +89,13 @@ TextEdit {
     A particular look-and-feel might use smooth scrolling (eg. using SmoothedFollow), might have a visible
     scrollbar, or a scrollbar that fades in to show location, etc.
 
+    Clipboard support is provided by the cut(), copy(), and paste() functions, and the selection can
+    be handled in a traditional "mouse" mechanism by setting selectByMouse, or handled completely
+    from QML by manipulating selectionStart and selectionEnd, or using selectAll() or selectWord().
+
+    You can translate between cursor positions (characters from the start of the document) and pixel
+    points using positionAt() and positionToRectangle().
+
     \sa Text
 */
 
@@ -531,6 +538,70 @@ qreal QDeclarativeTextEdit::paintedHeight() const
     return implicitHeight();
 }
 
+/*!
+    \qmlmethod rectangle TextEdit::positionToRectangle(position)
+
+    Returns the rectangle at the given \a position in the text. The x, y,
+    and height properties correspond to the cursor that would describe
+    that position.
+*/
+QRectF QDeclarativeTextEdit::positionToRectangle(int pos) const
+{
+    Q_D(const QDeclarativeTextEdit);
+    QTextCursor c(d->document);
+    c.setPosition(pos);
+    return d->control->cursorRect(c);
+
+}
+
+/*!
+    \qmlmethod int TextEdit::positionAt(x,y)
+
+    Returns the text position closest to pixel position (\a x,\a y).
+
+    Position 0 is before the first character, position 1 is after the first character
+    but before the second, and so on until position text.length, which is after all characters.
+*/
+int QDeclarativeTextEdit::positionAt(int x, int y) const
+{
+    Q_D(const QDeclarativeTextEdit);
+    int r = d->document->documentLayout()->hitTest(QPoint(x,y-d->yoff), Qt::FuzzyHit);
+    return r;
+}
+
+/*!
+    \qmlmethod int TextEdit::moveCursorSeletion(int pos)
+
+    Moves the cursor to \a position and updates the selection accordingly.
+    (To only move the cursor, set the \l cursorPosition property.)
+
+    When this method is called it additionally sets either the
+    selectionStart or the selectionEnd (whichever was at the previous cursor position)
+    to the specified position. This allows you to easily extend and contract the selected
+    text range.
+
+    For example, take this sequence of calls:
+
+    \code
+        cursorPosition = 5
+        moveCursorSelection(9)
+        moveCursorSelection(7)
+    \endcode
+
+    This moves the cursor to position 5, extend the selection end from 5 to 9
+    and then retract the selection end from 9 to 7, leaving the text from position 5 to 7
+    selected (the 6th and 7th characters).
+*/
+void QDeclarativeTextEdit::moveCursorSelection(int pos)
+{
+    //Note that this is the same as setCursorPosition but with the KeepAnchor flag set
+    Q_D(QDeclarativeTextEdit);
+    QTextCursor cursor = d->control->textCursor();
+    if (cursor.position() == pos)
+        return;
+    cursor.setPosition(pos, QTextCursor::KeepAnchor);
+    d->control->setTextCursor(cursor);
+}
 
 /*!
     \qmlproperty bool TextEdit::cursorVisible
@@ -956,6 +1027,51 @@ void QDeclarativeTextEdit::selectAll()
 }
 
 /*!
+    Causes the word closest to the current cursor position to be selected.
+*/
+void QDeclarativeTextEdit::selectWord()
+{
+    Q_D(QDeclarativeTextEdit);
+    QTextCursor c = d->control->textCursor();
+    c.select(QTextCursor::WordUnderCursor);
+    d->control->setTextCursor(c);
+}
+
+/*!
+    \qmlmethod TextEdit::cut()
+
+    Moves the currently selected text to the system clipboard.
+*/
+void QDeclarativeTextEdit::cut()
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->cut();
+}
+
+/*!
+    \qmlmethod TextEdit::copy()
+
+    Copies the currently selected text to the system clipboard.
+*/
+void QDeclarativeTextEdit::copy()
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->copy();
+}
+
+/*!
+    \qmlmethod TextEdit::paste()
+
+    Relaces the currently selected text by the contents of the system clipboard.
+*/
+void QDeclarativeTextEdit::paste()
+{
+    Q_D(QDeclarativeTextEdit);
+    d->control->paste();
+}
+
+
+/*!
 \overload
 Handles the given mouse \a event.
 */
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
index 47174f4..a83b3db 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
@@ -198,6 +198,10 @@ public:
     qreal paintedWidth() const;
     qreal paintedHeight() const;
 
+    Q_INVOKABLE QRectF positionToRectangle(int) const;
+    Q_INVOKABLE int positionAt(int x, int y) const;
+    Q_INVOKABLE void moveCursorSelection(int pos);
+
 Q_SIGNALS:
     void textChanged(const QString &);
     void paintedSizeChanged();
@@ -225,6 +229,10 @@ Q_SIGNALS:
 
 public Q_SLOTS:
     void selectAll();
+    void selectWord();
+    void cut();
+    void copy();
+    void paste();
 
 private Q_SLOTS:
     void updateImgCache(const QRectF &rect);
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 9c70ea9..9a6a070 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -833,7 +833,7 @@ void QDeclarativeTextInput::moveCursor()
 }
 
 /*!
-    \qmlmethod int TextInput::xToPosition(int x)
+    \qmlmethod int TextInput::positionAt(int x)
 
     This function returns the character position at
     x pixels from the left of the textInput. Position 0 is before the
@@ -843,7 +843,7 @@ void QDeclarativeTextInput::moveCursor()
     This means that for all x values before the first character this function returns 0,
     and for all x values after the last character this function returns text.length.
 */
-int QDeclarativeTextInput::xToPosition(int x)
+int QDeclarativeTextInput::positionAt(int x)
 {
     Q_D(const QDeclarativeTextInput);
     return d->control->xToPos(x - d->hscroll);
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
index 438293a..6bb94c2 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
@@ -110,7 +110,7 @@ public:
     };
 
     //Auxilliary functions needed to control the TextInput from QML
-    Q_INVOKABLE int xToPosition(int x);
+    Q_INVOKABLE int positionAt(int x);
     Q_INVOKABLE void moveCursorSelection(int pos);
 
     Q_INVOKABLE void openSoftwareInputPanel();
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
new file mode 100644
index 0000000..0273282
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/MultilineEdit.qml
@@ -0,0 +1,74 @@
+import Qt 4.7
+
+Item {
+    id:lineedit
+    property alias text: textEdit.text
+
+    width: 240 + 11 //Should be set manually in most cases
+    height: textEdit.height + 11 
+
+    Rectangle{
+        color: 'lightsteelblue'
+        anchors.fill: parent
+    }
+    clip: true
+    Component.onCompleted: textEdit.cursorPosition = 0;
+    TextEdit{
+        id:textEdit
+        cursorDelegate: Item{
+            Rectangle{
+                visible: parent.parent.focus
+                color: "#009BCE"
+                height: 13
+                width: 2
+                y: 1
+            }
+        }
+        property int leftMargin: 6 
+        property int topMargin: 6 
+        property int rightMargin: 6 
+        property int bottomMargin: 6 
+        x: leftMargin
+        width: parent.width - leftMargin - rightMargin;
+        y: 5
+        //Below function implements all scrolling logic
+        onCursorPositionChanged: {
+            if(cursorRectangle.y < topMargin - textEdit.y){//Cursor went off the front
+                textEdit.y = topMargin - Math.max(0, cursorRectangle.y);
+            }else if(cursorRectangle.y > parent.height - topMargin - bottomMargin - textEdit.y){//Cursor went off the end
+                textEdit.y = topMargin - Math.max(0, cursorRectangle.y - (parent.height - topMargin - bottomMargin)) - cursorRectangle.height;
+            }
+        }
+
+        text:""
+        horizontalAlignment: TextInput.AlignLeft
+        wrapMode: TextEdit.WordWrap
+        font.pixelSize:15
+    }
+    MouseArea{
+        //Implements all line edit mouse handling
+        id: mainMouseArea
+        anchors.fill: parent;
+        function translateY(y){
+            return y - textEdit.y
+        }
+        function translateX(x){
+            return x - textEdit.x
+        }
+        onPressed: {
+            textEdit.focus = true;
+            textEdit.cursorPosition = textEdit.positionAt(translateX(mouse.x), translateY(mouse.y));
+        }
+        onPositionChanged: {
+            textEdit.moveCursorSelection(textEdit.positionAt(translateX(mouse.x), translateY(mouse.y)));
+        }
+        onReleased: {
+        }
+        onDoubleClicked: {
+            textEdit.selectionStart=0;
+            textEdit.selectionEnd=textEdit.text.length;
+        }
+        z: textEdit.z + 1
+    }
+
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
new file mode 100644
index 0000000..47b48d8
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/usingMultilineEdit.qml
@@ -0,0 +1,13 @@
+import Qt 4.7
+
+Rectangle{
+    width: 600
+    height: 200
+    Column{
+        MultilineEdit{
+            text: 'I am the very model of a modern major general. I\'ve information vegetable, animal and mineral. I know the kings of england and I quote the fights historical - from Marathon to Waterloo in order categorical.';
+            width: 182; height: 60;
+        }
+        MultilineEdit{text: 'Hello world'}
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
index 31f24ec..cc0ad3c 100644
--- a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/LineEdit.qml
@@ -50,10 +50,10 @@ Item {
         }
         onPressed: {
             textInp.focus = true;
-            textInp.cursorPosition = textInp.xToPosition(translateX(mouse.x));
+            textInp.cursorPosition = textInp.positionAt(translateX(mouse.x));
         }
         onPositionChanged: {
-            textInp.moveCursorSelection(textInp.xToPosition(translateX(mouse.x)));
+            textInp.moveCursorSelection(textInp.positionAt(translateX(mouse.x)));
         }
         onReleased: {
         }
-- 
cgit v0.12


From bc1d00de820abc0697e51315d8231cadbce9f9dd Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 28 May 2010 11:20:38 +1000
Subject: Rename example layoutItem -> layoutitem and improve docs

---
 doc/src/examples/qml-examples.qdoc                 |  8 +--
 .../qgraphicslayouts/layoutItem/layoutItem.pro     |  8 ---
 .../qgraphicslayouts/layoutItem/layoutItem.qml     | 57 -----------------
 .../layoutItem/layoutItem.qmlproject               | 16 -----
 .../qgraphicslayouts/layoutItem/layoutItem.qrc     |  5 --
 .../qgraphicslayouts/layoutItem/main.cpp           | 74 ----------------------
 .../qgraphicslayouts/layoutitem/layoutitem.pro     |  8 +++
 .../qgraphicslayouts/layoutitem/layoutitem.qml     | 57 +++++++++++++++++
 .../layoutitem/layoutitem.qmlproject               | 16 +++++
 .../qgraphicslayouts/layoutitem/layoutitem.qrc     |  5 ++
 .../qgraphicslayouts/layoutitem/main.cpp           | 74 ++++++++++++++++++++++
 .../graphicsitems/qdeclarativelayoutitem.cpp       | 11 ++--
 12 files changed, 170 insertions(+), 169 deletions(-)
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qmlproject
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qmlproject
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qrc
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp

diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 56ba1c7..9f69bbf 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -117,10 +117,10 @@
     like QGraphicsLayoutItem, QGraphicsLinearLayout and QGraphicsGridLayout into QML.
 */
 /*!
-    \title Layout Item
-    \example declarative/cppextensions/qgraphicslayouts/layoutItem
+    \title LayoutItem
+    \example declarative/cppextensions/qgraphicslayouts/layoutitem
 
-    This example show how to integrate QML into an existing 
+    This example show how to use the LayoutItem element to integrate QML items into an existing 
     \l{Graphics View Framework}{Graphics View}-based application.
 */
 /*!
@@ -132,7 +132,7 @@
 
     \list
     \o \l{declarative/cppextensions/qgraphicslayouts/graphicsLayouts}{Graphics Layouts}
-    \o \l{declarative/cppextensions/qgraphicslayouts/layoutItem}{Layout Item}
+    \o \l{declarative/cppextensions/qgraphicslayouts/layoutitem}{LayoutItem}
     \endlist
 */
 
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro
deleted file mode 100644
index c85a400..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += declarative
-
-SOURCES += main.cpp
-RESOURCES += layoutItem.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml
deleted file mode 100644
index 6f377c5..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-/****************************************************************************
-**
-** 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 QtDeclarative module of the Qt Toolkit.
-**
-** $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$
-**
-****************************************************************************/
-
-import Qt 4.7
-
-LayoutItem {    //Sized by the layout
-    id: resizable
-
-    minimumSize: "100x100"
-    maximumSize: "300x300"
-    preferredSize: "100x100"
-
-    Rectangle { color: "yellow"; anchors.fill: parent }
-
-    Rectangle { 
-        width: 100; height: 100
-        anchors.top: parent.top; anchors.right: parent.right
-        color: "green"
-    }
-}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qmlproject b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc
deleted file mode 100644
index deb0fba..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/layoutItem.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>layoutItem.qml</file>
-</qresource>
-</RCC>
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp
deleted file mode 100644
index ef927d1..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/layoutItem/main.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/****************************************************************************
-**
-** 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 examples of the Qt Toolkit.
-**
-** $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 <QGraphicsView>
-#include <QGraphicsScene>
-#include <QGraphicsWidget>
-#include <QGraphicsLinearLayout>
-#include <QDeclarativeComponent>
-#include <QDeclarativeEngine>
-
-/* This example demonstrates using a LayoutItem to let QML snippets integrate
-   nicely with existing QGraphicsView applications designed with GraphicsLayouts
-*/
-int main(int argc, char* argv[])
-{
-    QApplication app(argc, argv);
-
-    //Set up a graphics scene with a QGraphicsWidget and Layout
-    QGraphicsView view;
-    QGraphicsScene scene;
-    QGraphicsWidget *widget = new QGraphicsWidget();
-    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
-    widget->setLayout(layout);
-    scene.addItem(widget);
-    view.setScene(&scene);
-
-    //Add the QML snippet into the layout
-    QDeclarativeEngine engine;
-    QDeclarativeComponent c(&engine, QUrl(":layoutItem.qml"));
-    QGraphicsLayoutItem* obj = qobject_cast<QGraphicsLayoutItem*>(c.create());
-    layout->addItem(obj);
-
-    widget->setGeometry(QRectF(0,0, 400,400));
-    view.show();
-    return app.exec();
-}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
new file mode 100644
index 0000000..77c6b2a
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+TARGET = 
+DEPENDPATH += .
+INCLUDEPATH += .
+QT += declarative
+
+SOURCES += main.cpp
+RESOURCES += layoutitem.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
new file mode 100644
index 0000000..6f377c5
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** 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 QtDeclarative module of the Qt Toolkit.
+**
+** $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$
+**
+****************************************************************************/
+
+import Qt 4.7
+
+LayoutItem {    //Sized by the layout
+    id: resizable
+
+    minimumSize: "100x100"
+    maximumSize: "300x300"
+    preferredSize: "100x100"
+
+    Rectangle { color: "yellow"; anchors.fill: parent }
+
+    Rectangle { 
+        width: 100; height: 100
+        anchors.top: parent.top; anchors.right: parent.right
+        color: "green"
+    }
+}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qmlproject b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qmlproject
new file mode 100644
index 0000000..d4909f8
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qmlproject
@@ -0,0 +1,16 @@
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qrc b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qrc
new file mode 100644
index 0000000..2e52578
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>layoutitem.qml</file>
+</qresource>
+</RCC>
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp
new file mode 100644
index 0000000..ef927d1
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** 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 examples of the Qt Toolkit.
+**
+** $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 <QGraphicsView>
+#include <QGraphicsScene>
+#include <QGraphicsWidget>
+#include <QGraphicsLinearLayout>
+#include <QDeclarativeComponent>
+#include <QDeclarativeEngine>
+
+/* This example demonstrates using a LayoutItem to let QML snippets integrate
+   nicely with existing QGraphicsView applications designed with GraphicsLayouts
+*/
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+
+    //Set up a graphics scene with a QGraphicsWidget and Layout
+    QGraphicsView view;
+    QGraphicsScene scene;
+    QGraphicsWidget *widget = new QGraphicsWidget();
+    QGraphicsLinearLayout *layout = new QGraphicsLinearLayout();
+    widget->setLayout(layout);
+    scene.addItem(widget);
+    view.setScene(&scene);
+
+    //Add the QML snippet into the layout
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl(":layoutItem.qml"));
+    QGraphicsLayoutItem* obj = qobject_cast<QGraphicsLayoutItem*>(c.create());
+    layout->addItem(obj);
+
+    widget->setGeometry(QRectF(0,0, 400,400));
+    view.show();
+    return app.exec();
+}
diff --git a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
index c8ecbb6..4add66d 100644
--- a/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelayoutitem.cpp
@@ -50,20 +50,21 @@ QT_BEGIN_NAMESPACE
 /*!
     \qmlclass LayoutItem QDeclarativeLayoutItem
     \since 4.7
-    \brief The LayoutItem element allows you to place your declarative UI elements inside a classical Qt layout.
+    \brief The LayoutItem element allows declarative UI elements to be placed inside Qt's Graphics View layouts.
 
-    LayoutItem is a variant of Item with a couple of additional properties. These properties provide the size hints
-    needed for items to work in conjunction with Qt Layouts. The Qt Layout will resize the LayoutItem as appropriate,
+    LayoutItem is a variant of \l Item with additional size hint properties. These properties provide the size hints
+    necessary for items to work in conjunction with Qt \l{Graphics View Framework}{Graphics View} layout classes
+    such as QGraphicsLinearLayout and QGraphicsGridLayout. The Qt layout mechanisms will resize the LayoutItem as appropriate,
     taking its size hints into account, and you can propagate this to the other elements in your UI via anchors and bindings.
 
-    This is a QGraphicsLayoutItem subclass, and the properties merely expose the QGraphicsLayoutItem functionality to QML.
+    This is a QGraphicsLayoutItem subclass, and its properties merely expose the QGraphicsLayoutItem functionality to QML.
     See the QGraphicsLayoutItem documentation for further details.
 */
 
 /*!
     \internal
     \class QDeclarativeLayoutItem
-    \brief The QDeclarativeLayoutItem class allows you to place your Fluid UI elements inside a classical Qt layout.
+    \brief The QDeclarativeLayoutItem class allows you to place your QML UI elements inside Qt's Graphics View layouts.
 */
 
 
-- 
cgit v0.12


From b64f49b7c97aa905cde93a943f56eca20475678e Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Fri, 28 May 2010 17:24:32 +1000
Subject: Split graphicsLayouts example into qgraphicslinearlayout and
 qgraphicsgridlayout and clean up

---
 doc/src/examples/qml-examples.qdoc                 |  26 +-
 .../graphicsLayouts/graphicsLayouts.pro            |  13 -
 .../graphicsLayouts/graphicsLayouts.qmlproject     |  16 -
 .../graphicsLayouts/graphicslayouts.cpp            | 365 ---------------------
 .../graphicsLayouts/graphicslayouts.qml            | 117 -------
 .../graphicsLayouts/graphicslayouts.qrc            |   5 -
 .../graphicsLayouts/graphicslayouts_p.h            | 302 -----------------
 .../qgraphicslayouts/graphicsLayouts/main.cpp      |  59 ----
 .../qgraphicsgridlayout/.main.cpp.swo              | Bin 0 -> 12288 bytes
 .../qgraphicsgridlayout/gridlayout.cpp             | 180 ++++++++++
 .../qgraphicsgridlayout/gridlayout.h               | 215 ++++++++++++
 .../qgraphicsgridlayout/gridlayout.qrc             |   6 +
 .../qgraphicslayouts/qgraphicsgridlayout/main.cpp  |  63 ++++
 .../qgraphicsgridlayout/qgraphicsgridlayout.pro    |  15 +
 .../qgraphicsgridlayout/qgraphicsgridlayout.qml    |  98 ++++++
 .../qgraphicslinearlayout/linearlayout.cpp         | 167 ++++++++++
 .../qgraphicslinearlayout/linearlayout.h           | 150 +++++++++
 .../qgraphicslinearlayout/linearlayout.qrc         |   6 +
 .../qgraphicslinearlayout/main.cpp                 |  64 ++++
 .../qgraphicslinearlayout.pro                      |  15 +
 .../qgraphicslinearlayout.qml                      |  68 ++++
 21 files changed, 1065 insertions(+), 885 deletions(-)
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.qmlproject
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.qrc
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.qrc
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
 create mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml

diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 9f69bbf..035628e 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -110,13 +110,6 @@
 */
 
 /*!
-    \title Graphics Layouts
-    \example declarative/cppextensions/qgraphicslayouts/graphicsLayouts
-
-    This example show how to integrate Qt \l{Graphics View Framework}{Graphics View} components
-    like QGraphicsLayoutItem, QGraphicsLinearLayout and QGraphicsGridLayout into QML.
-*/
-/*!
     \title LayoutItem
     \example declarative/cppextensions/qgraphicslayouts/layoutitem
 
@@ -124,6 +117,22 @@
     \l{Graphics View Framework}{Graphics View}-based application.
 */
 /*!
+    \title QGraphicsGridLayout
+    \example declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout
+
+    This example shows how to use QGraphicsGridLayout to lay out QML items. This is 
+    useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with
+    QML.
+*/
+/*!
+    \title QGraphicsLinearLayout
+    \example declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout
+
+    This example shows how to use QGraphicsLinearLayout to lay out QML items. This is 
+    useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with
+    QML.
+*/
+/*!
     \page declarative-cppextensions-qgraphicslayouts.html
     \title C++ Extensions: QGraphicsLayouts
 
@@ -131,8 +140,9 @@
     layout components with QML:
 
     \list
-    \o \l{declarative/cppextensions/qgraphicslayouts/graphicsLayouts}{Graphics Layouts}
     \o \l{declarative/cppextensions/qgraphicslayouts/layoutitem}{LayoutItem}
+    \o \l{declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout}{QGraphicsGridLayout}
+    \o \l{declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout}{QGraphicsLinearLayout}
     \endlist
 */
 
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
deleted file mode 100644
index e5d91b2..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = app
-TARGET  = graphicslayouts
-QT += declarative
-
-SOURCES += \
-    graphicslayouts.cpp \
-    main.cpp
-
-HEADERS += \
-    graphicslayouts_p.h
-
-RESOURCES += \
-    graphicslayouts.qrc
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.qmlproject b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.qmlproject
deleted file mode 100644
index d4909f8..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.qmlproject
+++ /dev/null
@@ -1,16 +0,0 @@
-import QmlProject 1.0
-
-Project {
-    /* Include .qml, .js, and image files from current directory and subdirectories */
-    QmlFiles {
-        directory: "."
-    }
-    JavaScriptFiles {
-        directory: "."
-    }
-    ImageFiles {
-        directory: "."
-    }
-    /* List of plugin directories passed to QML runtime */
-    // importPaths: [ " ../exampleplugin " ]
-}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp
deleted file mode 100644
index 40e286d..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.cpp
+++ /dev/null
@@ -1,365 +0,0 @@
-/****************************************************************************
-**
-** 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 QtDeclarative module of the Qt Toolkit.
-**
-** $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 "graphicslayouts_p.h"
-
-#include <QtGui/qgraphicswidget.h>
-#include <QtCore/qdebug.h>
-
-QT_BEGIN_NAMESPACE
-
-LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
-: QObject(parent), _stretch(1), _alignment(Qt::AlignCenter), _spacing(0)
-{
-}
-
-void LinearLayoutAttached::setStretchFactor(int f)
-{
-    if (_stretch == f)
-        return;
-
-    _stretch = f;
-    emit stretchChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _stretch);
-}
-
-void LinearLayoutAttached::setSpacing(int s)
-{
-    if (_spacing == s)
-        return;
-
-    _spacing = s;
-    emit spacingChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _spacing);
-}
-
-void LinearLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
-}
-
-QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
-{
-Q_UNUSED(which);
-Q_UNUSED(constraint);
-return QSizeF();
-}
-
-
-QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
-{
-}
-
-void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
-{
-insertItem(index, item);
-
-//connect attached properties
-if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
-    setStretchFactor(item, obj->stretchFactor());
-    setAlignment(item, obj->alignment());
-    updateSpacing(item, obj->spacing());
-    QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
-                     this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
-    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-    QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
-                     this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
-    //### need to disconnect when widget is removed?
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsLinearLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-qreal QGraphicsLinearLayoutObject::contentsMargin() const
-{
-    qreal a,b,c,d;
-    getContentsMargins(&a, &b, &c, &d);
-    if(a==b && a==c && a==d)
-        return a;
-    return -1;
-}
-
-void QGraphicsLinearLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m,m,m,m);
-}
-
-void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
-{
-QGraphicsLinearLayout::setStretchFactor(item, stretch);
-}
-
-void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
-{
-    for(int i=0; i < count(); i++){
-        if(itemAt(i) == item){ //I do not see the reverse function, which is why we must loop over all items
-            QGraphicsLinearLayout::setItemSpacing(i, spacing);
-            return;
-        }
-    }
-}
-
-void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-QGraphicsLinearLayout::setAlignment(item, alignment);
-}
-
-QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> QGraphicsLinearLayoutObject::attachedProperties;
-LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast<QGraphicsLayoutItem*>(obj))
-    return 0;
-LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
-attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
-return rv;
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-// QGraphicsGridLayout-related classes
-//////////////////////////////////////////////////////////////////////////////////////////////////////
-GridLayoutAttached::GridLayoutAttached(QObject *parent)
-: QObject(parent), _row(-1), _column(-1), _rowspan(1), _colspan(1), _alignment(-1), _rowstretch(-1),
-    _colstretch(-1), _rowspacing(-1), _colspacing(-1), _rowprefheight(-1), _rowmaxheight(-1), _rowminheight(-1),
-    _rowfixheight(-1), _colprefwidth(-1), _colmaxwidth(-1), _colminwidth(-1), _colfixwidth(-1)
-{
-}
-
-void GridLayoutAttached::setRow(int r)
-{
-    if (_row == r)
-        return;
-
-    _row = r;
-    //emit rowChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _row);
-}
-
-void GridLayoutAttached::setColumn(int c)
-{
-    if (_column == c)
-        return;
-
-    _column = c;
-    //emit columnChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _column);
-}
-
-void GridLayoutAttached::setRowSpan(int rs)
-{
-    if (_rowspan == rs)
-        return;
-
-    _rowspan = rs;
-    //emit rowSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _rowSpan);
-}
-
-void GridLayoutAttached::setColumnSpan(int cs)
-{
-    if (_colspan == cs)
-        return;
-
-    _colspan = cs;
-    //emit columnSpanChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _columnSpan);
-}
-
-void GridLayoutAttached::setAlignment(Qt::Alignment a)
-{
-    if (_alignment == a)
-        return;
-
-    _alignment = a;
-    emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), _alignment);
-}
-
-void GridLayoutAttached::setRowStretchFactor(int f)
-{
-    _rowstretch = f;
-}
-
-void GridLayoutAttached::setColumnStretchFactor(int f)
-{
-    _colstretch = f;
-}
-
-void GridLayoutAttached::setRowSpacing(int s)
-{
-    _rowspacing = s;
-}
-
-void GridLayoutAttached::setColumnSpacing(int s)
-{
-    _colspacing = s;
-}
-
-
-QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
-: QObject(parent)
-{
-}
-
-QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
-{
-}
-
-void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid)
-{
-//use attached properties
-if (QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(wid))) {
-    int row = static_cast<GridLayoutAttached *>(obj)->row();
-    int column = static_cast<GridLayoutAttached *>(obj)->column();
-    int rowSpan = static_cast<GridLayoutAttached *>(obj)->rowSpan();
-    int columnSpan = static_cast<GridLayoutAttached *>(obj)->columnSpan();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    addItem(wid, row, column, rowSpan, columnSpan);
-}
-}
-
-void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
-{
-//use attached properties
-if (GridLayoutAttached *obj = attachedProperties.value(item)) {
-    int row = obj->row();
-    int column = obj->column();
-    int rowSpan = obj->rowSpan();
-    int columnSpan = obj->columnSpan();
-    Qt::Alignment alignment = obj->alignment();
-    if (row == -1 || column == -1) {
-        qWarning() << "Must set row and column for an item in a grid layout";
-        return;
-    }
-    if(obj->rowSpacing() != -1)
-        setRowSpacing(row, obj->rowSpacing());
-    if(obj->columnSpacing() != -1)
-        setColumnSpacing(column, obj->columnSpacing());
-    if(obj->rowStretchFactor() != -1)
-        setRowStretchFactor(row, obj->rowStretchFactor());
-    if(obj->columnStretchFactor() != -1)
-        setColumnStretchFactor(column, obj->columnStretchFactor());
-    if(obj->rowPreferredHeight() != -1)
-        setRowPreferredHeight(row, obj->rowPreferredHeight());
-    if(obj->rowMaximumHeight() != -1)
-        setRowMaximumHeight(row, obj->rowMaximumHeight());
-    if(obj->rowMinimumHeight() != -1)
-        setRowMinimumHeight(row, obj->rowMinimumHeight());
-    if(obj->rowFixedHeight() != -1)
-        setRowFixedHeight(row, obj->rowFixedHeight());
-    if(obj->columnPreferredWidth() != -1)
-        setColumnPreferredWidth(row, obj->columnPreferredWidth());
-    if(obj->columnMaximumWidth() != -1)
-        setColumnMaximumWidth(row, obj->columnMaximumWidth());
-    if(obj->columnMinimumWidth() != -1)
-        setColumnMinimumWidth(row, obj->columnMinimumWidth());
-    if(obj->columnFixedWidth() != -1)
-        setColumnFixedWidth(row, obj->columnFixedWidth());
-    addItem(item, row, column, rowSpan, columnSpan);
-    if (alignment != -1)
-        setAlignment(item,alignment);
-    QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
-                     this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
-    //### need to disconnect when widget is removed?
-}
-}
-
-//### is there a better way to do this?
-void QGraphicsGridLayoutObject::clearChildren()
-{
-for (int i = 0; i < count(); ++i)
-    removeAt(i);
-}
-
-qreal QGraphicsGridLayoutObject::spacing() const
-{
-if (verticalSpacing() == horizontalSpacing())
-    return verticalSpacing();
-return -1;  //###
-}
-
-qreal QGraphicsGridLayoutObject::contentsMargin() const
-{
-    qreal a,b,c,d;
-    getContentsMargins(&a, &b, &c, &d);
-    if(a==b && a==c && a==d)
-        return a;
-    return -1;
-}
-
-void QGraphicsGridLayoutObject::setContentsMargin(qreal m)
-{
-    setContentsMargins(m,m,m,m);
-}
-
-
-void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
-{
-QGraphicsGridLayout::setAlignment(item, alignment);
-}
-
-QHash<QGraphicsLayoutItem*, GridLayoutAttached*> QGraphicsGridLayoutObject::attachedProperties;
-GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
-{
-// ### This is not allowed - you must attach to any object
-if (!qobject_cast<QGraphicsLayoutItem*>(obj))
-    return 0;
-GridLayoutAttached *rv = new GridLayoutAttached(obj);
-attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
-return rv;
-}
-
-QT_END_NAMESPACE
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml
deleted file mode 100644
index 586f7f9..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qml
+++ /dev/null
@@ -1,117 +0,0 @@
-/****************************************************************************
-**
-** 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 QtDeclarative module of the Qt Toolkit.
-**
-** $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$
-**
-****************************************************************************/
-
-import Qt 4.7
-import GraphicsLayouts 4.7
-
-Item {
-    id: resizable
-
-    width: 800
-    height: 400
-
-    QGraphicsWidget {
-        size.width: parent.width/2
-        size.height: parent.height
-
-        layout: QGraphicsLinearLayout {
-            LayoutItem {
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "100x100"
-                Rectangle { color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                minimumSize: "100x100"
-                maximumSize: "400x400"
-                preferredSize: "200x200"
-                Rectangle { color: "green"; anchors.fill: parent }
-            }
-        }
-    }
-    QGraphicsWidget {
-        x: parent.width/2
-        size.width: parent.width/2
-        size.height: parent.height
-
-        layout: QGraphicsGridLayout {
-            LayoutItem {
-                QGraphicsGridLayout.row: 0
-                QGraphicsGridLayout.column: 0
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "100x100"
-                Rectangle { color: "red"; anchors.fill: parent }
-            }
-            LayoutItem {
-                QGraphicsGridLayout.row: 1
-                QGraphicsGridLayout.column: 0
-                minimumSize: "100x100"
-                maximumSize: "200x200"
-                preferredSize: "100x100"
-                Rectangle { color: "orange"; anchors.fill: parent }
-            }
-            LayoutItem {
-                QGraphicsGridLayout.row: 2
-                QGraphicsGridLayout.column: 0
-                minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "200x200"
-                Rectangle { color: "yellow"; anchors.fill: parent }
-            }
-            LayoutItem {
-                QGraphicsGridLayout.row: 0
-                QGraphicsGridLayout.column: 1
-                minimumSize: "100x100"
-                maximumSize: "200x200"
-                preferredSize: "200x200"
-                Rectangle { color: "green"; anchors.fill: parent }
-            }
-            LayoutItem {
-                QGraphicsGridLayout.row: 1
-                QGraphicsGridLayout.column: 1
-                minimumSize: "100x100"
-                maximumSize: "400x400"
-                preferredSize: "200x200"
-                Rectangle { color: "blue"; anchors.fill: parent }
-            }
-        }
-    }
-}
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc
deleted file mode 100644
index a199f8d..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>graphicslayouts.qml</file>
-</qresource>
-</RCC>
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h
deleted file mode 100644
index 7aa98df..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts_p.h
+++ /dev/null
@@ -1,302 +0,0 @@
-/****************************************************************************
-**
-** 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 QtDeclarative module of the Qt Toolkit.
-**
-** $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 GRAPHICSLAYOUTS_H
-#define GRAPHICSLAYOUTS_H
-
-#include <QtGui/QGraphicsLinearLayout>
-#include <QtGui/QGraphicsGridLayout>
-#include <qdeclarative.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Declarative)
-
-class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayoutItem)
-public:
-    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
-
-    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
-};
-
-class LinearLayoutAttached;
-class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
-    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsLinearLayoutObject(QObject * = 0);
-    ~QGraphicsLinearLayoutObject();
-
-    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
-
-    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
-
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-private Q_SLOTS:
-    void updateStretch(QGraphicsLayoutItem*,int);
-    void updateSpacing(QGraphicsLayoutItem*,int);
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class LinearLayoutAttached;
-    void clearChildren();
-    void insertLayoutItem(int, QGraphicsLayoutItem *);
-    static QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> attachedProperties;
-
-    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
-    }
-
-    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
-    }
-};
-
-class GridLayoutAttached;
-class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
-{
-    Q_OBJECT
-    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
-
-    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
-    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
-    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
-    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
-    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
-    Q_CLASSINFO("DefaultProperty", "children")
-public:
-    QGraphicsGridLayoutObject(QObject * = 0);
-    ~QGraphicsGridLayoutObject();
-
-    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
-
-    qreal spacing() const;
-    qreal contentsMargin() const;
-    void setContentsMargin(qreal);
-
-    static GridLayoutAttached *qmlAttachedProperties(QObject *);
-
-private Q_SLOTS:
-    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    friend class GraphicsLayoutAttached;
-    void addWidget(QGraphicsWidget *);
-    void clearChildren();
-    void addLayoutItem(QGraphicsLayoutItem *);
-    static QHash<QGraphicsLayoutItem*, GridLayoutAttached*> attachedProperties;
-
-    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<QGraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
-    }
-
-    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<QGraphicsGridLayoutObject*>(prop->object)->clearChildren();
-    }
-
-    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->count();
-    }
-
-    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->itemAt(index);
-    }
-};
-
-class LinearLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
-    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
-public:
-    LinearLayoutAttached(QObject *parent);
-
-    int stretchFactor() const { return _stretch; }
-    void setStretchFactor(int f);
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-    int spacing() const { return _spacing; }
-    void setSpacing(int s);
-
-Q_SIGNALS:
-    void stretchChanged(QGraphicsLayoutItem*,int);
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-    void spacingChanged(QGraphicsLayoutItem*,int);
-
-private:
-    int _stretch;
-    Qt::Alignment _alignment;
-    int _spacing;
-};
-
-class GridLayoutAttached : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(int row READ row WRITE setRow)
-    Q_PROPERTY(int column READ column WRITE setColumn)
-    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
-    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
-    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
-    Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor)
-    Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor)
-    Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing)
-    Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing)
-    Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight)
-    Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight)
-    Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight)
-    Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight)
-    Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth)
-    Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth)
-    Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth)
-    Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth)
-
-public:
-    GridLayoutAttached(QObject *parent);
-
-    int row() const { return _row; }
-    void setRow(int r);
-
-    int column() const { return _column; }
-    void setColumn(int c);
-
-    int rowSpan() const { return _rowspan; }
-    void setRowSpan(int rs);
-
-    int columnSpan() const { return _colspan; }
-    void setColumnSpan(int cs);
-
-    Qt::Alignment alignment() const { return _alignment; }
-    void setAlignment(Qt::Alignment a);
-
-    int rowStretchFactor() const { return _rowstretch; }
-    void setRowStretchFactor(int f);
-    int columnStretchFactor() const { return _colstretch; }
-    void setColumnStretchFactor(int f);
-
-    int rowSpacing() const { return _rowspacing; }
-    void setRowSpacing(int s);
-    int columnSpacing() const { return _colspacing; }
-    void setColumnSpacing(int s);
-
-    int rowPreferredHeight() const { return _rowprefheight; }
-    void setRowPreferredHeight(int s) { _rowprefheight = s; }
-
-    int rowMaximumHeight() const { return _rowmaxheight; }
-    void setRowMaximumHeight(int s) { _rowmaxheight = s; }
-
-    int rowMinimumHeight() const { return _rowminheight; }
-    void setRowMinimumHeight(int s) { _rowminheight = s; }
-
-    int rowFixedHeight() const { return _rowfixheight; }
-    void setRowFixedHeight(int s) { _rowfixheight = s; }
-
-    int columnPreferredWidth() const { return _colprefwidth; }
-    void setColumnPreferredWidth(int s) { _colprefwidth = s; }
-
-    int columnMaximumWidth() const { return _colmaxwidth; }
-    void setColumnMaximumWidth(int s) { _colmaxwidth = s; }
-
-    int columnMinimumWidth() const { return _colminwidth; }
-    void setColumnMinimumWidth(int s) { _colminwidth = s; }
-
-    int columnFixedWidth() const { return _colfixwidth; }
-    void setColumnFixedWidth(int s) { _colfixwidth = s; }
-
-Q_SIGNALS:
-    void alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment);
-
-private:
-    int _row;
-    int _column;
-    int _rowspan;
-    int _colspan;
-    Qt::Alignment _alignment;
-    int _rowstretch;
-    int _colstretch;
-    int _rowspacing;
-    int _colspacing;
-    int _rowprefheight;
-    int _rowmaxheight;
-    int _rowminheight;
-    int _rowfixheight;
-    int _colprefwidth;
-    int _colmaxwidth;
-    int _colminwidth;
-    int _colfixwidth;
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
-QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
-
-QT_END_HEADER
-
-#endif // GRAPHICSLAYOUTS_H
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp
deleted file mode 100644
index b0a15fc..0000000
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/main.cpp
+++ /dev/null
@@ -1,59 +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 plugins of the Qt Toolkit.
-**
-** $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 <QtDeclarative/qdeclarative.h>
-#include "graphicslayouts_p.h"
-#include <QtDeclarative/QDeclarativeView>
-
-int main(int argc, char* argv[])
-{
-    QApplication app(argc, argv);
-    QDeclarativeView view;
-    qmlRegisterInterface<QGraphicsLayoutItem>("QGraphicsLayoutItem");
-    qmlRegisterInterface<QGraphicsLayout>("QGraphicsLayout");
-    qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>("GraphicsLayouts",4,7,"QGraphicsLinearLayoutStretchItem");
-    qmlRegisterType<QGraphicsLinearLayoutObject>("GraphicsLayouts",4,7,"QGraphicsLinearLayout");
-    qmlRegisterType<QGraphicsGridLayoutObject>("GraphicsLayouts",4,7,"QGraphicsGridLayout");
-    view.setSource(QUrl(":graphicslayouts.qml"));
-    view.show();
-    return app.exec();
-};
-
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo
new file mode 100644
index 0000000..c742274
Binary files /dev/null and b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo differ
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
new file mode 100644
index 0000000..728c225
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
@@ -0,0 +1,180 @@
+/****************************************************************************
+**
+** 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 QtDeclarative module of the Qt Toolkit.
+**
+** $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 "gridlayout.h"
+
+#include <QGraphicsWidget>
+#include <QDebug>
+
+GridLayoutAttached::GridLayoutAttached(QObject *parent)
+: QObject(parent), m_row(-1), m_column(-1), m_rowspan(1), m_colspan(1), m_alignment(-1), m_rowStretch(-1),
+    m_colStretch(-1), m_rowSpacing(-1), m_colSpacing(-1), m_rowPrefHeight(-1), m_rowMaxHeight(-1), m_rowMinHeight(-1),
+    m_rowFixHeight(-1), m_colPrefwidth(-1), m_colMaxwidth(-1), m_colMinwidth(-1), m_colFixwidth(-1)
+{
+}
+
+void GridLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (m_alignment != a) {
+        m_alignment = a;
+        emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), m_alignment);
+    }
+}
+
+QHash<QGraphicsLayoutItem*, GridLayoutAttached*> QGraphicsGridLayoutObject::attachedProperties;
+
+QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
+{
+}
+
+void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *widget)
+{
+    //use attached properties
+    if (QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(widget))) {
+        int row = static_cast<GridLayoutAttached *>(obj)->row();
+        int column = static_cast<GridLayoutAttached *>(obj)->column();
+        int rowSpan = static_cast<GridLayoutAttached *>(obj)->rowSpan();
+        int columnSpan = static_cast<GridLayoutAttached *>(obj)->columnSpan();
+        if (row == -1 || column == -1) {
+            qWarning() << "Must set row and column for an item in a grid layout";
+            return;
+        }
+        addItem(widget, row, column, rowSpan, columnSpan);
+    }
+}
+
+void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
+{
+    //use attached properties
+    if (GridLayoutAttached *obj = attachedProperties.value(item)) {
+        int row = obj->row();
+        int column = obj->column();
+        int rowSpan = obj->rowSpan();
+        int columnSpan = obj->columnSpan();
+        Qt::Alignment alignment = obj->alignment();
+
+        if (row == -1 || column == -1) {
+            qWarning() << "Must set row and column for an item in a grid layout";
+            return;
+        }
+
+        if (obj->rowSpacing() != -1)
+            setRowSpacing(row, obj->rowSpacing());
+        if (obj->columnSpacing() != -1)
+            setColumnSpacing(column, obj->columnSpacing());
+        if (obj->rowStretchFactor() != -1)
+            setRowStretchFactor(row, obj->rowStretchFactor());
+        if (obj->columnStretchFactor() != -1)
+            setColumnStretchFactor(column, obj->columnStretchFactor());
+        if (obj->rowPreferredHeight() != -1)
+            setRowPreferredHeight(row, obj->rowPreferredHeight());
+        if (obj->rowMaximumHeight() != -1)
+            setRowMaximumHeight(row, obj->rowMaximumHeight());
+        if (obj->rowMinimumHeight() != -1)
+            setRowMinimumHeight(row, obj->rowMinimumHeight());
+        if (obj->rowFixedHeight() != -1)
+            setRowFixedHeight(row, obj->rowFixedHeight());
+        if (obj->columnPreferredWidth() != -1)
+            setColumnPreferredWidth(row, obj->columnPreferredWidth());
+        if (obj->columnMaximumWidth() != -1)
+            setColumnMaximumWidth(row, obj->columnMaximumWidth());
+        if (obj->columnMinimumWidth() != -1)
+            setColumnMinimumWidth(row, obj->columnMinimumWidth());
+        if (obj->columnFixedWidth() != -1)
+            setColumnFixedWidth(row, obj->columnFixedWidth());
+
+        addItem(item, row, column, rowSpan, columnSpan);
+
+        if (alignment != -1)
+            setAlignment(item, alignment);
+        QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment)),
+                         this, SLOT(updateAlignment(QGraphicsLayoutItem*, Qt::Alignment)));
+        //### need to disconnect when widget is removed? Re-implement removeAt()?
+    }
+}
+
+void QGraphicsGridLayoutObject::clearChildren()
+{
+    //### do I need to delete the removed items? And/or removed them from attachedProperties?
+    while (count() > 0)
+        removeAt(count()-1);
+}
+
+qreal QGraphicsGridLayoutObject::spacing() const
+{
+    if (verticalSpacing() == horizontalSpacing())
+        return verticalSpacing();
+    return -1;  //###
+}
+
+qreal QGraphicsGridLayoutObject::contentsMargin() const
+{
+    qreal a, b, c, d;
+    getContentsMargins(&a, &b, &c, &d);
+    if (a == b && a == c && a == d)
+        return a;
+    return -1;
+}
+
+void QGraphicsGridLayoutObject::setContentsMargin(qreal m)
+{
+    setContentsMargins(m, m, m, m);
+}
+
+void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+    QGraphicsGridLayout::setAlignment(item, alignment);
+}
+
+GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+    // ### This is not allowed - you must attach to any object
+    if (!qobject_cast<QGraphicsLayoutItem*>(obj))
+        return 0;
+    GridLayoutAttached *rv = new GridLayoutAttached(obj);
+    attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
+    return rv;
+}
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
new file mode 100644
index 0000000..04f0148
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
@@ -0,0 +1,215 @@
+/****************************************************************************
+**
+** 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 QtDeclarative module of the Qt Toolkit.
+**
+** $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 GRIDLAYOUT_H
+#define GRIDLAYOUT_H
+
+#include <qdeclarative.h>
+
+#include <QGraphicsGridLayout>
+#include <QGraphicsLayoutItem>
+
+class GridLayoutAttached;
+class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
+    Q_PROPERTY(qreal verticalSpacing READ verticalSpacing WRITE setVerticalSpacing)
+    Q_PROPERTY(qreal horizontalSpacing READ horizontalSpacing WRITE setHorizontalSpacing)
+    Q_CLASSINFO("DefaultProperty", "children")
+
+public:
+    QGraphicsGridLayoutObject(QObject * = 0);
+    ~QGraphicsGridLayoutObject();
+
+    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
+
+    qreal spacing() const;
+    qreal contentsMargin() const;
+    void setContentsMargin(qreal);
+
+    static GridLayoutAttached *qmlAttachedProperties(QObject *);
+
+private slots:
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class GraphicsLayoutAttached;
+
+    void addWidget(QGraphicsWidget *);
+    void clearChildren();
+    void addLayoutItem(QGraphicsLayoutItem *);
+
+    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
+        static_cast<QGraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
+    }
+
+    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
+        static_cast<QGraphicsGridLayoutObject*>(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
+        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
+        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->itemAt(index);
+    }
+
+    static QHash<QGraphicsLayoutItem*, GridLayoutAttached*> attachedProperties;
+};
+
+
+class GridLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int row READ row WRITE setRow)
+    Q_PROPERTY(int column READ column WRITE setColumn)
+
+    Q_PROPERTY(int rowSpan READ rowSpan WRITE setRowSpan)
+    Q_PROPERTY(int columnSpan READ columnSpan WRITE setColumnSpan)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
+
+    Q_PROPERTY(int rowStretchFactor READ rowStretchFactor WRITE setRowStretchFactor)
+    Q_PROPERTY(int columnStretchFactor READ columnStretchFactor WRITE setColumnStretchFactor)
+    Q_PROPERTY(int rowSpacing READ rowSpacing WRITE setRowSpacing)
+    Q_PROPERTY(int columnSpacing READ columnSpacing WRITE setColumnSpacing)
+
+    Q_PROPERTY(int rowPreferredHeight READ rowPreferredHeight WRITE setRowPreferredHeight)
+    Q_PROPERTY(int rowMinimumHeight READ rowMinimumHeight WRITE setRowMinimumHeight)
+    Q_PROPERTY(int rowMaximumHeight READ rowMaximumHeight WRITE setRowMaximumHeight)
+    Q_PROPERTY(int rowFixedHeight READ rowFixedHeight WRITE setRowFixedHeight)
+
+    Q_PROPERTY(int columnPreferredWidth READ columnPreferredWidth WRITE setColumnPreferredWidth)
+    Q_PROPERTY(int columnMaximumWidth READ columnMaximumWidth WRITE setColumnMaximumWidth)
+    Q_PROPERTY(int columnMinimumWidth READ columnMinimumWidth WRITE setColumnMinimumWidth)
+    Q_PROPERTY(int columnFixedWidth READ columnFixedWidth WRITE setColumnFixedWidth)
+
+public:
+    GridLayoutAttached(QObject *parent);
+
+    int row() const { return m_row; }
+    void setRow(int r) { m_row = r; }
+
+    int column() const { return m_column; }
+    void setColumn(int c) { m_column = c; }
+
+    int rowSpan() const { return m_rowspan; }
+    void setRowSpan(int rs) { m_rowspan = rs; }
+
+    int columnSpan() const { return m_colspan; }
+    void setColumnSpan(int cs) { m_colspan = cs; }
+
+    Qt::Alignment alignment() const { return m_alignment; }
+    void setAlignment(Qt::Alignment a);
+
+    int rowStretchFactor() const { return m_rowStretch; }
+    void setRowStretchFactor(int f) { m_rowStretch = f; }
+    int columnStretchFactor() const { return m_colStretch; }
+    void setColumnStretchFactor(int f) { m_colStretch = f; }
+
+    int rowSpacing() const { return m_rowSpacing; }
+    void setRowSpacing(int s) { m_rowSpacing = s; }
+    int columnSpacing() const { return m_colSpacing; }
+    void setColumnSpacing(int s) { m_colSpacing = s; }
+
+    int rowPreferredHeight() const { return m_rowPrefHeight; }
+    void setRowPreferredHeight(int s) { m_rowPrefHeight = s; }
+
+    int rowMaximumHeight() const { return m_rowMaxHeight; }
+    void setRowMaximumHeight(int s) { m_rowMaxHeight = s; }
+
+    int rowMinimumHeight() const { return m_rowMinHeight; }
+    void setRowMinimumHeight(int s) { m_rowMinHeight = s; }
+
+    int rowFixedHeight() const { return m_rowFixHeight; }
+    void setRowFixedHeight(int s) { m_rowFixHeight = s; }
+
+    int columnPreferredWidth() const { return m_colPrefwidth; }
+    void setColumnPreferredWidth(int s) { m_colPrefwidth = s; }
+
+    int columnMaximumWidth() const { return m_colMaxwidth; }
+    void setColumnMaximumWidth(int s) { m_colMaxwidth = s; }
+
+    int columnMinimumWidth() const { return m_colMinwidth; }
+    void setColumnMinimumWidth(int s) { m_colMinwidth = s; }
+
+    int columnFixedWidth() const { return m_colFixwidth; }
+    void setColumnFixedWidth(int s) { m_colFixwidth = s; }
+
+signals:
+    void alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment);
+
+private:
+    int m_row;
+    int m_column;
+
+    int m_rowspan;
+    int m_colspan;
+    Qt::Alignment m_alignment;
+
+    int m_rowStretch;
+    int m_colStretch;
+    int m_rowSpacing;
+    int m_colSpacing;
+
+    int m_rowPrefHeight;
+    int m_rowMaxHeight;
+    int m_rowMinHeight;
+    int m_rowFixHeight;
+
+    int m_colPrefwidth;
+    int m_colMaxwidth;
+    int m_colMinwidth;
+    int m_colFixwidth;
+};
+
+QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
+QML_DECLARE_INTERFACE(QGraphicsLayout)
+QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+
+#endif
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.qrc b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.qrc
new file mode 100644
index 0000000..bdf8312
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>qgraphicsgridlayout.qml</file>
+</qresource>
+</RCC>
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp
new file mode 100644
index 0000000..7585b23
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** 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 plugins of the Qt Toolkit.
+**
+** $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 "gridlayout.h"
+
+#include <qdeclarative.h>
+#include <QDeclarativeView>
+
+#include <QApplication>
+
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+
+    qmlRegisterInterface<QGraphicsLayoutItem>("QGraphicsLayoutItem");
+    qmlRegisterInterface<QGraphicsLayout>("QGraphicsLayout");
+    qmlRegisterType<QGraphicsGridLayoutObject>("GridLayouts",4,7,"QGraphicsGridLayout");
+
+    QDeclarativeView view;
+    view.setSource(QUrl(":qgraphicsgridlayout.qml"));
+    view.show();
+
+    return app.exec();
+};
+
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
new file mode 100644
index 0000000..ae6373d
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
@@ -0,0 +1,15 @@
+TEMPLATE = app
+TARGET  = qgraphicsgridlayout
+QT += declarative
+
+SOURCES += \
+    gridlayout.cpp \
+    main.cpp
+
+HEADERS += \
+    gridlayout.h
+
+RESOURCES += \
+    gridlayout.qrc
+
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
new file mode 100644
index 0000000..c3edf1d
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
@@ -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 QtDeclarative module of the Qt Toolkit.
+**
+** $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$
+**
+****************************************************************************/
+
+import Qt 4.7
+import GridLayouts 4.7
+
+Item {
+    width: 400
+    height: 400
+
+    QGraphicsWidget {
+        size.width: parent.width
+        size.height: parent.height
+
+        layout: QGraphicsGridLayout {
+            objectName: "layout"
+            LayoutItem {
+                QGraphicsGridLayout.row: 0
+                QGraphicsGridLayout.column: 0
+                QGraphicsGridLayout.alignment: Qt.AlignLeft
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { color: "red"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 1
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "200x200"
+                preferredSize: "100x100"
+                Rectangle { color: "orange"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 2
+                QGraphicsGridLayout.column: 0
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "200x200"
+                Rectangle { color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 0
+                QGraphicsGridLayout.column: 1
+                minimumSize: "100x100"
+                maximumSize: "200x200"
+                preferredSize: "200x200"
+                Rectangle { color: "green"; anchors.fill: parent }
+            }
+            LayoutItem {
+                QGraphicsGridLayout.row: 1
+                QGraphicsGridLayout.column: 1
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { color: "blue"; anchors.fill: parent }
+            }
+        }
+    }
+}
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
new file mode 100644
index 0000000..5cd35cb
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
@@ -0,0 +1,167 @@
+/****************************************************************************
+**
+** 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 QtDeclarative module of the Qt Toolkit.
+**
+** $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 "linearlayout.h"
+
+#include <QGraphicsWidget>
+#include <QGraphicsLayoutItem>
+
+LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
+: QObject(parent), m_stretch(1), m_alignment(Qt::AlignCenter), m_spacing(0)
+{
+}
+
+void LinearLayoutAttached::setStretchFactor(int f)
+{
+    if (m_stretch != f) {
+        m_stretch = f;
+        emit stretchChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), m_stretch);
+    }
+}
+
+void LinearLayoutAttached::setSpacing(int s)
+{
+    if (m_spacing != s) {
+        m_spacing = s;
+        emit spacingChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), m_spacing);
+    }
+}
+
+void LinearLayoutAttached::setAlignment(Qt::Alignment a)
+{
+    if (m_alignment != a) {
+        m_alignment = a;
+        emit alignmentChanged(reinterpret_cast<QGraphicsLayoutItem*>(parent()), m_alignment);
+    }
+}
+
+QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
+    : QObject(parent)
+{
+}
+
+QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+    Q_UNUSED(which);
+    Q_UNUSED(constraint);
+    return QSizeF();
+}
+
+
+QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
+: QObject(parent)
+{
+}
+
+QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
+{
+}
+
+void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
+{
+    insertItem(index, item);
+
+    //connect attached properties
+    if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
+        setStretchFactor(item, obj->stretchFactor());
+        setAlignment(item, obj->alignment());
+        updateSpacing(item, obj->spacing());
+        QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)),
+                         this, SLOT(updateStretch(QGraphicsLayoutItem*,int)));
+        QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*,Qt::Alignment)),
+                         this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
+        QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
+                         this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
+        //### need to disconnect when widget is removed?
+    }
+}
+
+void QGraphicsLinearLayoutObject::clearChildren()
+{
+    while (count() > 0)
+        removeAt(count()-1);
+}
+
+qreal QGraphicsLinearLayoutObject::contentsMargin() const
+{
+    qreal a, b, c, d;
+    getContentsMargins(&a, &b, &c, &d);
+    if (a == b && a == c && a == d)
+        return a;
+    return -1;
+}
+
+void QGraphicsLinearLayoutObject::setContentsMargin(qreal m)
+{
+    setContentsMargins(m, m, m, m);
+}
+
+void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
+{
+    QGraphicsLinearLayout::setStretchFactor(item, stretch);
+}
+
+void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
+{
+    for (int i=0; i < count(); i++){
+        if (itemAt(i) == item) {
+            QGraphicsLinearLayout::setItemSpacing(i, spacing);
+            return;
+        }
+    }
+}
+
+void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+{
+    QGraphicsLinearLayout::setAlignment(item, alignment);
+}
+
+QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> QGraphicsLinearLayoutObject::attachedProperties;
+LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
+{
+    // ### This is not allowed - you must attach to any object
+    if (!qobject_cast<QGraphicsLayoutItem*>(obj))
+        return 0;
+    LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
+    attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
+    return rv;
+}
+
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
new file mode 100644
index 0000000..392f3f8
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
@@ -0,0 +1,150 @@
+/****************************************************************************
+**
+** 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 QtDeclarative module of the Qt Toolkit.
+**
+** $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 LINEARLAYOUT_H
+#define LINEARLAYOUT_H
+
+#include <qdeclarative.h>
+
+#include <QGraphicsLinearLayout>
+#include <QGraphicsLayoutItem>
+
+class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayoutItem)
+public:
+    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
+
+    virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
+};
+
+
+class LinearLayoutAttached;
+class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
+{
+    Q_OBJECT
+    Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
+
+    Q_PROPERTY(QDeclarativeListProperty<QGraphicsLayoutItem> children READ children)
+    Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
+    Q_PROPERTY(qreal spacing READ spacing WRITE setSpacing)
+    Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
+    Q_CLASSINFO("DefaultProperty", "children")
+public:
+    QGraphicsLinearLayoutObject(QObject * = 0);
+    ~QGraphicsLinearLayoutObject();
+
+    QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
+
+    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
+
+    qreal contentsMargin() const;
+    void setContentsMargin(qreal);
+
+private slots:
+    void updateStretch(QGraphicsLayoutItem*,int);
+    void updateSpacing(QGraphicsLayoutItem*,int);
+    void updateAlignment(QGraphicsLayoutItem*,Qt::Alignment);
+
+private:
+    friend class LinearLayoutAttached;
+
+    void clearChildren();
+    void insertLayoutItem(int, QGraphicsLayoutItem *);
+
+    static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
+        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
+    }
+
+    static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
+        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->clearChildren();
+    }
+
+    static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
+        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->count();
+    }
+
+    static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
+        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
+    }
+
+    static QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> attachedProperties;
+};
+
+
+class LinearLayoutAttached : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(int stretchFactor READ stretchFactor WRITE setStretchFactor NOTIFY stretchChanged)
+    Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment NOTIFY alignmentChanged)
+    Q_PROPERTY(int spacing READ spacing WRITE setSpacing NOTIFY spacingChanged)
+
+public:
+    LinearLayoutAttached(QObject *parent);
+
+    int stretchFactor() const { return m_stretch; }
+    void setStretchFactor(int f);
+    Qt::Alignment alignment() const { return m_alignment; }
+    void setAlignment(Qt::Alignment a);
+    int spacing() const { return m_spacing; }
+    void setSpacing(int s);
+
+signals:
+    void stretchChanged(QGraphicsLayoutItem*, int);
+    void alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment);
+    void spacingChanged(QGraphicsLayoutItem*, int);
+
+private:
+    int m_stretch;
+    Qt::Alignment m_alignment;
+    int m_spacing;
+};
+
+QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
+QML_DECLARE_INTERFACE(QGraphicsLayout)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
+QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
+QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+
+#endif
+
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.qrc b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.qrc
new file mode 100644
index 0000000..93a3533
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>qgraphicslinearlayout.qml</file>
+</qresource>
+</RCC>
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp
new file mode 100644
index 0000000..c76e403
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp
@@ -0,0 +1,64 @@
+/****************************************************************************
+**
+** 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 plugins of the Qt Toolkit.
+**
+** $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 "linearlayout.h"
+
+#include <qdeclarative.h>
+#include <QDeclarativeView>
+
+#include <QApplication>
+
+int main(int argc, char* argv[])
+{
+    QApplication app(argc, argv);
+
+    qmlRegisterInterface<QGraphicsLayoutItem>("QGraphicsLayoutItem");
+    qmlRegisterInterface<QGraphicsLayout>("QGraphicsLayout");
+    qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>("LinearLayouts",4,7,"QGraphicsLinearLayoutStretchItem");
+    qmlRegisterType<QGraphicsLinearLayoutObject>("LinearLayouts",4,7,"QGraphicsLinearLayout");
+
+    QDeclarativeView view;
+    view.setSource(QUrl(":qgraphicslinearlayout.qml"));
+    view.show();
+
+    return app.exec();
+};
+
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
new file mode 100644
index 0000000..79eb6ff
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
@@ -0,0 +1,15 @@
+TEMPLATE = app
+TARGET  = qgraphicslinearlayout
+QT += declarative
+
+SOURCES += \
+    linearlayout.cpp \
+    main.cpp
+
+HEADERS += \
+    linearlayout.h
+
+RESOURCES += \
+    linearlayout.qrc
+
+
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
new file mode 100644
index 0000000..da77921
--- /dev/null
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** 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 QtDeclarative module of the Qt Toolkit.
+**
+** $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$
+**
+****************************************************************************/
+
+import Qt 4.7
+import LinearLayouts 4.7
+
+Item {
+    width: 400
+    height: 400
+
+    QGraphicsWidget {
+        size.width: parent.width
+        size.height: parent.height
+
+        layout: QGraphicsLinearLayout {
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "300x300"
+                preferredSize: "100x100"
+                Rectangle { color: "yellow"; anchors.fill: parent }
+            }
+            LayoutItem {
+                minimumSize: "100x100"
+                maximumSize: "400x400"
+                preferredSize: "200x200"
+                Rectangle { color: "green"; anchors.fill: parent }
+            }
+        }
+    }
+}
+
-- 
cgit v0.12


From 10dba5b02c6226bce186c0308d40fdedb4ecd9b8 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 31 May 2010 11:42:36 +1000
Subject: Implement removeAt() for layout classes to clean up item removal.
 Also clean up qmlAttachedProperties() implementation and improve QML example

---
 .../qgraphicsgridlayout/.main.cpp.swo              | Bin 12288 -> 12288 bytes
 .../qgraphicsgridlayout/gridlayout.cpp             |  22 ++++++++-----
 .../qgraphicsgridlayout/gridlayout.h               |   2 ++
 .../qgraphicsgridlayout/qgraphicsgridlayout.qml    |  34 +++++++++++----------
 .../qgraphicslayouts/qgraphicslayouts.pro          |   5 +--
 .../qgraphicslinearlayout/linearlayout.cpp         |  22 ++++++++-----
 .../qgraphicslinearlayout/linearlayout.h           |   6 ++--
 .../qgraphicslinearlayout.qml                      |  15 +++++++--
 8 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo
index c742274..cbd3b3e 100644
Binary files a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo and b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo differ
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
index 728c225..1792696 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
@@ -131,13 +131,23 @@ void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
             setAlignment(item, alignment);
         QObject::connect(obj, SIGNAL(alignmentChanged(QGraphicsLayoutItem*, Qt::Alignment)),
                          this, SLOT(updateAlignment(QGraphicsLayoutItem*, Qt::Alignment)));
-        //### need to disconnect when widget is removed? Re-implement removeAt()?
     }
 }
 
+void QGraphicsGridLayoutObject::removeAt(int index)
+{
+    QGraphicsLayoutItem *item = itemAt(index);
+    if (item) {
+        GridLayoutAttached *obj = attachedProperties.value(item);
+        obj->disconnect(this);
+        attachedProperties.remove(item);
+    }
+    QGraphicsGridLayout::removeAt(index);
+}
+
 void QGraphicsGridLayoutObject::clearChildren()
 {
-    //### do I need to delete the removed items? And/or removed them from attachedProperties?
+    // do not delete the removed items; they will be deleted by the QML engine
     while (count() > 0)
         removeAt(count()-1);
 }
@@ -146,7 +156,7 @@ qreal QGraphicsGridLayoutObject::spacing() const
 {
     if (verticalSpacing() == horizontalSpacing())
         return verticalSpacing();
-    return -1;  //###
+    return -1; 
 }
 
 qreal QGraphicsGridLayoutObject::contentsMargin() const
@@ -170,11 +180,9 @@ void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::A
 
 GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
 {
-    // ### This is not allowed - you must attach to any object
-    if (!qobject_cast<QGraphicsLayoutItem*>(obj))
-        return 0;
     GridLayoutAttached *rv = new GridLayoutAttached(obj);
-    attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
+    if (qobject_cast<QGraphicsLayoutItem*>(obj))
+        attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
     return rv;
 }
 
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
index 04f0148..cb8d9b7 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
@@ -69,6 +69,8 @@ public:
     qreal contentsMargin() const;
     void setContentsMargin(qreal);
 
+    void removeAt(int index);
+
     static GridLayoutAttached *qmlAttachedProperties(QObject *);
 
 private slots:
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
index c3edf1d..5cb011f 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
@@ -49,46 +49,48 @@ Item {
         size.width: parent.width
         size.height: parent.height
 
+        /*
+            Below we create a grid layout using the GraphicsGridLayout item 
+            (defined by the GraphicsGridLayoutObject class in gridlayout.h). 
+
+            The row, column etc. are set through attached properties on
+            GraphicsGridLayout, using the properties defined in the 
+            GridLayoutAttached class (also defined in gridlayout.h).
+        */
+
         layout: QGraphicsGridLayout {
-            objectName: "layout"
             LayoutItem {
                 QGraphicsGridLayout.row: 0
                 QGraphicsGridLayout.column: 0
-                QGraphicsGridLayout.alignment: Qt.AlignLeft
                 minimumSize: "100x100"
                 maximumSize: "300x300"
-                preferredSize: "100x100"
+                preferredSize: "200x200"
                 Rectangle { color: "red"; anchors.fill: parent }
             }
             LayoutItem {
-                QGraphicsGridLayout.row: 1
-                QGraphicsGridLayout.column: 0
+                QGraphicsGridLayout.row: 0
+                QGraphicsGridLayout.column: 1
                 minimumSize: "100x100"
                 maximumSize: "200x200"
-                preferredSize: "100x100"
+                preferredSize: "200x200"
                 Rectangle { color: "orange"; anchors.fill: parent }
             }
             LayoutItem {
-                QGraphicsGridLayout.row: 2
+                QGraphicsGridLayout.row: 1
                 QGraphicsGridLayout.column: 0
+                QGraphicsGridLayout.columnSpan: 2
                 minimumSize: "100x100"
-                maximumSize: "300x300"
-                preferredSize: "200x200"
                 Rectangle { color: "yellow"; anchors.fill: parent }
             }
             LayoutItem {
-                QGraphicsGridLayout.row: 0
-                QGraphicsGridLayout.column: 1
-                minimumSize: "100x100"
-                maximumSize: "200x200"
+                QGraphicsGridLayout.row: 2
+                QGraphicsGridLayout.column: 0
                 preferredSize: "200x200"
                 Rectangle { color: "green"; anchors.fill: parent }
             }
             LayoutItem {
-                QGraphicsGridLayout.row: 1
+                QGraphicsGridLayout.row: 2
                 QGraphicsGridLayout.column: 1
-                minimumSize: "100x100"
-                maximumSize: "400x400"
                 preferredSize: "200x200"
                 Rectangle { color: "blue"; anchors.fill: parent }
             }
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro
index d92a6f4..672120a 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    graphicsLayouts \
-    layoutItem
+    layoutitem \
+    qgraphicsgridlayout \
+    qgraphicslinearlayout
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
index 5cd35cb..080b6ce 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
@@ -44,7 +44,7 @@
 #include <QGraphicsLayoutItem>
 
 LinearLayoutAttached::LinearLayoutAttached(QObject *parent)
-: QObject(parent), m_stretch(1), m_alignment(Qt::AlignCenter), m_spacing(0)
+: QObject(parent), m_stretch(1), m_alignment(Qt::AlignTop), m_spacing(0)
 {
 }
 
@@ -98,7 +98,6 @@ void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutIte
 {
     insertItem(index, item);
 
-    //connect attached properties
     if (LinearLayoutAttached *obj = attachedProperties.value(item)) {
         setStretchFactor(item, obj->stretchFactor());
         setAlignment(item, obj->alignment());
@@ -109,12 +108,23 @@ void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutIte
                          this, SLOT(updateAlignment(QGraphicsLayoutItem*,Qt::Alignment)));
         QObject::connect(obj, SIGNAL(spacingChanged(QGraphicsLayoutItem*,int)),
                          this, SLOT(updateSpacing(QGraphicsLayoutItem*,int)));
-        //### need to disconnect when widget is removed?
     }
 }
 
+void QGraphicsLinearLayoutObject::removeAt(int index)
+{
+    QGraphicsLayoutItem *item = itemAt(index);
+    if (item) {
+        LinearLayoutAttached *obj = attachedProperties.value(item);
+        obj->disconnect(this);
+        attachedProperties.remove(item);
+    }
+    QGraphicsLinearLayout::removeAt(index);
+}
+
 void QGraphicsLinearLayoutObject::clearChildren()
 {
+    // do not delete the removed items; they will be deleted by the QML engine
     while (count() > 0)
         removeAt(count()-1);
 }
@@ -156,11 +166,9 @@ void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt:
 QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> QGraphicsLinearLayoutObject::attachedProperties;
 LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
 {
-    // ### This is not allowed - you must attach to any object
-    if (!qobject_cast<QGraphicsLayoutItem*>(obj))
-        return 0;
     LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
-    attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
+    if (qobject_cast<QGraphicsLayoutItem*>(obj))
+        attachedProperties.insert(qobject_cast<QGraphicsLayoutItem*>(obj), rv);
     return rv;
 }
 
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
index 392f3f8..e6daf4d 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
@@ -74,11 +74,13 @@ public:
 
     QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
 
-    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
-
     qreal contentsMargin() const;
     void setContentsMargin(qreal);
 
+    void removeAt(int index);
+
+    static LinearLayoutAttached *qmlAttachedProperties(QObject *);
+
 private slots:
     void updateStretch(QGraphicsLayoutItem*,int);
     void updateSpacing(QGraphicsLayoutItem*,int);
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
index da77921..72cdeb6 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
@@ -49,17 +49,28 @@ Item {
         size.width: parent.width
         size.height: parent.height
 
+        /*
+            Below we create a linear layout using the GraphicsLinearLayout item 
+            (defined by the GraphicsLinearLayoutObject class in linearlayout.h). 
+
+            The first LayoutItem uses 'GraphicsLinearLayout.spacing' to set the
+            item's spacing: this is an attached property, set using the 
+            properties defined in the LinearLayoutAttached class (also defined
+            in linearlayout.h).
+        */
+
         layout: QGraphicsLinearLayout {
             LayoutItem {
+                QGraphicsLinearLayout.spacing: 50
                 minimumSize: "100x100"
-                maximumSize: "300x300"
+                maximumSize: "200x200"
                 preferredSize: "100x100"
                 Rectangle { color: "yellow"; anchors.fill: parent }
             }
             LayoutItem {
                 minimumSize: "100x100"
                 maximumSize: "400x400"
-                preferredSize: "200x200"
+                preferredSize: "300x300"
                 Rectangle { color: "green"; anchors.fill: parent }
             }
         }
-- 
cgit v0.12


From 33bf5e9941d4c1c257d22280cd0e8fb64382c782 Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 31 May 2010 11:45:39 +1000
Subject: File shouldn't be in repository

---
 .../qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo  | Bin 12288 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo

diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo
deleted file mode 100644
index cbd3b3e..0000000
Binary files a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/.main.cpp.swo and /dev/null differ
-- 
cgit v0.12


From 1e60f5fb1c1ad9289247ef3bc47a94434b27dbea Mon Sep 17 00:00:00 2001
From: Bea Lam <bea.lam@nokia.com>
Date: Mon, 31 May 2010 11:50:46 +1000
Subject: Rename QGraphics...Layout classes/QML items to Graphics...Layout to
 make it clear they are custom classes/items (not built-in)

---
 .../qgraphicsgridlayout/gridlayout.cpp             | 24 +++++++++----------
 .../qgraphicsgridlayout/gridlayout.h               | 18 +++++++-------
 .../qgraphicslayouts/qgraphicsgridlayout/main.cpp  |  2 +-
 .../qgraphicsgridlayout/qgraphicsgridlayout.qml    | 24 +++++++++----------
 .../qgraphicslinearlayout/linearlayout.cpp         | 28 +++++++++++-----------
 .../qgraphicslinearlayout/linearlayout.h           | 24 +++++++++----------
 .../qgraphicslinearlayout/main.cpp                 |  4 ++--
 .../qgraphicslinearlayout.qml                      |  4 ++--
 8 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
index 1792696..b52305e 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
@@ -58,18 +58,18 @@ void GridLayoutAttached::setAlignment(Qt::Alignment a)
     }
 }
 
-QHash<QGraphicsLayoutItem*, GridLayoutAttached*> QGraphicsGridLayoutObject::attachedProperties;
+QHash<QGraphicsLayoutItem*, GridLayoutAttached*> GraphicsGridLayoutObject::attachedProperties;
 
-QGraphicsGridLayoutObject::QGraphicsGridLayoutObject(QObject *parent)
+GraphicsGridLayoutObject::GraphicsGridLayoutObject(QObject *parent)
 : QObject(parent)
 {
 }
 
-QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject()
+GraphicsGridLayoutObject::~GraphicsGridLayoutObject()
 {
 }
 
-void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *widget)
+void GraphicsGridLayoutObject::addWidget(QGraphicsWidget *widget)
 {
     //use attached properties
     if (QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(widget))) {
@@ -85,7 +85,7 @@ void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *widget)
     }
 }
 
-void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
+void GraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
 {
     //use attached properties
     if (GridLayoutAttached *obj = attachedProperties.value(item)) {
@@ -134,7 +134,7 @@ void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item)
     }
 }
 
-void QGraphicsGridLayoutObject::removeAt(int index)
+void GraphicsGridLayoutObject::removeAt(int index)
 {
     QGraphicsLayoutItem *item = itemAt(index);
     if (item) {
@@ -145,21 +145,21 @@ void QGraphicsGridLayoutObject::removeAt(int index)
     QGraphicsGridLayout::removeAt(index);
 }
 
-void QGraphicsGridLayoutObject::clearChildren()
+void GraphicsGridLayoutObject::clearChildren()
 {
     // do not delete the removed items; they will be deleted by the QML engine
     while (count() > 0)
         removeAt(count()-1);
 }
 
-qreal QGraphicsGridLayoutObject::spacing() const
+qreal GraphicsGridLayoutObject::spacing() const
 {
     if (verticalSpacing() == horizontalSpacing())
         return verticalSpacing();
     return -1; 
 }
 
-qreal QGraphicsGridLayoutObject::contentsMargin() const
+qreal GraphicsGridLayoutObject::contentsMargin() const
 {
     qreal a, b, c, d;
     getContentsMargins(&a, &b, &c, &d);
@@ -168,17 +168,17 @@ qreal QGraphicsGridLayoutObject::contentsMargin() const
     return -1;
 }
 
-void QGraphicsGridLayoutObject::setContentsMargin(qreal m)
+void GraphicsGridLayoutObject::setContentsMargin(qreal m)
 {
     setContentsMargins(m, m, m, m);
 }
 
-void QGraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+void GraphicsGridLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
 {
     QGraphicsGridLayout::setAlignment(item, alignment);
 }
 
-GridLayoutAttached *QGraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
+GridLayoutAttached *GraphicsGridLayoutObject::qmlAttachedProperties(QObject *obj)
 {
     GridLayoutAttached *rv = new GridLayoutAttached(obj);
     if (qobject_cast<QGraphicsLayoutItem*>(obj))
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
index cb8d9b7..ca2cedc 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
@@ -47,7 +47,7 @@
 #include <QGraphicsLayoutItem>
 
 class GridLayoutAttached;
-class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
+class GraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
 {
     Q_OBJECT
     Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
@@ -60,8 +60,8 @@ class QGraphicsGridLayoutObject : public QObject, public QGraphicsGridLayout
     Q_CLASSINFO("DefaultProperty", "children")
 
 public:
-    QGraphicsGridLayoutObject(QObject * = 0);
-    ~QGraphicsGridLayoutObject();
+    GraphicsGridLayoutObject(QObject * = 0);
+    ~GraphicsGridLayoutObject();
 
     QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
 
@@ -84,19 +84,19 @@ private:
     void addLayoutItem(QGraphicsLayoutItem *);
 
     static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<QGraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
+        static_cast<GraphicsGridLayoutObject*>(prop->object)->addLayoutItem(item);
     }
 
     static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<QGraphicsGridLayoutObject*>(prop->object)->clearChildren();
+        static_cast<GraphicsGridLayoutObject*>(prop->object)->clearChildren();
     }
 
     static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->count();
+        return static_cast<GraphicsGridLayoutObject*>(prop->object)->count();
     }
 
     static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<QGraphicsGridLayoutObject*>(prop->object)->itemAt(index);
+        return static_cast<GraphicsGridLayoutObject*>(prop->object)->itemAt(index);
     }
 
     static QHash<QGraphicsLayoutItem*, GridLayoutAttached*> attachedProperties;
@@ -210,8 +210,8 @@ private:
 
 QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
 QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(QGraphicsGridLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(GraphicsGridLayoutObject)
+QML_DECLARE_TYPEINFO(GraphicsGridLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif
 
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp
index 7585b23..6525cb3 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp
@@ -51,7 +51,7 @@ int main(int argc, char* argv[])
 
     qmlRegisterInterface<QGraphicsLayoutItem>("QGraphicsLayoutItem");
     qmlRegisterInterface<QGraphicsLayout>("QGraphicsLayout");
-    qmlRegisterType<QGraphicsGridLayoutObject>("GridLayouts",4,7,"QGraphicsGridLayout");
+    qmlRegisterType<GraphicsGridLayoutObject>("GridLayouts", 4, 7, "GraphicsGridLayout");
 
     QDeclarativeView view;
     view.setSource(QUrl(":qgraphicsgridlayout.qml"));
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
index 5cb011f..50026f1 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
@@ -58,39 +58,39 @@ Item {
             GridLayoutAttached class (also defined in gridlayout.h).
         */
 
-        layout: QGraphicsGridLayout {
+        layout: GraphicsGridLayout {
             LayoutItem {
-                QGraphicsGridLayout.row: 0
-                QGraphicsGridLayout.column: 0
+                GraphicsGridLayout.row: 0
+                GraphicsGridLayout.column: 0
                 minimumSize: "100x100"
                 maximumSize: "300x300"
                 preferredSize: "200x200"
                 Rectangle { color: "red"; anchors.fill: parent }
             }
             LayoutItem {
-                QGraphicsGridLayout.row: 0
-                QGraphicsGridLayout.column: 1
+                GraphicsGridLayout.row: 0
+                GraphicsGridLayout.column: 1
                 minimumSize: "100x100"
                 maximumSize: "200x200"
                 preferredSize: "200x200"
                 Rectangle { color: "orange"; anchors.fill: parent }
             }
             LayoutItem {
-                QGraphicsGridLayout.row: 1
-                QGraphicsGridLayout.column: 0
-                QGraphicsGridLayout.columnSpan: 2
+                GraphicsGridLayout.row: 1
+                GraphicsGridLayout.column: 0
+                GraphicsGridLayout.columnSpan: 2
                 minimumSize: "100x100"
                 Rectangle { color: "yellow"; anchors.fill: parent }
             }
             LayoutItem {
-                QGraphicsGridLayout.row: 2
-                QGraphicsGridLayout.column: 0
+                GraphicsGridLayout.row: 2
+                GraphicsGridLayout.column: 0
                 preferredSize: "200x200"
                 Rectangle { color: "green"; anchors.fill: parent }
             }
             LayoutItem {
-                QGraphicsGridLayout.row: 2
-                QGraphicsGridLayout.column: 1
+                GraphicsGridLayout.row: 2
+                GraphicsGridLayout.column: 1
                 preferredSize: "200x200"
                 Rectangle { color: "blue"; anchors.fill: parent }
             }
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
index 080b6ce..d0e9783 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
@@ -72,12 +72,12 @@ void LinearLayoutAttached::setAlignment(Qt::Alignment a)
     }
 }
 
-QGraphicsLinearLayoutStretchItemObject::QGraphicsLinearLayoutStretchItemObject(QObject *parent)
+GraphicsLinearLayoutStretchItemObject::GraphicsLinearLayoutStretchItemObject(QObject *parent)
     : QObject(parent)
 {
 }
 
-QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+QSizeF GraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
 {
     Q_UNUSED(which);
     Q_UNUSED(constraint);
@@ -85,16 +85,16 @@ QSizeF QGraphicsLinearLayoutStretchItemObject::sizeHint(Qt::SizeHint which, cons
 }
 
 
-QGraphicsLinearLayoutObject::QGraphicsLinearLayoutObject(QObject *parent)
+GraphicsLinearLayoutObject::GraphicsLinearLayoutObject(QObject *parent)
 : QObject(parent)
 {
 }
 
-QGraphicsLinearLayoutObject::~QGraphicsLinearLayoutObject()
+GraphicsLinearLayoutObject::~GraphicsLinearLayoutObject()
 {
 }
 
-void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
+void GraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutItem *item)
 {
     insertItem(index, item);
 
@@ -111,7 +111,7 @@ void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutIte
     }
 }
 
-void QGraphicsLinearLayoutObject::removeAt(int index)
+void GraphicsLinearLayoutObject::removeAt(int index)
 {
     QGraphicsLayoutItem *item = itemAt(index);
     if (item) {
@@ -122,14 +122,14 @@ void QGraphicsLinearLayoutObject::removeAt(int index)
     QGraphicsLinearLayout::removeAt(index);
 }
 
-void QGraphicsLinearLayoutObject::clearChildren()
+void GraphicsLinearLayoutObject::clearChildren()
 {
     // do not delete the removed items; they will be deleted by the QML engine
     while (count() > 0)
         removeAt(count()-1);
 }
 
-qreal QGraphicsLinearLayoutObject::contentsMargin() const
+qreal GraphicsLinearLayoutObject::contentsMargin() const
 {
     qreal a, b, c, d;
     getContentsMargins(&a, &b, &c, &d);
@@ -138,17 +138,17 @@ qreal QGraphicsLinearLayoutObject::contentsMargin() const
     return -1;
 }
 
-void QGraphicsLinearLayoutObject::setContentsMargin(qreal m)
+void GraphicsLinearLayoutObject::setContentsMargin(qreal m)
 {
     setContentsMargins(m, m, m, m);
 }
 
-void QGraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
+void GraphicsLinearLayoutObject::updateStretch(QGraphicsLayoutItem *item, int stretch)
 {
     QGraphicsLinearLayout::setStretchFactor(item, stretch);
 }
 
-void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
+void GraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int spacing)
 {
     for (int i=0; i < count(); i++){
         if (itemAt(i) == item) {
@@ -158,13 +158,13 @@ void QGraphicsLinearLayoutObject::updateSpacing(QGraphicsLayoutItem* item, int s
     }
 }
 
-void QGraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
+void GraphicsLinearLayoutObject::updateAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment)
 {
     QGraphicsLinearLayout::setAlignment(item, alignment);
 }
 
-QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> QGraphicsLinearLayoutObject::attachedProperties;
-LinearLayoutAttached *QGraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
+QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> GraphicsLinearLayoutObject::attachedProperties;
+LinearLayoutAttached *GraphicsLinearLayoutObject::qmlAttachedProperties(QObject *obj)
 {
     LinearLayoutAttached *rv = new LinearLayoutAttached(obj);
     if (qobject_cast<QGraphicsLayoutItem*>(obj))
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
index e6daf4d..d9391ca 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
@@ -46,19 +46,19 @@
 #include <QGraphicsLinearLayout>
 #include <QGraphicsLayoutItem>
 
-class QGraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
+class GraphicsLinearLayoutStretchItemObject : public QObject, public QGraphicsLayoutItem
 {
     Q_OBJECT
     Q_INTERFACES(QGraphicsLayoutItem)
 public:
-    QGraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
+    GraphicsLinearLayoutStretchItemObject(QObject *parent = 0);
 
     virtual QSizeF sizeHint(Qt::SizeHint, const QSizeF &) const;
 };
 
 
 class LinearLayoutAttached;
-class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
+class GraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
 {
     Q_OBJECT
     Q_INTERFACES(QGraphicsLayout QGraphicsLayoutItem)
@@ -69,8 +69,8 @@ class QGraphicsLinearLayoutObject : public QObject, public QGraphicsLinearLayout
     Q_PROPERTY(qreal contentsMargin READ contentsMargin WRITE setContentsMargin)
     Q_CLASSINFO("DefaultProperty", "children")
 public:
-    QGraphicsLinearLayoutObject(QObject * = 0);
-    ~QGraphicsLinearLayoutObject();
+    GraphicsLinearLayoutObject(QObject * = 0);
+    ~GraphicsLinearLayoutObject();
 
     QDeclarativeListProperty<QGraphicsLayoutItem> children() { return QDeclarativeListProperty<QGraphicsLayoutItem>(this, 0, children_append, children_count, children_at, children_clear); }
 
@@ -93,19 +93,19 @@ private:
     void insertLayoutItem(int, QGraphicsLayoutItem *);
 
     static void children_append(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, QGraphicsLayoutItem *item) {
-        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
+        static_cast<GraphicsLinearLayoutObject*>(prop->object)->insertLayoutItem(-1, item);
     }
 
     static void children_clear(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        static_cast<QGraphicsLinearLayoutObject*>(prop->object)->clearChildren();
+        static_cast<GraphicsLinearLayoutObject*>(prop->object)->clearChildren();
     }
 
     static int children_count(QDeclarativeListProperty<QGraphicsLayoutItem> *prop) {
-        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->count();
+        return static_cast<GraphicsLinearLayoutObject*>(prop->object)->count();
     }
 
     static QGraphicsLayoutItem *children_at(QDeclarativeListProperty<QGraphicsLayoutItem> *prop, int index) {
-        return static_cast<QGraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
+        return static_cast<GraphicsLinearLayoutObject*>(prop->object)->itemAt(index);
     }
 
     static QHash<QGraphicsLayoutItem*, LinearLayoutAttached*> attachedProperties;
@@ -143,9 +143,9 @@ private:
 
 QML_DECLARE_INTERFACE(QGraphicsLayoutItem)
 QML_DECLARE_INTERFACE(QGraphicsLayout)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutStretchItemObject)
-QML_DECLARE_TYPE(QGraphicsLinearLayoutObject)
-QML_DECLARE_TYPEINFO(QGraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
+QML_DECLARE_TYPE(GraphicsLinearLayoutStretchItemObject)
+QML_DECLARE_TYPE(GraphicsLinearLayoutObject)
+QML_DECLARE_TYPEINFO(GraphicsLinearLayoutObject, QML_HAS_ATTACHED_PROPERTIES)
 
 #endif
 
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp
index c76e403..f8d08c2 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp
@@ -51,8 +51,8 @@ int main(int argc, char* argv[])
 
     qmlRegisterInterface<QGraphicsLayoutItem>("QGraphicsLayoutItem");
     qmlRegisterInterface<QGraphicsLayout>("QGraphicsLayout");
-    qmlRegisterType<QGraphicsLinearLayoutStretchItemObject>("LinearLayouts",4,7,"QGraphicsLinearLayoutStretchItem");
-    qmlRegisterType<QGraphicsLinearLayoutObject>("LinearLayouts",4,7,"QGraphicsLinearLayout");
+    qmlRegisterType<GraphicsLinearLayoutStretchItemObject>("LinearLayouts", 4, 7, "GraphicsLinearLayoutStretchItem");
+    qmlRegisterType<GraphicsLinearLayoutObject>("LinearLayouts", 4, 7, "GraphicsLinearLayout");
 
     QDeclarativeView view;
     view.setSource(QUrl(":qgraphicslinearlayout.qml"));
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
index 72cdeb6..9a0bd55 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
+++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
@@ -59,9 +59,9 @@ Item {
             in linearlayout.h).
         */
 
-        layout: QGraphicsLinearLayout {
+        layout: GraphicsLinearLayout {
             LayoutItem {
-                QGraphicsLinearLayout.spacing: 50
+                GraphicsLinearLayout.spacing: 50
                 minimumSize: "100x100"
                 maximumSize: "200x200"
                 preferredSize: "100x100"
-- 
cgit v0.12