Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	src/gui/graphicsview/qgraphicswidget.cpp
	src/gui/painting/qdrawutil.cpp
	src/gui/painting/qpainterpath.cpp
	tools/qdoc3/test/qt-cpp-ignore.qdocconf
	tools/qdoc3/test/qt-inc.qdocconf

5 files changed, 36 insertions, 15 deletions

diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 2d64dfe..ed4ab37 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -86,15 +86,15 @@
     \endif
 
     \raw HTML
-        <table cellpadding="2" cellspacing="1" border="0" width="100%" bgcolor="#e5e5e5">
+        <table cellpadding="2" cellspacing="1" border="0" width="100%" class="indextable">
         <tr>
-        <th bgcolor="#66b036" width="33%">
+        <th class="titleheader" width="33%">
         Getting Started
         </th>
-        <th bgcolor="#66b036" width="33%">
+        <th class="titleheader" width="33%">
         General
         </th>
-        <th bgcolor="#66b036" width="33%">
+        <th class="titleheader" width="33%">
         Developer Resources
         </th>
         </tr>
@@ -128,13 +128,13 @@
         </td>
         </tr>
         <tr>
-        <th bgcolor="#66b036">
+        <th class="titleheader">
         API Reference
         </th>
-        <th bgcolor="#66b036">
+        <th class="titleheader">
         Core Features
         </th>
-        <th bgcolor="#66b036">
+        <th class="titleheader">
         Key Technologies
         </th>
         </tr>
@@ -195,13 +195,13 @@
         </td>
         </tr>
         <tr>
-        <th bgcolor="#66b036">
+        <th class="titleheader">
         Add-ons &amp; Services
         </th>
-        <th bgcolor="#66b036">
+        <th class="titleheader">
         Tools
         </th>
-        <th bgcolor="#66b036">
+        <th class="titleheader">
         Licenses &amp; Credits
         </th>
         </tr>
diff --git a/doc/src/installation.qdoc b/doc/src/installation.qdoc
index bc310c9..49ab45a 100644
--- a/doc/src/installation.qdoc
+++ b/doc/src/installation.qdoc
@@ -508,6 +508,9 @@ in the \l{Qt for Windows CE Requirements} document.
     This page describes the specific requirements of libraries and components on which
     Qt depends. For information about installing Qt, see the \l{Installation} page.
 
+    For information about the platforms that Qt supports, see the \l{Supported Platforms}
+    page.
+
     \section1 OpenSSL (version 0.9.7 or later)
 
     Support for \l{SSL}{Secure Sockets Layer (SSL)} communication is provided by the
diff --git a/doc/src/introtodbus.qdoc b/doc/src/introtodbus.qdoc
index 71c65d5..1edc6eb 100644
--- a/doc/src/introtodbus.qdoc
+++ b/doc/src/introtodbus.qdoc
@@ -198,7 +198,24 @@
     \row    \o Interface      \o Plugin identifier  \o Dot-separated
     \endtable
 
-    \section2 Further Reading
+    \section1 Debugging
+
+    When developing applications that use D-Bus, it is sometimes useful to be able
+    to see information about the messages that are sent and received across the
+    bus by each application.
+
+    This feature can be enabled on a per-application basis by setting the
+    \c QDBUS_DEBUG environment variable before running each application.
+    For example, we can enable debugging only for the car in the
+    \l{Remote Controlled Car Example} by running the controller and the
+    car in the following way:
+
+    \snippet doc/src/snippets/code/doc_src_introtodbus.qdoc QDBUS_DEBUG
+
+    Information about the messages will be written to the console the application
+    was launched from.
+
+    \section1 Further Reading
 
     The following documents contain information about Qt's D-Bus integration
     features, and provide details about the mechanisms used to send and receive
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc
index 172bc60..9714a44 100644
--- a/doc/src/qmake-manual.qdoc
+++ b/doc/src/qmake-manual.qdoc
@@ -3303,10 +3303,6 @@
         \o output_function
         \o Specifies a custom qmake function that is used to specify the filename to be created.
     \row
-        \o variables
-        \o Indicates that the variables specified here are replaced with $(QMAKE_COMP_VARNAME) when refered to
-           in the pro file as $(VARNAME).
-    \row
         \o variable_out
         \o The variable that the files created from the output should be added to.
     \endtable
diff --git a/doc/src/snippets/code/doc_src_introtodbus.qdoc b/doc/src/snippets/code/doc_src_introtodbus.qdoc
index bedfe7f..97b14e9 100644
--- a/doc/src/snippets/code/doc_src_introtodbus.qdoc
+++ b/doc/src/snippets/code/doc_src_introtodbus.qdoc
@@ -1,3 +1,8 @@
 //! [0]
 org.freedesktop.DBus
 //! [0]
+
+//! [QDBUS_DEBUG]
+examples/dbus/remotecontrolledcar/controller/controller &
+QDBUS_DEBUG=1 examples/dbus/remotecontrolledcar/car/car &
+//! [QDBUS_DEBUG]