[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 87f14386befd38eb0f3b35d5a9e227bbff6c681c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 22 04:04:51 2010 +0000

    2010-01-21  Jakub Wieczorek  <faw217 at gmail.com>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Don't allow Phonon's invisible video widget to keep the app running.
            https://bugs.webkit.org/show_bug.cgi?id=33842
    
            The change made in r38223 should not be limited to Qt < 4.5 only.
    
            * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
            (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53670 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 52ac0a0..31ca71e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-21  Jakub Wieczorek  <faw217 at gmail.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Don't allow Phonon's invisible video widget to keep the app running.
+        https://bugs.webkit.org/show_bug.cgi?id=33842
+
+        The change made in r38223 should not be limited to Qt < 4.5 only.
+
+        * platform/graphics/qt/MediaPlayerPrivatePhonon.cpp:
+        (WebCore::MediaPlayerPrivate::MediaPlayerPrivate):
+
 2010-01-21  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
index 3ea9afb..3274db5 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivatePhonon.cpp
@@ -92,9 +92,7 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
 {
     // Hint to Phonon to disable overlay painting
     m_videoWidget->setAttribute(Qt::WA_DontShowOnScreen);
-#if QT_VERSION < 0x040500
     m_videoWidget->setAttribute(Qt::WA_QuitOnClose, false);
-#endif
 
     createPath(m_mediaObject, m_videoWidget);
     createPath(m_mediaObject, m_audioOutput);

-- 
WebKit Debian packaging