[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ca565a0bb9e55310b14b13d57858c16925716da2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 24 17:07:12 2010 +0000

    2010-11-24  Andras Becsi  <abecsi at inf.u-szeged.hu>
    
            Reviewed by Csaba Osztrogonác.
    
            Make build-webkit --minimal build with ENABLE_INSPECTOR=0.
            https://bugs.webkit.org/show_bug.cgi?id=49975
    
            No new tests needed.
    
            * features.pri: Make the Qt buildsystem aware
            that the inspector is enabled by default.
    2010-11-24  Andras Becsi  <abecsi at inf.u-szeged.hu>
    
            Reviewed by Csaba Osztrogonác.
    
            Make build-webkit --minimal build with ENABLE_INSPECTOR=0
            https://bugs.webkit.org/show_bug.cgi?id=49975
    
            * Scripts/build-webkit: Add ENABLE_INSPECTOR define to features,
            to enable the script to define it 0 in case of a minimal build.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72676 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 5c20f6d..3fec6de 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-24  Andras Becsi  <abecsi at inf.u-szeged.hu>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Make build-webkit --minimal build with ENABLE_INSPECTOR=0.
+        https://bugs.webkit.org/show_bug.cgi?id=49975
+
+        No new tests needed.
+
+        * features.pri: Make the Qt buildsystem aware
+        that the inspector is enabled by default.
+
 2010-11-24  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/features.pri b/WebCore/features.pri
index 2076c04..3ed1da1 100644
--- a/WebCore/features.pri
+++ b/WebCore/features.pri
@@ -70,6 +70,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
 !contains(DEFINES, ENABLE_NOTIFICATIONS=.): DEFINES += ENABLE_NOTIFICATIONS=1
 !contains(DEFINES, ENABLE_IMAGE_RESIZER=.): DEFINES += ENABLE_IMAGE_RESIZER=0
 !contains(DEFINES, ENABLE_INPUT_SPEECH=.): DEFINES += ENABLE_INPUT_SPEECH=0
+!contains(DEFINES, ENABLE_INSPECTOR=.): DEFINES += ENABLE_INSPECTOR=1
 !contains(DEFINES, ENABLE_3D_RENDERING=.): DEFINES += ENABLE_3D_RENDERING=1
 
 # SVG support
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 979404c..7fb5a01 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-24  Andras Becsi  <abecsi at inf.u-szeged.hu>
+
+        Reviewed by Csaba Osztrogonác.
+
+        Make build-webkit --minimal build with ENABLE_INSPECTOR=0
+        https://bugs.webkit.org/show_bug.cgi?id=49975
+
+        * Scripts/build-webkit: Add ENABLE_INSPECTOR define to features,
+        to enable the script to define it 0 in case of a minimal build.
+
 2010-11-24  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/WebKitTools/Scripts/build-webkit b/WebKitTools/Scripts/build-webkit
index d9534f8..800e610 100755
--- a/WebKitTools/Scripts/build-webkit
+++ b/WebKitTools/Scripts/build-webkit
@@ -100,6 +100,7 @@ my (
     $videoSupport,
     $wcssSupport,
     $webAudioSupport,
+    $webInspectorSupport,
     $webSocketsSupport,
     $webTimingSupport,
     $wmlSupport,
@@ -176,6 +177,9 @@ my @features = (
     { option => "input-speech", desc => "Speech Input API support",
       define => "ENABLE_INPUT_SPEECH", default => 0, value => \$inputSpeechSupport },
 
+    { option => "inspector", desc => "Toggle Web Inspector support",
+      define => "ENABLE_INSPECTOR", default => 1, value => \$webInspectorSupport },
+
     { option => "javascript-debugger", desc => "Toggle JavaScript Debugger/Profiler support",
       define => "ENABLE_JAVASCRIPT_DEBUGGER", default => 1, value => \$javaScriptDebuggerSupport },
 

-- 
WebKit Debian packaging