1 files changed, 61 insertions, 5 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.cpp
index 062839fab0..181913ba32 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitversion.cpp
@@ -22,11 +22,21 @@
 #include <WebKitVersion.h>
 
 /*!
-
+    \relates QWebPage
+    \since 4.6
     Returns the version number of WebKit at run-time as a string (for
-    example, "531.3"). This is the version of WebKit the application
-    was compiled against.
+    example, "531.3").
+
+    This version is commonly used in WebKit based browsers as part
+    of the user agent string. Web servers and JavaScript might use
+    it to identify the presence of certain WebKit engine features
+    and behaviour.
 
+    The evolution of this version is bound to the releases of Apple's
+    Safari browser. For a version specific to the QtWebKit library,
+    see QTWEBKIT_VERSION
+
+    \sa QWebPage::userAgentForUrl()
 */
 QString qWebKitVersion()
 {
@@ -34,11 +44,13 @@ QString qWebKitVersion()
 }
 
 /*!
-
+    \relates QWebPage
+    \since 4.6
     Returns the 'major' version number of WebKit at run-time as an integer
     (for example, 531). This is the version of WebKit the application
     was compiled against.
 
+    \sa qWebKitVersion()
 */
 int qWebKitMajorVersion()
 {
@@ -46,13 +58,57 @@ int qWebKitMajorVersion()
 }
 
 /*!
-
+    \relates QWebPage
+    \since 4.6
     Returns the 'minor' version number of WebKit at run-time as an integer
     (for example, 3). This is the version of WebKit the application
     was compiled against.
 
+    \sa qWebKitVersion()
 */
 int qWebKitMinorVersion()
 {
     return WEBKIT_MINOR_VERSION;
 }
+
+/*!
+    \macro QTWEBKIT_VERSION
+    \relates QWebPage
+
+    This macro expands a numeric value of the form 0xMMNNPP (MM =
+    major, NN = minor, PP = patch) that specifies QtWebKit's version
+    number. For example, if you compile your application against QtWebKit
+    2.1.2, the QTWEBKIT_VERSION macro will expand to 0x020102.
+
+    You can use QTWEBKIT_VERSION to use the latest QtWebKit API where
+    available.
+
+    \sa QT_VERSION
+*/
+
+/*!
+    \macro QTWEBKIT_VERSION_STR
+    \relates QWebPage
+
+    This macro expands to a string that specifies QtWebKit's version number
+    (for example, "2.1.2"). This is the version against which the
+    application is compiled.
+
+    \sa QTWEBKIT_VERSION
+*/
+
+/*!
+    \macro QTWEBKIT_VERSION_CHECK
+    \relates QWebPage
+
+    Turns the major, minor and patch numbers of a version into an
+    integer, 0xMMNNPP (MM = major, NN = minor, PP = patch). This can
+    be compared with another similarly processed version id, for example
+    in a preprocessor statement:
+
+    \code
+    #if QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 1, 0)
+    // code to use API new in QtWebKit 2.1.0
+    #endif
+    \endcode
+*/