From 81bc750723a18f21cd17d1b173cd2a4dda9cea6e Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 24 May 2011 11:24:40 +0100
Subject: Merge WebKit at r80534: Intial merge by Git

Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
---
 Source/WebKit.pri | 47 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 42 insertions(+), 5 deletions(-)

(limited to 'Source/WebKit.pri')

diff --git a/Source/WebKit.pri b/Source/WebKit.pri
index e7a3b20..f61b489 100644
--- a/Source/WebKit.pri
+++ b/Source/WebKit.pri
@@ -3,8 +3,24 @@
 # Detect that we are building as a standalone package by the presence of
 # either the generated files directory or as part of the Qt package through
 # QTDIR_build
-CONFIG(QTDIR_build): CONFIG += standalone_package
-else:exists($$PWD/WebCore/generated): CONFIG += standalone_package
+CONFIG(QTDIR_build) {
+    CONFIG += standalone_package
+    # Make sure we compile both debug and release on mac when inside Qt.
+    # This line was extracted from qbase.pri instead of including the whole file
+    win32|mac:!macx-xcode:CONFIG += debug_and_release
+} else {
+    !CONFIG(release, debug|release) {
+        OBJECTS_DIR = obj/debug
+    } else { # Release
+        OBJECTS_DIR = obj/release
+        DEFINES *= NDEBUG
+    }
+    exists($$PWD/WebCore/generated):CONFIG += standalone_package
+    # Make sure that build_all follows the build_all config in WebCore
+    mac:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework):!build_pass:CONFIG += build_all
+}
+
+CONFIG(standalone_package): DEFINES *= NDEBUG
 
 CONFIG += depend_includepath
 DEPENDPATH += $$OUT_PWD
@@ -51,8 +67,21 @@ CONFIG(release, debug|release) {
     DEFINES += NDEBUG
 }
 
-INCLUDEPATH += $$OUTPUT_DIR/include/QtWebKit
-INCLUDEPATH += $$QT.script.includes
+INCLUDEPATH += \
+    $$PWD \
+    $$OUTPUT_DIR/include/QtWebKit \
+    $$OUTPUT_DIR/include \
+    $$QT.script.includes
+
+webkit2:INCLUDEPATH *= $$OUTPUT_DIR/include/WebKit2
+
+# Pick up 3rdparty libraries from INCLUDE/LIB just like with MSVC
+win32-g++* {
+    TMPPATH            = $$quote($$(INCLUDE))
+    QMAKE_INCDIR_POST += $$split(TMPPATH,";")
+    TMPPATH            = $$quote($$(LIB))
+    QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
+}
 
 CONFIG -= warn_on
 *-g++*:QMAKE_CXXFLAGS += -Wall -Wextra -Wreturn-type -fno-strict-aliasing -Wcast-align -Wchar-subscripts -Wformat-security -Wreturn-type -Wno-unused-parameter -Wno-sign-compare -Wno-switch -Wno-switch-enum -Wundef -Wmissing-noreturn -Winit-self
@@ -88,6 +117,9 @@ valgrind {
     JAVASCRIPTCORE_JIT = no
 }
 
+# Disable dependency to a specific version of a Qt package for non-production builds
+symbian:!CONFIG(production):default_deployment.pkg_prerules -= pkg_depends_qt
+
 ##### Defaults for some mobile platforms
 symbian|maemo5|maemo6 {
     CONFIG += disable_uitools
@@ -100,7 +132,12 @@ symbian|maemo5|maemo6 {
 
 ####
 
-disable_uitools: DEFINES *= QT_NO_UITOOLS
+contains(QT_CONFIG, modular):!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS
+
+!contains(QT_CONFIG, modular) {
+    QT.phonon.includes = $$QMAKE_INCDIR_QT/phonon
+    QT.phonon.libs = $$QMAKE_LIBDIR_QT
+}
 
 # Disable a few warnings on Windows. The warnings are also
 # disabled in WebKitLibraries/win/tools/vsprops/common.vsprops
-- 
cgit v1.1