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

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team: (193 commits)
  qdoc3: Updates to qdoc to print error message in ALL CAPS
  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
  uikit: get rid of the "min 30fps" for event handling.
  uikit: update README
  Doc: Added a note to Code Editor example docs
  ...

33 files changed, 51 insertions, 0 deletions

diff --git a/src/3rdparty/webkit/include/QtWebKit/QGraphicsWebView b/src/3rdparty/webkit/include/QtWebKit/QGraphicsWebView
new file mode 100644
index 0000000..508a397
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QGraphicsWebView
@@ -0,0 +1 @@
+#include "qgraphicswebview.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebDatabase b/src/3rdparty/webkit/include/QtWebKit/QWebDatabase
new file mode 100644
index 0000000..ec02742
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebDatabase
@@ -0,0 +1 @@
+#include "qwebdatabase.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebElement b/src/3rdparty/webkit/include/QtWebKit/QWebElement
new file mode 100644
index 0000000..32a17d0
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebElement
@@ -0,0 +1 @@
+#include "qwebelement.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebElementCollection b/src/3rdparty/webkit/include/QtWebKit/QWebElementCollection
new file mode 100644
index 0000000..32a17d0
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebElementCollection
@@ -0,0 +1 @@
+#include "qwebelement.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebFrame b/src/3rdparty/webkit/include/QtWebKit/QWebFrame
new file mode 100644
index 0000000..0748fde
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebFrame
@@ -0,0 +1 @@
+#include "qwebframe.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHistory b/src/3rdparty/webkit/include/QtWebKit/QWebHistory
new file mode 100644
index 0000000..35e9da5
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebHistory
@@ -0,0 +1 @@
+#include "qwebhistory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHistoryInterface b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryInterface
new file mode 100644
index 0000000..7352319
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryInterface
@@ -0,0 +1 @@
+#include "qwebhistoryinterface.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHistoryItem b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryItem
new file mode 100644
index 0000000..35e9da5
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryItem
@@ -0,0 +1 @@
+#include "qwebhistory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHitTestResult b/src/3rdparty/webkit/include/QtWebKit/QWebHitTestResult
new file mode 100644
index 0000000..0748fde
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebHitTestResult
@@ -0,0 +1 @@
+#include "qwebframe.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebInspector b/src/3rdparty/webkit/include/QtWebKit/QWebInspector
new file mode 100644
index 0000000..0923bb7
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebInspector
@@ -0,0 +1 @@
+#include "qwebinspector.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebPage b/src/3rdparty/webkit/include/QtWebKit/QWebPage
new file mode 100644
index 0000000..e8e8c10
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebPage
@@ -0,0 +1 @@
+#include "qwebpage.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebPluginFactory b/src/3rdparty/webkit/include/QtWebKit/QWebPluginFactory
new file mode 100644
index 0000000..3e4ee81
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebPluginFactory
@@ -0,0 +1 @@
+#include "qwebpluginfactory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebSecurityOrigin b/src/3rdparty/webkit/include/QtWebKit/QWebSecurityOrigin
new file mode 100644
index 0000000..6427a3b
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebSecurityOrigin
@@ -0,0 +1 @@
+#include "qwebsecurityorigin.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebSettings b/src/3rdparty/webkit/include/QtWebKit/QWebSettings
new file mode 100644
index 0000000..f50c1a2
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebSettings
@@ -0,0 +1 @@
+#include "qwebsettings.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebView b/src/3rdparty/webkit/include/QtWebKit/QWebView
new file mode 100644
index 0000000..3ec1eb9
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebView
@@ -0,0 +1 @@
+#include "qwebview.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QtWebKit b/src/3rdparty/webkit/include/QtWebKit/QtWebKit
new file mode 100644
index 0000000..155a551
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QtWebKit
@@ -0,0 +1,19 @@
+#ifndef QT_QTWEBKIT_MODULE_H
+#define QT_QTWEBKIT_MODULE_H
+#include <QtNetwork/QtNetwork>
+#include "qwebframe.h"
+#include "qgraphicswebview.h"
+#include "qwebkitglobal.h"
+#include "qwebkitplatformplugin.h"
+#include "qwebpage.h"
+#include "qwebview.h"
+#include "qwebsettings.h"
+#include "qwebhistoryinterface.h"
+#include "qwebdatabase.h"
+#include "qwebsecurityorigin.h"
+#include "qwebelement.h"
+#include "qwebpluginfactory.h"
+#include "qwebhistory.h"
+#include "qwebinspector.h"
+#include "qwebkitversion.h"
+#endif // QT_QTWEBKIT_MODULE_H
diff --git a/src/3rdparty/webkit/include/QtWebKit/ViewportAttributes b/src/3rdparty/webkit/include/QtWebKit/ViewportAttributes
new file mode 100644
index 0000000..e8e8c10
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/ViewportAttributes
@@ -0,0 +1 @@
+#include "qwebpage.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/classheaders.pri b/src/3rdparty/webkit/include/QtWebKit/classheaders.pri
new file mode 100644
index 0000000..0e13e75
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/classheaders.pri
@@ -0,0 +1 @@
+WEBKIT_CLASS_HEADERS = $$PWD/QtWebKit $$PWD/QWebHitTestResult $$PWD/QWebFrame $$PWD/QGraphicsWebView $$PWD/QWebPage $$PWD/ViewportAttributes $$PWD/QWebView $$PWD/QWebSettings $$PWD/QWebHistoryInterface $$PWD/QWebDatabase $$PWD/QWebSecurityOrigin $$PWD/QWebElement $$PWD/QWebElementCollection $$PWD/QWebPluginFactory $$PWD/QWebHistoryItem $$PWD/QWebHistory $$PWD/QWebInspector
diff --git a/src/3rdparty/webkit/include/QtWebKit/qgraphicswebview.h b/src/3rdparty/webkit/include/QtWebKit/qgraphicswebview.h
new file mode 100644
index 0000000..0584f1d
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qgraphicswebview.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qgraphicswebview.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebdatabase.h b/src/3rdparty/webkit/include/QtWebKit/qwebdatabase.h
new file mode 100644
index 0000000..f23fed4
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebdatabase.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebdatabase.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebelement.h b/src/3rdparty/webkit/include/QtWebKit/qwebelement.h
new file mode 100644
index 0000000..e11a84b
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebelement.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebelement.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebframe.h b/src/3rdparty/webkit/include/QtWebKit/qwebframe.h
new file mode 100644
index 0000000..d1393c5
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebframe.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebframe.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebhistory.h b/src/3rdparty/webkit/include/QtWebKit/qwebhistory.h
new file mode 100644
index 0000000..edf6f81
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebhistory.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebhistory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebhistoryinterface.h b/src/3rdparty/webkit/include/QtWebKit/qwebhistoryinterface.h
new file mode 100644
index 0000000..da1a6a9
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebhistoryinterface.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebhistoryinterface.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebinspector.h b/src/3rdparty/webkit/include/QtWebKit/qwebinspector.h
new file mode 100644
index 0000000..4742105
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebinspector.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebinspector.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebkitglobal.h b/src/3rdparty/webkit/include/QtWebKit/qwebkitglobal.h
new file mode 100644
index 0000000..b9b2650
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebkitglobal.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebkitglobal.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebkitplatformplugin.h b/src/3rdparty/webkit/include/QtWebKit/qwebkitplatformplugin.h
new file mode 100644
index 0000000..db4e554
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebkitplatformplugin.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebkitplatformplugin.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebkitversion.h b/src/3rdparty/webkit/include/QtWebKit/qwebkitversion.h
new file mode 100644
index 0000000..af7be3b
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebkitversion.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebkitversion.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebpage.h b/src/3rdparty/webkit/include/QtWebKit/qwebpage.h
new file mode 100644
index 0000000..2053ccb
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebpage.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebpage.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebpluginfactory.h b/src/3rdparty/webkit/include/QtWebKit/qwebpluginfactory.h
new file mode 100644
index 0000000..db095b7
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebpluginfactory.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebpluginfactory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebsecurityorigin.h b/src/3rdparty/webkit/include/QtWebKit/qwebsecurityorigin.h
new file mode 100644
index 0000000..1ce553c
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebsecurityorigin.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebsecurityorigin.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebsettings.h b/src/3rdparty/webkit/include/QtWebKit/qwebsettings.h
new file mode 100644
index 0000000..cdedc07
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebsettings.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebsettings.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebview.h b/src/3rdparty/webkit/include/QtWebKit/qwebview.h
new file mode 100644
index 0000000..3490665
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebview.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebview.h"