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

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 3c2f49d4a2daf8fb585a748168492df51d9875df
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Mar 6 03:48:36 2010 +0000

    2010-03-05  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
    
            Reviewed by Eric Seidel.
    
            Fix Print option on QtLauncher by calling print directly from QWebFrame.
    
            [Qt] QtLauncher Print option is not working on QGraphicsView mode
            https://bugs.webkit.org/show_bug.cgi?id=35769
    
            * QtLauncher/main.cpp:
            (LauncherWindow::print):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55610 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a32dbf8..bb018ae 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-03-05  Jesus Sanchez-Palencia  <jesus.palencia at openbossa.org>
+
+        Reviewed by Eric Seidel.
+
+        Fix Print option on QtLauncher by calling print directly from QWebFrame.
+
+        [Qt] QtLauncher Print option is not working on QGraphicsView mode
+        https://bugs.webkit.org/show_bug.cgi?id=35769
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::print):
+
 2010-03-05  Chris Jerdonek  <cjerdonek at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index b34dd22..ab9647e 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -431,7 +431,7 @@ void LauncherWindow::print()
 #if !defined(QT_NO_PRINTER)
     QPrintPreviewDialog dlg(this);
     connect(&dlg, SIGNAL(paintRequested(QPrinter*)),
-            m_view, SLOT(print(QPrinter*)));
+            page()->mainFrame(), SLOT(print(QPrinter*)));
     dlg.exec();
 #endif
 }

-- 
WebKit Debian packaging