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

[ossy at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 633a9eb054c1b97fbb6afa64004ca22273aff12b
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 18 00:30:09 2010 +0000

    Unreviewed Qt buildfix after r74301.
    
    Rename WebKitTools to Tools
    https://bugs.webkit.org/show_bug.cgi?id=49861
    
    * MiniBrowser/DerivedSources.pro:
    * MiniBrowser/qt/MiniBrowser.pro:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74302 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0579bad..cababce 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-17  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed Qt buildfix after r74301.
+
+        Rename WebKitTools to Tools
+        https://bugs.webkit.org/show_bug.cgi?id=49861
+
+        * MiniBrowser/DerivedSources.pro:
+        * MiniBrowser/qt/MiniBrowser.pro:
+
 2010-12-17  Dan Bernstein  <mitz at apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/Tools/MiniBrowser/DerivedSources.pro b/Tools/MiniBrowser/DerivedSources.pro
index 42dde37..3ca89ad 100644
--- a/Tools/MiniBrowser/DerivedSources.pro
+++ b/Tools/MiniBrowser/DerivedSources.pro
@@ -7,12 +7,12 @@ TARGET = dummy
 
 QMAKE_EXTRA_TARGETS += generated_files
 
-SRC_ROOT_DIR = $$replace(PWD, "/WebKitTools/MiniBrowser", "")
+SRC_ROOT_DIR = $$replace(PWD, "/Tools/MiniBrowser", "")
 
-!exists($$OUTPUT_DIR/WebKitTools/MiniBrowser/qt):system($$QMAKE_MKDIR $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt)
+!exists($$OUTPUT_DIR/Tools/MiniBrowser/qt):system($$QMAKE_MKDIR $$OUTPUT_DIR/Tools/MiniBrowser/qt)
 
-ualist_copier.input = $$SRC_ROOT_DIR/WebKitTools/QtTestBrowser/useragentlist.txt
-ualist_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/useragentlist.txt
+ualist_copier.input = $$SRC_ROOT_DIR/Tools/QtTestBrowser/useragentlist.txt
+ualist_copier.output = $$OUTPUT_DIR/Tools/MiniBrowser/qt/useragentlist.txt
 ualist_copier.tempNames = $$ualist_copier.input $$ualist_copier.output
 ualist_copier.commands = $$QMAKE_COPY $$replace(ualist_copier.tempNames, "/", $$QMAKE_DIR_SEP)
 ualist_copier.depends = $$ualist_copier.input
@@ -23,8 +23,8 @@ QMAKE_EXTRA_TARGETS += ualist_copier
 # to use the useragentlist.txt file of QtTestBrowser without
 # polluting the source tree.
 
-qrc_copier.input = $$SRC_ROOT_DIR/WebKitTools/MiniBrowser/MiniBrowser.qrc
-qrc_copier.output = $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc
+qrc_copier.input = $$SRC_ROOT_DIR/Tools/MiniBrowser/MiniBrowser.qrc
+qrc_copier.output = $$OUTPUT_DIR/Tools/MiniBrowser/qt/MiniBrowser.qrc
 qrc_copier.tempNames = $$qrc_copier.input $$qrc_copier.output
 qrc_copier.commands = $$QMAKE_COPY $$replace(qrc_copier.tempNames, "/", $$QMAKE_DIR_SEP)
 qrc_copier.depends = ualist_copier $$qrc_copier.input
diff --git a/Tools/MiniBrowser/qt/MiniBrowser.pro b/Tools/MiniBrowser/qt/MiniBrowser.pro
index bb9d3ee..2cdd3b5 100644
--- a/Tools/MiniBrowser/qt/MiniBrowser.pro
+++ b/Tools/MiniBrowser/qt/MiniBrowser.pro
@@ -53,6 +53,6 @@ contains(QT_CONFIG, opengl) {
 }
 
 # We copy the resource file to the build directory.
-# The copier is defined in WebKitTools/MiniBrowser/DerivedSources.pro.
+# The copier is defined in Tools/MiniBrowser/DerivedSources.pro.
 RESOURCES += \
     $$OUTPUT_DIR/Tools/MiniBrowser/qt/MiniBrowser.qrc

-- 
WebKit Debian packaging