[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9b9fe751f414b577d7fd8adb355bff0b2169de6e
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 16:06:44 2010 +0000

    .: [Qt] Don't build the tests in packages, only the launcher(s)
    
    Reviewed by Kenneth Rohde Christiansen.
    
    * WebKit.pro:
    
    WebCore: [Qt] For package builds use the .def files on Symbian
    
    Reviewed by Kenneth Rohde Christiansen.
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53935 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 646808c..25066c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-27  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Don't build the tests in packages, only the launcher(s)
+
+        * WebKit.pro:
+
 2010-01-27  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
         Reviewed by Tor Arne Vestbø.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 505801b..c2ab758 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-27  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] For package builds use the .def files on Symbian
+
+        * WebCore.pro:
+
 2010-01-27  Alexander Pavlov  <apavlov at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 4e12f33..58640db 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -52,6 +52,8 @@ CONFIG(standalone_package) {
 
     PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
     DEFINES *= NDEBUG
+
+    symbian: CONFIG += def_files
 } else {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = generated
     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
diff --git a/WebKit.pro b/WebKit.pro
index 29a3a8e..f63eaa0 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -6,11 +6,11 @@ include(WebKit.pri)
 SUBDIRS += \
         WebCore \
         WebKitTools/QtLauncher \
-        WebKit/qt/QGVLauncher \
-        WebKit/qt/tests
+        WebKit/qt/QGVLauncher
 
 !CONFIG(standalone_package) {
-    SUBDIRS += JavaScriptCore/jsc.pro
+    SUBDIRS += JavaScriptCore/jsc.pro \
+        WebKit/qt/tests
 
     !symbian: SUBDIRS += WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
 

-- 
WebKit Debian packaging