Modified: trunk/Source/WebKit2/ChangeLog (99193 => 99194)
--- trunk/Source/WebKit2/ChangeLog 2011-11-03 15:05:21 UTC (rev 99193)
+++ trunk/Source/WebKit2/ChangeLog 2011-11-03 15:21:06 UTC (rev 99194)
@@ -1,3 +1,13 @@
+2011-11-03 Andras Becsi <[email protected]>
+
+ [Qt][WK2] Fix the signal signature of the loadFailed API test.
+
+ Rubber-stamped by Simon Hausmann.
+
+ * UIProcess/API/qt/tests/commonviewtests/webviewabstraction.cpp:
+ (WebViewAbstraction::touchViewLoadFailed):
+ (WebViewAbstraction::desktopViewLoadFailed):
+
2011-11-03 Jocelyn Turcotte <[email protected]>
[Qt] Fix an assertion under WebPage::setViewportSize.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/webviewabstraction.cpp (99193 => 99194)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/webviewabstraction.cpp 2011-11-03 15:05:21 UTC (rev 99193)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/commonviewtests/webviewabstraction.cpp 2011-11-03 15:21:06 UTC (rev 99194)
@@ -151,15 +151,15 @@
void WebViewAbstraction::touchViewLoadFailed(QBaseWebView::ErrorType errorType, int errorCode, const QUrl& url)
{
- m_touchViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, const QUrl&))]++;
- if (m_touchViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, const QUrl&))] == m_desktopViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, QUrl))])
+ m_touchViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, QUrl))]++;
+ if (m_touchViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, QUrl))] == m_desktopViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, QUrl))])
emit loadFailed(static_cast<QBaseWebView::ErrorType>(errorType), errorCode, url);
}
void WebViewAbstraction::desktopViewLoadFailed(QBaseWebView::ErrorType errorType, int errorCode, const QUrl& url)
{
- m_desktopViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, const QUrl&))]++;
- if (m_touchViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, const QUrl&))] == m_desktopViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, QUrl))])
+ m_desktopViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, QUrl))]++;
+ if (m_touchViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, QUrl))] == m_desktopViewSignalsCounter[SIGNAL(loadFailed(QBaseWebView::ErrorType, int, QUrl))])
emit loadFailed(errorType, errorCode, url);
}