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

[ariya at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit abfa678e3fae088b6c4aa23f1e7bd8d422b7a0e0
Author: ariya at webkit.org <ariya at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 18 21:55:40 2009 +0000

    2009-12-18  Ariya Hidayat  <ariya.hidayat at gmail.com>
    
            Build fix, not reviewed.
    
            * QtLauncher/main.cpp:
            (MainWindow::setTouchMocking): Leave setTouchMocking as an empty
            function for Qt < 4.6 so that moc still creates a slot for that.
            Otherwise, it would have generated a linker error.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52340 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 1ca742f..8dfab69 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-18  Ariya Hidayat  <ariya.hidayat at gmail.com>
+
+        Build fix, not reviewed.
+
+        * QtLauncher/main.cpp:
+        (MainWindow::setTouchMocking): Leave setTouchMocking as an empty
+        function for Qt < 4.6 so that moc still creates a slot for that.
+        Otherwise, it would have generated a linker error.
+
 2009-12-18  Adam Roben  <aroben at apple.com>
 
         Qt build fix
diff --git a/WebKit/qt/QtLauncher/main.cpp b/WebKit/qt/QtLauncher/main.cpp
index 04d61bf..836c7dc 100644
--- a/WebKit/qt/QtLauncher/main.cpp
+++ b/WebKit/qt/QtLauncher/main.cpp
@@ -464,12 +464,12 @@ protected slots:
         }
     }
 
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     void setTouchMocking(bool on)
     {
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
         touchMocking = on;
-    }
 #endif
+    }
 
 public slots:
 

-- 
WebKit Debian packaging