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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
  QtWebKit: Build fix for WinCE.
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  Fix failing assertions in debug builds
  Fix the build of webkit examples on platforms without OpenGL and Multimedia
  QtWebKit: Fix build on mac.
  QtWebKit: Build fix for WinCE.
  QtWebKit: Fix build on WinCE, adding missing include path.
  QtWebKit: Change the dependency from phonon to QtMultimedia.
  QtWebKit: Add missing namespace wrapper temporarily until next import.
  QtWebKit: fix build with qws temporarily until next import.
  Update src/3rdparty/webkit from trunk.
  QtWebKit: Re-add the dependency to the static linked JavaScriptCore

1 files changed, 24 insertions, 0 deletions

diff --git a/src/3rdparty/webkit/WebKit/qt/tests/tests.pri b/src/3rdparty/webkit/WebKit/qt/tests/tests.pri
new file mode 100644
index 0000000..0bdf6f6
--- /dev/null
+++ b/src/3rdparty/webkit/WebKit/qt/tests/tests.pri
@@ -0,0 +1,24 @@
+TEMPLATE = app
+CONFIG -= app_bundle
+
+VPATH += $$_PRO_FILE_PWD_
+!CONFIG(QTDIR_build):TARGET = tst_$$TARGET
+SOURCES += $${TARGET}.cpp
+INCLUDEPATH += \
+    $$PWD \
+    $$PWD/../Api
+
+exists($$_PRO_FILE_PWD_/$${TARGET}.qrc):RESOURCES += $$_PRO_FILE_PWD_/$${TARGET}.qrc
+
+include(../../../WebKit.pri)
+QT += testlib network
+
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+
+symbian {
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
+
+# This define is used by some tests to look up resources in the source tree
+!symbian: DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD/\\\"
+