Merge "Scroll position now passed to all layers" into ics-mr1

[android-x86/external-webkit.git] / Source / WebKit.pri

diff --git a/Source/WebKit.pri b/Source/WebKit.pri
index e7a3b20..c17d08a 100644 (file)
--- a/Source/WebKit.pri
+++ b/Source/WebKit.pri
@@ -1,10 +1,28 @@
 # Include file to make it easy to include WebKit into Qt projects
 
+contains(QT_CONFIG, qpa):CONFIG += embedded
+
 # 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 +69,23 @@ 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
+
+DEFINES += QT_ASCII_CAST_WARNINGS
+
+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
@@ -64,7 +97,7 @@ linux-g++* {
 
 symbian|*-armcc {
     # Enable GNU compiler extensions to the ARM compiler for all Qt ports using RVCT
-    RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293
+    RVCT_COMMON_CFLAGS = --gnu --diag_suppress 68,111,177,368,830,1293 --signed_bitfields
     RVCT_COMMON_CXXFLAGS = $$RVCT_COMMON_CFLAGS --no_parse_templates
     # Make debug symbols leaner in RVCT4.x. Ignored by compiler for release builds
     QMAKE_CXXFLAGS.ARMCC_4_0 += --remove_unneeded_entities
@@ -88,6 +121,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
@@ -98,10 +134,18 @@ symbian|maemo5|maemo6 {
     CONFIG += include_webinspector
 }
 
+*sh4* {
+    CONFIG += disable_uitools
+}
 ####
 
 disable_uitools: DEFINES *= QT_NO_UITOOLS
 
+isEmpty(QT.phonon.includes) {
+    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
 win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996