[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

laszlo.1.gombos at nokia.com laszlo.1.gombos at nokia.com
Wed Apr 7 23:27:57 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit 7283b36bb657b4d6b0d196dd133bc5241ed7379a
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 10 01:39:02 2009 +0000

    2009-11-09  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Not reviewed, build fix.
    
            Revert r50695 because it broke QtWebKit (clean builds).
    
            * JavaScriptCore.pri:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50701 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c5aa899..6d17cb4 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-09  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Not reviewed, build fix.
+
+        Revert r50695 because it broke QtWebKit (clean builds).
+
+        * JavaScriptCore.pri:
+
 2009-11-09  Norbert Leser  <norbert.leser at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index 002c0df..03471b3 100644
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -1,4 +1,4 @@
-# JavaScriptCore - Qt4 build info
+\# JavaScriptCore - Qt4 build info
 VPATH += $$PWD
 
 CONFIG(debug, debug|release) {
@@ -27,7 +27,7 @@ INCLUDEPATH = \
     $$PWD/yarr \
     $$PWD/API \
     $$PWD/ForwardingHeaders \
-    $$PWD/$$GENERATED_SOURCES_DIR \
+    $$GENERATED_SOURCES_DIR \
     $$INCLUDEPATH
 
 DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list