Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
author: Laszlo Agocs <laszlo.p.agocs@nokia.com> 2011-03-01 07:57:03 (GMT)
committer: Laszlo Agocs <laszlo.p.agocs@nokia.com> 2011-03-01 07:57:03 (GMT)
commit: e538957c77f71b1cc38a3c43c9f3157f65a3ff11 (patch)
tree: 3d013b12ba28668d127fe5532de5fc588fe63cb0 /src
parent: 67d5513b5aca096dfc33952cf81219087b0e41b0 (diff)
parent: 2653c4fcf42ec93db16a299c29c9fe0f98680c75 (diff)
download: Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.zip
Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.tar.gz
Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.tar.bz2
273 files changed, 9088 insertions, 2557 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h
index 63d9e55..2c0bf6d 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h
@@ -22,9 +22,9 @@
 
 #include <QtCore/qglobal.h>
 
-#define QTWEBKIT_VERSION_STR "2.0.1"
+#define QTWEBKIT_VERSION_STR "2.0.2"
 // QTWEBKIT_VERSION is (major << 16) + (minor << 8) + patch. Similar to Qt.
-#define QTWEBKIT_VERSION 0x020001
+#define QTWEBKIT_VERSION 0x020002
 // Use: #if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 0, 0)). Similar to Qt.
 #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
index 7a8aae7..4238d33 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -742,11 +742,11 @@ QWebPage* QDeclarativeWebView::page() const
     See QWebSettings for details of these properties.
 
     \qml
-        WebView {
-            settings.pluginsEnabled: true
-            settings.standardFontFamily: "Arial"
-            ...
-        }
+    WebView {
+        settings.pluginsEnabled: true
+        settings.standardFontFamily: "Arial"
+        // ...
+    }
     \endqml
 */
 QDeclarativeWebSettings* QDeclarativeWebView::settingsObject() const
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc
index c2a38fd..d8ca5f9 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc
@@ -415,7 +415,7 @@
 
     \section2 Internet Security
 
-    When exposing native object to an open web environment, it is importwhichant to understand the security
+    When exposing native object to an open web environment, it is important to understand the security
     implications. Think whether the exposed object enables the web environment access to things that
     shouldn't be open, and whether the web content loaded by that web page comes from a trusted. In general, when
     exposing native QObjects that give the web environment access to private information or to functionality
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
index 0335d46..2be8e5e 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
@@ -103,8 +103,8 @@
     The following locations are searched for plugins:
 
     \table
-    \header \o Linux/Unix (X11)  \o Windows
-    \row \o{1,3}
+    \header \o Linux/Unix (X11)
+    \row \o
     \list
     \o \c{.mozilla/plugins} in the user's home directory
     \o \c{.netscape/plugins} in the user's home directory
@@ -134,19 +134,20 @@
     \o \c{$QTWEBKIT_PLUGIN_PATH}
     \endlist
     \endlist
+    \endtable
 
-    \o
author	Laszlo Agocs <laszlo.p.agocs@nokia.com>	2011-03-01 07:57:03 (GMT)
committer	Laszlo Agocs <laszlo.p.agocs@nokia.com>	2011-03-01 07:57:03 (GMT)
commit	e538957c77f71b1cc38a3c43c9f3157f65a3ff11 (patch)
tree	3d013b12ba28668d127fe5532de5fc588fe63cb0 /src
parent	67d5513b5aca096dfc33952cf81219087b0e41b0 (diff)
parent	2653c4fcf42ec93db16a299c29c9fe0f98680c75 (diff)
download	Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.zip Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.tar.gz Qt-e538957c77f71b1cc38a3c43c9f3157f65a3ff11.tar.bz2