Title: [126739] trunk/Source/WebKit2
- Revision
- 126739
- Author
- [email protected]
- Date
- 2012-08-27 02:58:07 -0700 (Mon, 27 Aug 2012)
Log Message
[Qt] Fix failing QML2 auto tests due to conflicting signal declaration
https://bugs.webkit.org/show_bug.cgi?id=95059
Reviewed by Kenneth Rohde Christiansen.
Don't define a scaleChanged signal when QQuickItem already declares one to notify about changes
in the scale property. As it turns out there is not need for declaring a signal in the test case
at all.
* UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml:
* UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (126738 => 126739)
--- trunk/Source/WebKit2/ChangeLog 2012-08-27 09:45:36 UTC (rev 126738)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-27 09:58:07 UTC (rev 126739)
@@ -1,3 +1,17 @@
+2012-08-27 Simon Hausmann <[email protected]>
+
+ [Qt] Fix failing QML2 auto tests due to conflicting signal declaration
+ https://bugs.webkit.org/show_bug.cgi?id=95059
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Don't define a scaleChanged signal when QQuickItem already declares one to notify about changes
+ in the scale property. As it turns out there is not need for declaring a signal in the test case
+ at all.
+
+ * UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml:
+ * UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml:
+
2012-08-27 Mikhail Pozdnyakov <[email protected]>
Rename RegisterProtocolHandler API to NavigatorContentUtils
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml (126738 => 126739)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml 2012-08-27 09:45:36 UTC (rev 126738)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_doubleTapToZoom.qml 2012-08-27 09:58:07 UTC (rev 126739)
@@ -13,8 +13,6 @@
property variant result
- experimental.test.onContentsScaleCommitted: scaleChanged()
-
property variant content: "data:text/html," +
"<head>" +
" <meta name='viewport' content='width=device-width'>" +
@@ -26,7 +24,6 @@
"</body>"
signal resultReceived
- signal scaleChanged
}
SignalSpy {
@@ -37,8 +34,8 @@
SignalSpy {
id: scaleSpy
- target: webView
- signalName: "scaleChanged"
+ target: webView.experimental.test
+ signalName: "contentsScaleCommitted"
}
TestCase {
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml (126738 => 126739)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml 2012-08-27 09:45:36 UTC (rev 126738)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qmltests/WebView/tst_fitToView.qml 2012-08-27 09:58:07 UTC (rev 126739)
@@ -13,8 +13,6 @@
property variant result
- experimental.test.onContentsScaleCommitted: scaleChanged()
-
property variant content: "data:text/html," +
"<head>" +
" <meta name='viewport' content='width=device-width'>" +
@@ -24,7 +22,6 @@
"</body>"
signal resultReceived
- signal scaleChanged
}
SignalSpy {
@@ -35,8 +32,8 @@
SignalSpy {
id: scaleSpy
- target: webView
- signalName: "scaleChanged"
+ target: webView.experimental.test
+ signalName: "contentsScaleCommitted"
}
TestCase {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
