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

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 037cffae1050724b96c7a2a2a981b482cf36cc99
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 22 13:13:23 2009 +0000

    Rubber-stamped by Holger Freyther.
    
    .:
    
    Adjusted path to QtLauncher.
    
    * WebKit.pro:
    
    WebKit/qt:
    
    Moved QtLauncher to WebKitTools/
    
    * QtLauncher: Removed.
    * QtLauncher/QtLauncher.pro: Removed.
    * QtLauncher/main.cpp: Removed.
    
    WebKitTools:
    
    Moved QtLauncher from WebKit/qt.
    
    * QtLauncher: Copied from WebKit/qt/QtLauncher.
    * QtLauncher/QtLauncher.pro:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52486 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 606dc10..3595508 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-12-22  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Rubber-stamped by Holger Freyther.
+
+        Adjusted path to QtLauncher.
+
+        * WebKit.pro:
+
 2009-12-19  Evan Martin  <evan at chromium.org>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebKit.pro b/WebKit.pro
index 866bb9b..d57d42f 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -4,7 +4,7 @@ CONFIG += ordered
 SUBDIRS += \
         WebCore \
         JavaScriptCore/jsc.pro \
-        WebKit/qt/QtLauncher \
+        WebKitTools/QtLauncher \
         WebKit/qt/QGVLauncher \
         WebKit/qt/tests
 
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 91e0ea5..b4744f3 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-22  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Rubber-stamped by Holger Freyther.
+
+        Moved QtLauncher to WebKitTools/
+
+        * QtLauncher: Removed.
+        * QtLauncher/QtLauncher.pro: Removed.
+        * QtLauncher/main.cpp: Removed.
+
 2009-12-21  David Boddie  <dboddie at trolltech.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit/qt/QtLauncher/QtLauncher.pro b/WebKit/qt/QtLauncher/QtLauncher.pro
deleted file mode 100644
index 133869c..0000000
--- a/WebKit/qt/QtLauncher/QtLauncher.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-TEMPLATE = app
-SOURCES += main.cpp
-CONFIG -= app_bundle
-CONFIG += uitools
-DESTDIR = ../../../bin
-
-include(../../../WebKit.pri)
-
-QT += network
-macx:QT+=xml
-QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-
-symbian {
-    TARGET.UID3 = 0xA000E543
-    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
-}
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 78ba8d3..3679d24 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-22  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Rubber-stamped by Holger Freyther.
+
+        Moved QtLauncher from WebKit/qt.
+
+        * QtLauncher: Copied from WebKit/qt/QtLauncher.
+        * QtLauncher/QtLauncher.pro:
+
 2009-12-21  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/QtLauncher/QtLauncher.pro b/WebKitTools/QtLauncher/QtLauncher.pro
new file mode 100644
index 0000000..05d6cbe
--- /dev/null
+++ b/WebKitTools/QtLauncher/QtLauncher.pro
@@ -0,0 +1,16 @@
+TEMPLATE = app
+SOURCES += main.cpp
+CONFIG -= app_bundle
+CONFIG += uitools
+DESTDIR = ../../bin
+
+include(../../WebKit.pri)
+
+QT += network
+macx:QT+=xml
+QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
+
+symbian {
+    TARGET.UID3 = 0xA000E543
+    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+}
diff --git a/WebKit/qt/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
similarity index 100%
rename from WebKit/qt/QtLauncher/main.cpp
rename to WebKitTools/QtLauncher/main.cpp

-- 
WebKit Debian packaging