[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ca748a376ce7f5c9f27ab0a2d51ef5236cfdbae4
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 04:56:05 2011 +0000

    2011-01-05  Jan Erik Hanssen  <jhanssen at sencha.com>
    
            Reviewed by Ariya Hidayat.
    
            [Qt] TestNetscapePlugin doesn't link on OS X
            https://bugs.webkit.org/show_bug.cgi?id=51948
    
            Only add a dependency on libX11 on X11 systems
    
            * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75134 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 9bd9ab1..f43edce 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-05  Jan Erik Hanssen  <jhanssen at sencha.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] TestNetscapePlugin doesn't link on OS X
+        https://bugs.webkit.org/show_bug.cgi?id=51948
+
+        Only add a dependency on libX11 on X11 systems
+
+        * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro:
+
 2011-01-05  Jeff Miller  <jeffm at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
index fd581fb..c29612a 100644
--- a/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
+++ b/Tools/DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro
@@ -45,6 +45,6 @@ mac {
     SOURCES += ../../unix/TestNetscapePlugin/TestNetscapePlugin.cpp
 }
 
-unix {
+!win32:!embedded:!mac:!symbian {
     LIBS += -lX11
 }

-- 
WebKit Debian packaging