2011-02-10 Ademar de Souza Reis Jr <ademar.reis@openbossa.org>
authorAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Mon, 14 Feb 2011 18:09:54 +0000 (15:09 -0300)
committerAdemar de Souza Reis Jr <ademar.reis@openbossa.org>
Mon, 14 Feb 2011 18:09:54 +0000 (15:09 -0300)
commit96da8076b5b377f857ba76b2ba6348bad8a496bd
treef6414a9ad24482de416f055d3d2cc1cd2ab56bf7
parent830d494b7ea2c5e001a067ff53808fdd0bec8781
2011-02-10  Ademar de Souza Reis Jr  <ademar.reis@openbossa.org>

        Reviewed by Andreas Kling.

        [Qt] Fix assert in QDeclarativeWebView
        https://bugs.webkit.org/show_bug.cgi?id=54240

        As reported in:
        http://bugreports.qt.nokia.com/browse/QTBUG-14278

        Instantiating a QDeclarativeWebView twice will trigger an assertion
        when in debug mode.

        Original patch from Thomas Hartmann <Thomas.Hartmann@nokia.com>,
        reviewed (there) by Aaron Kennedy
        f532679ca11914b453e22342f2ae5e9f790ce47a

        * declarative/qdeclarativewebview.cpp:
        (QDeclarativeWebView::init):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@78269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Conflicts:

Source/WebKit/qt/ChangeLog
Source/WebKit/qt/declarative/qdeclarativewebview.cpp
WebKit/qt/ChangeLog
WebKit/qt/declarative/qdeclarativewebview.cpp