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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 1152bf85d19ed6eb59f926646231e067272c0caa
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 20:31:02 2010 +0000

    2010-09-16  Leonid Ebril  <leonid.ebril at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] QtTestBrowser: Disable creation of a new window for screenshot on Symbian platform.
            https://bugs.webkit.org/show_bug.cgi?id=45885
    
            Avoid creation of an additional window for screenshot to prevent overlapping with original window.
    
            * QtTestBrowser/launcherwindow.cpp:
            (LauncherWindow::screenshot):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 39c18c2..18cfed5 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-16  Leonid Ebril  <leonid.ebril at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] QtTestBrowser: Disable creation of a new window for screenshot on Symbian platform.
+        https://bugs.webkit.org/show_bug.cgi?id=45885
+
+        Avoid creation of an additional window for screenshot to prevent overlapping with original window.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::screenshot):
+
 2010-09-16  Anders Carlsson  <andersca at apple.com>
 
         Fix clang++ build.
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index b77da16..8c79154 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -612,16 +612,20 @@ void LauncherWindow::print()
 void LauncherWindow::screenshot()
 {
     QPixmap pixmap = QPixmap::grabWidget(m_view);
-    QLabel* label = new QLabel;
+    QLabel* label = 0;
+#if !defined(Q_OS_SYMBIAN)
+    label = new QLabel;
     label->setAttribute(Qt::WA_DeleteOnClose);
     label->setWindowTitle("Screenshot - Preview");
     label->setPixmap(pixmap);
     label->show();
+#endif
 
     QString fileName = QFileDialog::getSaveFileName(label, "Screenshot");
     if (!fileName.isEmpty()) {
         pixmap.save(fileName, "png");
-        label->setWindowTitle(QString("Screenshot - Saved at %1").arg(fileName));
+        if (label)
+            label->setWindowTitle(QString("Screenshot - Saved at %1").arg(fileName));
     }
 
 #if defined(QT_CONFIGURED_WITH_OPENGL)

-- 
WebKit Debian packaging