Title: [128031] trunk/Source
- Revision
- 128031
- Author
- [email protected]
- Date
- 2012-09-10 01:31:26 -0700 (Mon, 10 Sep 2012)
Log Message
Replace calls to QString::fromAscii which is deprecated in Qt5
https://bugs.webkit.org/show_bug.cgi?id=96242
Patch by Kevin Funk <[email protected]> on 2012-09-10
Reviewed by Simon Hausmann.
Replace with QString::fromLatin1 which does the same.
Source/WebCore:
* bridge/qt/qt_runtime.cpp:
Source/WebKit2:
* UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (128030 => 128031)
--- trunk/Source/WebCore/ChangeLog 2012-09-10 08:16:32 UTC (rev 128030)
+++ trunk/Source/WebCore/ChangeLog 2012-09-10 08:31:26 UTC (rev 128031)
@@ -1,3 +1,14 @@
+2012-09-10 Kevin Funk <[email protected]>
+
+ Replace calls to QString::fromAscii which is deprecated in Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=96242
+
+ Reviewed by Simon Hausmann.
+
+ Replace with QString::fromLatin1 which does the same.
+
+ * bridge/qt/qt_runtime.cpp:
+
2012-09-09 Taiju Tsuiki <[email protected]>
successCallback of ResolveLocalFileSystemURL should not be optional.
Modified: trunk/Source/WebCore/bridge/qt/qt_runtime.cpp (128030 => 128031)
--- trunk/Source/WebCore/bridge/qt/qt_runtime.cpp 2012-09-10 08:16:32 UTC (rev 128030)
+++ trunk/Source/WebCore/bridge/qt/qt_runtime.cpp 2012-09-10 08:31:26 UTC (rev 128031)
@@ -1323,7 +1323,7 @@
}
if ((!(d->m_flags & QtRuntimeMethod::MethodIsSignal))) {
- setException(context, exception, QStringLiteral("QtMetaMethod.%3: %1::%2() is not a signal").arg(QString::fromUtf8(d->m_object.data()->metaObject()->className())).arg(QString::fromAscii(d->m_identifier)).arg(functionName));
+ setException(context, exception, QStringLiteral("QtMetaMethod.%3: %1::%2() is not a signal").arg(QString::fromUtf8(d->m_object.data()->metaObject()->className())).arg(QString::fromLatin1(d->m_identifier)).arg(functionName));
return JSValueMakeUndefined(context);
}
Modified: trunk/Source/WebKit2/ChangeLog (128030 => 128031)
--- trunk/Source/WebKit2/ChangeLog 2012-09-10 08:16:32 UTC (rev 128030)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-10 08:31:26 UTC (rev 128031)
@@ -1,3 +1,14 @@
+2012-09-10 Kevin Funk <[email protected]>
+
+ Replace calls to QString::fromAscii which is deprecated in Qt5
+ https://bugs.webkit.org/show_bug.cgi?id=96242
+
+ Reviewed by Simon Hausmann.
+
+ Replace with QString::fromLatin1 which does the same.
+
+ * UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp:
+
2012-09-10 Christophe Dumez <[email protected]>
[WK2] New fast/forms/number/number-interactive-validation-required.html fails
Modified: trunk/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp (128030 => 128031)
--- trunk/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp 2012-09-10 08:16:32 UTC (rev 128030)
+++ trunk/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp 2012-09-10 08:31:26 UTC (rev 128031)
@@ -150,7 +150,7 @@
Q_OBJECT
public:
tst_qrawwebview()
- : m_resourceDir(QString::fromAscii(TESTS_SOURCE_DIR "/html/resources"))
+ : m_resourceDir(QString::fromLatin1(TESTS_SOURCE_DIR "/html/resources"))
, m_baseUrl(QUrl::fromLocalFile(TESTS_SOURCE_DIR "/html").toString())
{ }
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
