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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 11:42:51 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 16d42ce4d567667986d0e1346738a43d1446db4a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Aug 4 20:18:49 2010 +0000

    2010-08-04  Markus Goetz  <Markus.Goetz at nokia.com>
    
            Reviewed by Simon Hausmann.
    
            [Qt] Change wording in QtTestBrowser
            https://bugs.webkit.org/show_bug.cgi?id=43241
    
            * QtTestBrowser/launcherwindow.cpp:
            (LauncherWindow::createChrome):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64671 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c9d714e..89e52d1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-04  Markus Goetz  <Markus.Goetz at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Change wording in QtTestBrowser
+        https://bugs.webkit.org/show_bug.cgi?id=43241
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::createChrome):
+
 2010-08-04  Aaron Boodman  <aa at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index 3ebc6c9..52772f5 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -242,7 +242,7 @@ void LauncherWindow::createChrome()
     toggleFrameFlattening->setChecked(settings->testAttribute(QWebSettings::FrameFlatteningEnabled));
 
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-    QAction* touchMockAction = toolsMenu->addAction("Toggle multitouch mocking", this, SLOT(setTouchMocking(bool)));
+    QAction* touchMockAction = toolsMenu->addAction("Toggle touch mocking", this, SLOT(setTouchMocking(bool)));
     touchMockAction->setCheckable(true);
     touchMockAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_T));
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list