Diff
Modified: trunk/Source/WebCore/ChangeLog (119231 => 119232)
--- trunk/Source/WebCore/ChangeLog 2012-06-01 15:21:20 UTC (rev 119231)
+++ trunk/Source/WebCore/ChangeLog 2012-06-01 15:34:30 UTC (rev 119232)
@@ -1,3 +1,18 @@
+2012-06-01 Thiago Marcos P. Santos <[email protected]>
+
+ [Qt] Remove deprecated to/fromAscii()
+ https://bugs.webkit.org/show_bug.cgi?id=88086
+
+ Reviewed by Simon Hausmann.
+
+ Replacing to/fromAscii with to/fromLatin1 since it
+ is deprecated on Qt5.
+
+ * bridge/qt/qt_class.cpp:
+ (JSC::Bindings::QtClass::fallbackObject):
+ * platform/network/qt/ResourceRequestQt.cpp:
+ (WebCore::ResourceRequest::toNetworkRequest):
+
2012-06-01 Dan Bernstein <[email protected]>
Layout not updated after setting -webkit-line-clamp to none
Modified: trunk/Source/WebCore/bridge/qt/qt_class.cpp (119231 => 119232)
--- trunk/Source/WebCore/bridge/qt/qt_class.cpp 2012-06-01 15:21:20 UTC (rev 119231)
+++ trunk/Source/WebCore/bridge/qt/qt_class.cpp 2012-06-01 15:34:30 UTC (rev 119232)
@@ -71,7 +71,7 @@
QtInstance* qtinst = static_cast<QtInstance*>(inst);
UString ustring(identifier.publicName());
- const QByteArray name = QString(reinterpret_cast<const QChar*>(ustring.characters()), ustring.length()).toAscii();
+ const QByteArray name = QString(reinterpret_cast<const QChar*>(ustring.characters()), ustring.length()).toLatin1();
// First see if we have a cache hit
JSObject* val = qtinst->m_methods.value(name).get();
@@ -135,7 +135,7 @@
QObject* obj = qtinst->getObject();
UString ustring(identifier.publicName());
const QString name(reinterpret_cast<const QChar*>(ustring.characters()), ustring.length());
- const QByteArray ascii = name.toAscii();
+ const QByteArray ascii = name.toLatin1();
// First check for a cached field
QtField* f = qtinst->m_fields.value(name);
Modified: trunk/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp (119231 => 119232)
--- trunk/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp 2012-06-01 15:21:20 UTC (rev 119231)
+++ trunk/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp 2012-06-01 15:34:30 UTC (rev 119232)
@@ -49,8 +49,8 @@
const HTTPHeaderMap &headers = httpHeaderFields();
for (HTTPHeaderMap::const_iterator it = headers.begin(), end = headers.end();
it != end; ++it) {
- QByteArray name = QString(it->first).toAscii();
- QByteArray value = QString(it->second).toAscii();
+ QByteArray name = QString(it->first).toLatin1();
+ QByteArray value = QString(it->second).toLatin1();
// QNetworkRequest::setRawHeader() would remove the header if the value is null
// Make sure to set an empty header instead of null header.
if (!value.isNull())
Modified: trunk/Source/WebKit/qt/ChangeLog (119231 => 119232)
--- trunk/Source/WebKit/qt/ChangeLog 2012-06-01 15:21:20 UTC (rev 119231)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-06-01 15:34:30 UTC (rev 119232)
@@ -1,3 +1,20 @@
+2012-06-01 Thiago Marcos P. Santos <[email protected]>
+
+ [Qt] Remove deprecated to/fromAscii()
+ https://bugs.webkit.org/show_bug.cgi?id=88086
+
+ Reviewed by Simon Hausmann.
+
+ Replacing to/fromAscii with to/fromLatin1 since it
+ is deprecated on Qt5.
+
+ * WebCoreSupport/InspectorClientQt.cpp:
+ (WebCore):
+ * WebCoreSupport/InspectorServerQt.cpp:
+ (WebCore::InspectorServerRequestHandlerQt::tcpReadyRead):
+ * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp:
+ (tst_QDeclarativeWebView::settings):
+
2012-05-31 Hajime Morrita <[email protected]>
REGRESSION(r117572): editing/spelling/spellcheck-async-remove-frame.html crashes on Mac
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp (119231 => 119232)
--- trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp 2012-06-01 15:21:20 UTC (rev 119231)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp 2012-06-01 15:34:30 UTC (rev 119232)
@@ -120,7 +120,7 @@
QString settingKey(settingStoragePrefix + QString(name));
QString storedValueType = qsettings.value(settingKey + settingStorageTypeSuffix).toString();
QVariant storedValue = qsettings.value(settingKey);
- storedValue.convert(QVariant::nameToType(storedValueType.toAscii().data()));
+ storedValue.convert(QVariant::nameToType(storedValueType.toLatin1().data()));
return variantToSetting(storedValue);
#endif // QT_NO_SETTINGS
}
Modified: trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp (119231 => 119232)
--- trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp 2012-06-01 15:21:20 UTC (rev 119231)
+++ trunk/Source/WebKit/qt/WebCoreSupport/InspectorServerQt.cpp 2012-06-01 15:34:30 UTC (rev 119232)
@@ -287,7 +287,7 @@
if (!m_contentType.isEmpty())
responseHeader.setContentType(QString::fromLatin1(m_contentType));
- QByteArray asciiHeader = responseHeader.toString().toAscii();
+ QByteArray asciiHeader = responseHeader.toString().toLatin1();
m_tcpConnection->write(asciiHeader);
m_tcpConnection->write(response);
Modified: trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp (119231 => 119232)
--- trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp 2012-06-01 15:21:20 UTC (rev 119231)
+++ trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp 2012-06-01 15:34:30 UTC (rev 119232)
@@ -477,30 +477,30 @@
QVERIFY(s);
QStringList settingsList;
- settingsList << QString::fromAscii("autoLoadImages")
- << QString::fromAscii("developerExtrasEnabled")
- << QString::fromAscii("javaEnabled")
- << QString::fromAscii("_javascript_CanAccessClipboard")
- << QString::fromAscii("_javascript_CanOpenWindows")
- << QString::fromAscii("_javascript_Enabled")
- << QString::fromAscii("linksIncludedInFocusChain")
- << QString::fromAscii("localContentCanAccessRemoteUrls")
- << QString::fromAscii("localStorageDatabaseEnabled")
- << QString::fromAscii("offlineStorageDatabaseEnabled")
- << QString::fromAscii("offlineWebApplicationCacheEnabled")
- << QString::fromAscii("pluginsEnabled")
- << QString::fromAscii("printElementBackgrounds")
- << QString::fromAscii("privateBrowsingEnabled")
- << QString::fromAscii("zoomTextOnly");
+ settingsList << QString::fromLatin1("autoLoadImages")
+ << QString::fromLatin1("developerExtrasEnabled")
+ << QString::fromLatin1("javaEnabled")
+ << QString::fromLatin1("_javascript_CanAccessClipboard")
+ << QString::fromLatin1("_javascript_CanOpenWindows")
+ << QString::fromLatin1("_javascript_Enabled")
+ << QString::fromLatin1("linksIncludedInFocusChain")
+ << QString::fromLatin1("localContentCanAccessRemoteUrls")
+ << QString::fromLatin1("localStorageDatabaseEnabled")
+ << QString::fromLatin1("offlineStorageDatabaseEnabled")
+ << QString::fromLatin1("offlineWebApplicationCacheEnabled")
+ << QString::fromLatin1("pluginsEnabled")
+ << QString::fromLatin1("printElementBackgrounds")
+ << QString::fromLatin1("privateBrowsingEnabled")
+ << QString::fromLatin1("zoomTextOnly");
// Merely tests that setting gets stored (in QWebSettings), behavioural tests are in WebKit.
for (int b = 0; b <= 1; b++) {
bool value = !!b;
foreach (const QString& name, settingsList)
- s->setProperty(name.toAscii().data(), value);
+ s->setProperty(name.toLatin1().data(), value);
for (int i = 0; i < 2; i++) {
foreach (const QString& name, settingsList)
- QCOMPARE(s->property(name.toAscii().data()).toBool(), value);
+ QCOMPARE(s->property(name.toLatin1().data()).toBool(), value);
}
}
}
