Changeset 128031 in webkit


Ignore:
Timestamp:
Sep 10, 2012 1:31:26 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Replace calls to QString::fromAscii which is deprecated in Qt5
https://bugs.webkit.org/show_bug.cgi?id=96242

Patch by Kevin Funk <kevin.funk@kdab.com> 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:
Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r128018 r128031  
     12012-09-10  Kevin Funk  <kevin.funk@kdab.com>
     2
     3        Replace calls to QString::fromAscii which is deprecated in Qt5
     4        https://bugs.webkit.org/show_bug.cgi?id=96242
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Replace with QString::fromLatin1 which does the same.
     9
     10        * bridge/qt/qt_runtime.cpp:
     11
    1122012-09-09  Taiju Tsuiki  <tzik@chromium.org>
    213
  • trunk/Source/WebCore/bridge/qt/qt_runtime.cpp

    r127440 r128031  
    13241324
    13251325    if ((!(d->m_flags & QtRuntimeMethod::MethodIsSignal))) {
    1326         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));
     1326        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));
    13271327        return JSValueMakeUndefined(context);
    13281328    }
  • trunk/Source/WebKit2/ChangeLog

    r128030 r128031  
     12012-09-10  Kevin Funk  <kevin.funk@kdab.com>
     2
     3        Replace calls to QString::fromAscii which is deprecated in Qt5
     4        https://bugs.webkit.org/show_bug.cgi?id=96242
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Replace with QString::fromLatin1 which does the same.
     9
     10        * UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp:
     11
    1122012-09-10  Christophe Dumez  <christophe.dumez@intel.com>
    213
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/qrawwebview/tst_qrawwebview.cpp

    r125603 r128031  
    151151public:
    152152    tst_qrawwebview()
    153         : m_resourceDir(QString::fromAscii(TESTS_SOURCE_DIR "/html/resources"))
     153        : m_resourceDir(QString::fromLatin1(TESTS_SOURCE_DIR "/html/resources"))
    154154        , m_baseUrl(QUrl::fromLocalFile(TESTS_SOURCE_DIR "/html").toString())
    155155    { }
Note: See TracChangeset for help on using the changeset viewer.