Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (69 commits)
  Fix conversion of QAbstractItemModel::rowsMoved() parameters
  Do not unconditionally use pkg-config in .pro files
  Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e
  Revert "Don't second-guess the "engine"; call cleanPath on absolutePaths"
  Revert "In 4.7 QFileInfo::absolute(File)Path returned clean paths"
  In 4.7 QFileInfo::absolute(File)Path returned clean paths
  Porting the QTBUG-21084 fix to 4.7.4
  ret is an "internal" path, no need to re-process it
  We prefer capitalized drive letters, make it so sooner
  Don't second-guess the "engine"; call cleanPath on absolutePaths
  Compare non-canonical paths before falling back on expensive computation
  Fix QDir::operator==(const QDir &) const
  Fixed use of deleted object in XmlPatterns EvaluationCache
  Check if bridge plugin vector is still valid.
  Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd
  Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0
  QWindowsStyle: fix bug in eventFilter on KeyPressed event with alt pressed: incorrect work with list
  Crash when creating scroll bar skin graphics on S60 (debug only)
  Fix memory leak in ListModel custom parser
  QS60Style omits drawing theme background in some Symbian SDKs
  ...

8 files changed, 34 insertions, 214 deletions

diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index cecccf6254..d89ca53dbb 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -46,7 +46,7 @@ Qt applications.
 \section1 Getting Started
 
 \list
-\o \l{Introduction to Qt Quick}
+\o \l{Intro to Qt Quick}{Introduction to Qt Quick}
 \o \l{QML for Qt Programmers}{QML Programming for Qt Programmers}
 \o \l{Getting Started Programming with QML}
 
diff --git a/doc/src/declarative/qtquick-intro.qdoc b/doc/src/declarative/qtquick-intro.qdoc
index 4cd5db3867..bdad2c3047 100644
--- a/doc/src/declarative/qtquick-intro.qdoc
+++ b/doc/src/declarative/qtquick-intro.qdoc
@@ -27,7 +27,7 @@
 
 /*!
 \page qml-intro.html
-\title Introduction to Qt Quick
+\title Intro to Qt Quick
 
 Qt Quick is a collection of technologies that are designed to help developers
 create the kind of intuitive, modern, and fluid user interfaces that are
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 184a881527..329bac5202 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -3116,6 +3116,23 @@
     platform application shell. In addition it will make the application to
     be launched in background.
 
+    From S60 version 5.4 onwards, you can specify \c graphics_memory value using \c RSS_RULES
+    to specify the graphics memory quota for the application. The value is in kilobytes and
+    defaults to 24576 (i.e. 24MB) for applications that link against QtGui. The default for all
+    other applications is zero.
+
+    The graphics memory quota tells the operating system how much graphics memory the
+    application is likely to need so that it can free up enough graphics memory prior to
+    application launch. If the value is too small, it can cause random slowdowns later when
+    the memory is freed on on-demand basis. On the other hand, too large values can delay
+    the application launch unnecessarily.
+
+    For example:
+
+    \snippet doc/src/snippets/code/doc_src_qmake-manual.pro 159
+
+    This example sets the graphics memory quota to 12MB.
+
     For detailed list of possible \c APP_REGISTRATION_INFO statements, please refer to the
     Symbian platform help.
 
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index af418e0781..24903746fe 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -38,7 +38,9 @@
             \list
             \o \l{Qt Features Overview}
             \o \l{How to Learn Qt}
-            \o \l{Introduction to Qt Quick}
+            \o \l{Introduction to Qt Quick}{Qt Quick}
+            \o \l{Qt Whitepaper}{Qt C++ Framework}
+            \o \l{Intro to Qt Quick}{Qt Quick}
             \o \l{external: Qt Mobility Manual}{Qt Mobility}
             \o \l{Qt WebKit}
             \endlist
diff --git a/doc/src/platforms/supported-platforms.qdoc b/doc/src/platforms/supported-platforms.qdoc
index ba59c375f4..9d476952f5 100644
--- a/doc/src/platforms/supported-platforms.qdoc
+++ b/doc/src/platforms/supported-platforms.qdoc
@@ -334,8 +334,8 @@
 
     \section2 Advanced Text Layout Engine
 
-    Qt for Windows CE supports TrueType and raster fonts. Qt also has
-    extended Unicode support and right-to-left languages. Qt's rich text
+    Qt for Windows CE supports TrueType® and raster fonts. Qt also has
+    extended Unicode support and right-to-left languages. Qt’s rich text
     engine adds capabilities for complex text layouts including tables,
     path tracing and text which flows around shapes.
 
@@ -373,7 +373,7 @@
     by embedded Linux. You can use Qt to create highly memory efficient
     devices and applications that have completely unique user experiences.
 
-    Qt runs anywhere Linux runs. Qt's intuitive API means fewer lines of
+    Qt runs anywhere Linux runs. Qt’s intuitive API means fewer lines of
     code and higher level functionality in less time. Use the code from
     one single code-base and rebuild for all \l{Supported Platforms}
     {supported platforms}.
@@ -410,7 +410,7 @@
     frame buffer} that will match the physical device display, pixel for
     pixel. This gives the developer a realistic testing infrastructure
     testing on the desktop where the frame buffer simulates the physical
-    device display's width, height and color depth.
+    device display’s width, height and color depth.
 
     \section2 Inter-Process Communication (IPC)
 
@@ -421,7 +421,7 @@
     \section2 Extended Font Format
 
     Qt supports a wide range of font formats on embedded Linux including:
-    TrueType, Postscript Type1 and Qt pre-rendered fonts. Qt has
+    TrueType®, Postscript® Type1 and Qt pre-rendered fonts. Qt has
     extended Unicode support including automatic data extraction at build
     time and automatic update at runtime.
 
@@ -681,7 +681,7 @@
     \group platform-details
 
     Qt is a cross-platform application and UI framework. Using Qt,
-    you can write GUI applications once and deploy them
+    you can write web-enabled applications once and deploy them
     across desktop, mobile and embedded operating systems without
     rewriting the source code.
 
diff --git a/doc/src/qt-features.qdoc b/doc/src/qt-features.qdoc
deleted file mode 100644
index 0ae00b0c3f..0000000000
--- a/doc/src/qt-features.qdoc
+++ /dev/null
@@ -1,204 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 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:FDL$
-** GNU Free Documentation License
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms
-** and conditions contained in a signed written agreement between you
-** and Nokia.
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
-    \page qt-overview.html
-    \title Qt Features Overview
-
-    This document provides a summary of the most important features of Qt,
-    providing links to other pages in the documentation that cover these
-    features in more detail. It is not intended to be a comprehensive
-    guide to Qt's features.
-
-    \section1 Fundamental Technologies in Qt
-
-    Qt is built upon a set of core technologies, provided by the \l QtCore
-    and \l QtGui modules. These include the following:
-
-    \list
-    \o \l{The Tulip Container Classes}, a set of template container classes.
-    \o \l{The Arthur Paint System}, the Qt 4 painting framework.
-    \o \l{The Interview Framework}, a model/view architecture for item views
-       and the \l{QtSQL Module}, which also uses this architecture.
-    \o \l{The Scribe Classes}, a framework for creating text documents,
-        performing low-level text layout and writing OpenDocument files.
-    \o A collection of \l{Qt Widget Gallery}{common desktop widgets}, styled
-       to fit in on each supported platform.
-    \o \l{The Qt 4 Main Window Classes}, a main window, toolbar, menu, and
-       docking architecture.
-    \o The \l{Graphics View} framework provides a canvas for producing
-       interactive graphics.
-    \o The \l{QtNetwork Module} provides support for TCP, UDP and local
-       sockets that are integrated with Qt's event model, including support
-       for Secure Socket Layer (SSL) communications,
-       \l{QNetworkProxy}{network proxy} servers and
-       \l{Bearer Management}{network bearer management}.
-    \o Enhanced \l{qt4-threads.html}{thread support} allows
-    \l{Signals & Slots}{signal-slot} connections across threads and
-       per-thread event loops.
-       Additionally, \l{Thread Support in Qt}{a framework for concurrent programming}
-       using Qt paradigms makes common threading tasks easier.
-    \o A \l{resource system} for embedding images and other resource files
-       into executable files makes it easier to deploy applications.
-    \o A \l{QTestLib Manual}{unit testing framework} for Qt applications and
-       libraries.
-    \endlist
-
-    The mature classes provided by these technologies have been used to build
-    robust, cross-platform desktop applications. They are augmented by a number
-    of additional technologies and improvements that have appeared over the
-    lifetime of Qt 4.
-    
-    \section1 Graphical User Interfaces
-
-    \div{class="float-right"}
-    \inlineimage gtk-tabwidget.png
-    \enddiv
-    \div{class="float-right"}
-    \inlineimage gtk-progressbar.png
-    \br
-    \inlineimage gtk-checkbox.png
-    \br
-    \inlineimage plastique-combobox.png
-    \br
-    \inlineimage plastique-radiobutton.png
-    \enddiv
-
-    Alongside the support for traditional desktop user interfaces, Qt includes
-    support for declarative UI development with \l{Qt Quick}, a set of
-    technologies for creating fluid, dynamic user interfaces. A starting point
-    for exploring this approach can be found in the \l{Introduction to Qt Quick}
-    guide.
-
-    Qt provides a range of standard user interface elements, called widgets,
-    for each supported platform. Widgets can be used as containers for other
-    widgets, as windows, and as regular controls that the user interacts with.
-    Where the platform supports it, widgets can be made to appear partially
-    transparent, and may be styled with \l{Qt Style Sheets}.
-
-    Support for \l{QTouchEvent}{touch input} and \l{Gestures Programming}{gestures}
-    enable widgets to be used to create intuitive user interfaces for
-    touch-enabled devices.
-
-    User interfaces can also be created dynamically at run-time with the
-    features provided by the \l{QtUiTools} module.
-
-    A selection of available widgets are shown in the \l{Qt Widget Gallery}.
-    An introduction to the concepts behind widgets can be found in the
-    \l{Widgets Tutorial}.
-
-    \clearfloat
-    \section1 Painting, Printing and Rendering
-
-    \div{class="float-left"}
-    \inlineimage qpainter-affinetransformations.png
-    \enddiv
-    
-    Widgets are just one of many kinds of paint device that Qt can render onto.
-    This support for unified painting makes it possible for applications to use
-    the same painting code for different tasks, as well as allowing Qt to be
-    extended to support additional file formats.
-
-    Qt provides support for common bitmap image formats,
-    \l{QtSvg Module}{Scalable Vector Graphics} (SVG) drawings and animations,
-    Postscript and Portable Document Format (PDF) files. Postscript and PDF are
-    integrated with \l{Printing with Qt}{Qt's printing system}, which also
-    allows printed output to be previewed.
-
-    Interactive graphics can be created with the
-    \l{The Animation Framework}{animation framework}, allowing animations to be
-    used with both widgets and graphics items. Animations can be used with the
-    \l{The State Machine Framework}{state machine framework}, which provides a
-    way to express application logic and integrate it with the user interface.
-    Animations can be enhanced with a collection of
-    \l{QGraphicsEffect}{graphics effects} that operate on graphics items and
-    can be applied individually or combined to create more complex effects.
-
-    Qt supports integration with \l{QtOpenGL}{OpenGL} on a number of levels,
-    providing convenience functions for handling textures and colors, as well
-    as providing support for pixel and sample buffers. Future support for
-    higher level 3D integration is provided by Qt3D enablers which include
-    \l{QMatrix4x4}{matrix multiplication}, \l{QQuaternion}{quaternions}, and an
-    API for \l{QGLShader}{vertex and fragment shaders}.
-
-    Two APIs are provided for multimedia. The
-    \l{Phonon Overview}{Phonon Multimedia Framework} has traditionally been
-    used on desktop platforms. A set of
-    \l{QtMultimedia Module}{multimedia services} provides low-level access to
-    the system's audio system and is often used on mobile devices.
-
-    \clearfloat
-    \section1 Infrastructure
-
-    \div{class="float-right"}
-    \inlineimage qtscript-context2d.png
-    \enddiv
-
-    Facilities for Inter-Process Communication (IPC) and Remote Procedure
-    Calling (RPC) mechanisms are available on platforms that support the
-    \l{intro-to-dbus.html}{D-Bus} message bus system.
-
-    An \l{Undo Framework}{Undo framework} based on the
-    \l{Books about GUI Design#Design Patterns}{Command pattern} is designed to
-    enable a consistent approach to handling data in editing applications.
-
-    The \l{QtScript} and \l{QtScriptTools} modules provide support for
-    application scripting and debugging using the ECMAScript language.
-
-    The \l{QtHelp Module} provides the foundations of an interactive help
-    system that can be used in conjunction with Qt Creator or integrated into
-    applications directly.
-
-    XML handling is supported in a number of places in Qt. The \l QtCore module
-    provides classes for reading and writing XML streams. The \l QtXmlPatterns
-    module includes XQuery, XPath and XSLT support, providing facilities for
-    XML processing beyond that supported by the QtXml module, which contains
-    SAX and DOM parsers. XML schema validation in the QtXmlPatterns module
-    covers large parts of version 1.0 of the specification.
-
-    \clearfloat
-    \section1 Web Client Integration
-
-    Integration between \l{Webkit in Qt}{Qt and WebKit} makes it possible for
-    developers to use a fully-featured Web browser engine to display documents
-    and access online services. Developers can access the browser's environment
-    to create documents and run scripts within one or more browser widgets.
-
-    A \l{QWebElement}{DOM access API} for QtWebKit provides a cleaner and safer
-    way to access elements and structures of Web pages without the use of
-    JavaScript.
-
-    \section1 Further Reading
-
-    Many of the technologies mentioned here, as well as other, more specific
-    features, are listed in the \l{What's New in Qt 4} document. A complete
-    list of Qt's modules can be found on the \l{All Modules} page, which
-    also includes more domain-specific technologies.
-
-    The tools that are supplied with Qt are covered by the listing in the
-    \l{Qt's Tools} document.
-*/
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 01103a8292..17dc1af997 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -138,7 +138,7 @@
 
     In Qt 4.4:
     \list
-    \o \l{WebKit in Qt}{Qt WebKit integration}, making it possible for developers
+    \o \l{Webkit in QT}{Qt WebKit integration}, making it possible for developers
     to use a fully-featured Web browser to display documents and access online
     services.
     \o A multimedia API provided by the \l{Phonon Overview}{Phonon Multimedia Framework}.
@@ -707,6 +707,7 @@
     introduced in Qt 4.7.
 
     \sincelist 4.7
+
 */
 
 /*!
diff --git a/doc/src/snippets/code/doc_src_qmake-manual.pro b/doc/src/snippets/code/doc_src_qmake-manual.pro
index ee35b770fd..042ca0ecbb 100644
--- a/doc/src/snippets/code/doc_src_qmake-manual.pro
+++ b/doc/src/snippets/code/doc_src_qmake-manual.pro
@@ -1023,3 +1023,7 @@ packagesExist(sqlite3 QtNetwork QtDeclarative) {
     // Use the fancy UI, as we have extra packages available
 #endif
 #! [158]
+
+#! [159]
+RSS_RULES += "graphics_memory=12288;"
+#! [159]