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

[tonikitoo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 25a0936dd8f4716bf51d5a84fa1f5abffa118cde
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 15:54:19 2010 +0000

    2010-07-26  Antonio Gomes  <tonikitoo at webkit.org>
    
            Rubber-stamped by Simon Hausmann.
    
            [Qt] Reorder some items in Developers' menu so QGraphicsView one is easier accessible.
    
            Move some less useful menu items on Developers menu from the top to the bottom, so
            QGraphicsView menu goes to the top, and becomes more quickly accessible.
    
            * QtTestBrowser/main.cpp:
            (LauncherWindow::createChrome):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64131 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9b43cd2..563eb3b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-26  Antonio Gomes  <tonikitoo at webkit.org>
+
+        Rubber-stamped by Simon Hausmann.
+
+        [Qt] Reorder some items in Developers' menu so QGraphicsView one is easier accessible.
+
+        Move some less useful menu items on Developers menu from the top to the bottom, so
+        QGraphicsView menu goes to the top, and becomes more quickly accessible.
+
+        * QtTestBrowser/main.cpp:
+        (LauncherWindow::createChrome):
+
 2010-07-26  Adam Roben  <aroben at apple.com>
 
         Fix the path to InjectedBundle.dll in Debug_Internal builds
diff --git a/WebKitTools/QtTestBrowser/main.cpp b/WebKitTools/QtTestBrowser/main.cpp
index 6254c21..e0b84e7 100644
--- a/WebKitTools/QtTestBrowser/main.cpp
+++ b/WebKitTools/QtTestBrowser/main.cpp
@@ -860,16 +860,6 @@ void LauncherWindow::createChrome()
     toggleFullScreen->connect(this, SIGNAL(enteredFullScreenMode(bool)), SLOT(setChecked(bool)));
 
     QMenu* toolsMenu = menuBar()->addMenu("&Develop");
-    toolsMenu->addAction("Select Elements...", this, SLOT(selectElements()));
-    QAction* showInspectorAction = toolsMenu->addAction("Show Web Inspector", m_inspector, SLOT(setVisible(bool)), QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_I));
-    showInspectorAction->setCheckable(true);
-    showInspectorAction->connect(m_inspector, SIGNAL(visibleChanged(bool)), SLOT(setChecked(bool)));
-
-#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
-    QAction* touchMockAction = toolsMenu->addAction("Toggle multitouch mocking", this, SLOT(setTouchMocking(bool)));
-    touchMockAction->setCheckable(true);
-    touchMockAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_T));
-#endif
 
     QWebSettings* settings = page()->settings();
 
@@ -1000,6 +990,18 @@ void LauncherWindow::createChrome()
     viewportUpdateModeActions->addAction(smartUpdate);
     viewportUpdateModeActions->addAction(boundingRectUpdate);
     viewportUpdateModeActions->addAction(noUpdate);
+
+    toolsMenu->addAction("Select Elements...", this, SLOT(selectElements()));
+
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+    QAction* touchMockAction = toolsMenu->addAction("Toggle multitouch mocking", this, SLOT(setTouchMocking(bool)));
+    touchMockAction->setCheckable(true);
+    touchMockAction->setShortcut(QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_T));
+#endif
+
+    QAction* showInspectorAction = toolsMenu->addAction("Show Web Inspector", m_inspector, SLOT(setVisible(bool)), QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_I));
+    showInspectorAction->setCheckable(true);
+    showInspectorAction->connect(m_inspector, SIGNAL(visibleChanged(bool)), SLOT(setChecked(bool)));
 }
 
 QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)

-- 
WebKit Debian packaging