Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61

1 files changed, 71 insertions, 24 deletions

diff --git a/Source/WebKit2/WebKit2.pri b/Source/WebKit2/WebKit2.pri
index da08ea8..681f83f 100644
--- a/Source/WebKit2/WebKit2.pri
+++ b/Source/WebKit2/WebKit2.pri
@@ -1,6 +1,6 @@
 # WebKit2 - Qt4 build info
 
-QT += network
+SOURCE_DIR = $$replace(PWD, /WebKit2, "")
 
 # Use a config-specific target to prevent parallel builds file clashes on Mac
 mac: CONFIG(debug, debug|release): WEBKIT2_TARGET = webkit2d
@@ -10,12 +10,78 @@ else: WEBKIT2_TARGET = webkit2
 CONFIG(debug, debug|release) : WEBKIT2_DESTDIR = debug
 else: WEBKIT2_DESTDIR = release
 
-defineTest(_addWebKit2Lib_common) {
-    pathToWebKit2Output = $$ARGS/$$WEBKIT2_DESTDIR
+CONFIG(standalone_package) {
+    isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = $$PWD/generated
+} else {
+    isEmpty(WEBKIT2_GENERATED_SOURCES_DIR):WEBKIT2_GENERATED_SOURCES_DIR = generated
+}
 
-    QMAKE_LIBDIR += $$pathToWebKit2Output
+WEBKIT2_INCLUDEPATH = \
+    $$SOURCE_DIR/WebKit2 \
+    $$SOURCE_DIR/WebKit2/Platform \
+    $$SOURCE_DIR/WebKit2/Platform/CoreIPC \
+    $$SOURCE_DIR/WebKit2/Platform/qt \
+    $$SOURCE_DIR/WebKit2/Shared \
+    $$SOURCE_DIR/WebKit2/Shared/API/c \
+    $$SOURCE_DIR/WebKit2/Shared/CoreIPCSupport \
+    $$SOURCE_DIR/WebKit2/Shared/Plugins \
+    $$SOURCE_DIR/WebKit2/Shared/Plugins/Netscape \
+    $$SOURCE_DIR/WebKit2/Shared/qt \
+    $$SOURCE_DIR/WebKit2/UIProcess \
+    $$SOURCE_DIR/WebKit2/UIProcess/API/C \
+    $$SOURCE_DIR/WebKit2/UIProcess/API/cpp \
+    $$SOURCE_DIR/WebKit2/UIProcess/API/cpp/qt \
+    $$SOURCE_DIR/WebKit2/UIProcess/API/qt \
+    $$SOURCE_DIR/WebKit2/UIProcess/Authentication \
+    $$SOURCE_DIR/WebKit2/UIProcess/Downloads \
+    $$SOURCE_DIR/WebKit2/UIProcess/Launcher \
+    $$SOURCE_DIR/WebKit2/UIProcess/Plugins \
+    $$SOURCE_DIR/WebKit2/UIProcess/qt \
+    $$SOURCE_DIR/WebKit2/WebProcess \
+    $$SOURCE_DIR/WebKit2/WebProcess/ApplicationCache \
+    $$SOURCE_DIR/WebKit2/WebProcess/Authentication \
+    $$SOURCE_DIR/WebKit2/WebProcess/Cookies \
+    $$SOURCE_DIR/WebKit2/WebProcess/Downloads \
+    $$SOURCE_DIR/WebKit2/WebProcess/Downloads/qt \
+    $$SOURCE_DIR/WebKit2/WebProcess/Geolocation \
+    $$SOURCE_DIR/WebKit2/WebProcess/InjectedBundle \
+    $$SOURCE_DIR/WebKit2/WebProcess/InjectedBundle/DOM \
+    $$SOURCE_DIR/WebKit2/WebProcess/InjectedBundle/API/c \
+    $$SOURCE_DIR/WebKit2/WebProcess/KeyValueStorage \
+    $$SOURCE_DIR/WebKit2/WebProcess/Plugins \
+    $$SOURCE_DIR/WebKit2/WebProcess/Plugins/Netscape \
+    $$SOURCE_DIR/WebKit2/WebProcess/ResourceCache \
+    $$SOURCE_DIR/WebKit2/WebProcess/WebCoreSupport \
+    $$SOURCE_DIR/WebKit2/WebProcess/WebCoreSupport/qt \
+    $$SOURCE_DIR/WebKit2/WebProcess/WebPage \
+    $$SOURCE_DIR/WebKit2/WebProcess/qt \
+    $$SOURCE_DIR/WebKit2/PluginProcess
 
-    POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a
+# On Symbian PREPEND_INCLUDEPATH is the best way to make sure that WebKit headers
+# are included before platform headers.
+
+symbian {
+    PREPEND_INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$PREPEND_INCLUDEPATH
+} else {
+    INCLUDEPATH = $$WEBKIT2_INCLUDEPATH $$WEBKIT2_GENERATED_SOURCES_DIR $$INCLUDEPATH
+}
+
+defineTest(prependWebKit2Lib) {
+    pathToWebKit2Output = $$ARGS/$$WEBKIT2_DESTDIR
+
+    win32-msvc*|wince* {
+        LIBS = -l$$WEBKIT2_TARGET $$LIBS
+        LIBS = -L$$pathToWebKit2Output $$LIBS
+        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
+    } else:symbian {
+        LIBS = -l$${WEBKIT2_TARGET}.lib $$LIBS
+        QMAKE_LIBDIR += $$pathToWebKit2Output
+        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
+    } else {
+        QMAKE_LIBDIR = $$pathToWebKit2Output $$QMAKE_LIBDIR
+        LIBS = -l$$WEBKIT2_TARGET $$LIBS
+        POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}lib$${WEBKIT2_TARGET}.a
+    }
 
     # The following line is to prevent qmake from adding webkit2 to libQtWebKit's prl dependencies.
     CONFIG -= explicitlib
@@ -23,25 +89,6 @@ defineTest(_addWebKit2Lib_common) {
     export(QMAKE_LIBDIR)
     export(POST_TARGETDEPS)
     export(CONFIG)
-
-    return(true)
-}
-
-defineTest(addWebKit2Lib) {
-    _addWebKit2Lib_common($$ARGS)
-
-    LIBS += -l$$WEBKIT2_TARGET
-    export(LIBS)
-
-    return(true)
-}
-
-defineTest(addWebKit2LibWholeArchive) {
-    _addWebKit2Lib_common($$ARGS)
-
-    # -whole-archive makes all objects, even if unreferenced, included in the linked target.
-    mac: LIBS += -Wl,-all_load -l$$WEBKIT2_TARGET
-    else: LIBS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
     export(LIBS)
 
     return(true)