Commit dcd8fe1b authored by eric@webkit.org's avatar eric@webkit.org
Browse files

2010-05-06 Simon Hausmann <simon.hausmann@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] REGRESSION: Loading of external CSS and JS files over network fails in some cases
        https://bugs.webkit.org/show_bug.cgi?id=36755

        Enable the direct connection between QtNetwork and QtWebKit only for Qt versions
        greater than 4.6.2, due to a bug in Qt that's been fixed after 4.6.2.

        * platform/network/qt/QNetworkReplyHandler.cpp:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@58903 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5230bd32
2010-05-06 Simon Hausmann <simon.hausmann@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] REGRESSION: Loading of external CSS and JS files over network fails in some cases
https://bugs.webkit.org/show_bug.cgi?id=36755
Enable the direct connection between QtNetwork and QtWebKit only for Qt versions
greater than 4.6.2, due to a bug in Qt that's been fixed after 4.6.2.
* platform/network/qt/QNetworkReplyHandler.cpp:
2010-05-06 Gustavo Noronha Silva <gustavo.noronha@collabora.co.uk>
 
Reviewed by Xan Lopez.
......@@ -41,8 +41,9 @@
// What type of connection should be used for the signals of the
// QNetworkReply? This depends on if Qt has a bugfix for this or not.
// It is fixed in Qt 4.6.1. See https://bugs.webkit.org/show_bug.cgi?id=32113
#if QT_VERSION > QT_VERSION_CHECK(4, 6, 0)
// It is fixed in Qt 4.6.3. See https://bugs.webkit.org/show_bug.cgi?id=32113
// and https://bugs.webkit.org/show_bug.cgi?id=36755
#if QT_VERSION > QT_VERSION_CHECK(4, 6, 2)
#define SIGNAL_CONN Qt::DirectConnection
#else
#define SIGNAL_CONN Qt::QueuedConnection
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment