Changeset 96421 in webkit


Ignore:
Timestamp:
Sep 30, 2011 1:47:43 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt] Build fix: Qt::escape is deprecated in Qt5
https://bugs.webkit.org/show_bug.cgi?id=69162

Use QString::toHtmlEscaped in the Qt5 case.

Patch by Pierre Rossi <pierre.rossi@gmail.com> on 2011-09-30
Reviewed by Andreas Kling.

Source/JavaScriptCore:

(escapeHtml):

  • wtf/wtf.pri:

Source/WebCore:

No new tests needed.

  • WebCore.pro: adjust the include path accordingly

in the v8 case.

Source/WebKit/qt:

  • Api/qwebpage.cpp:

(QWebPage::javaScriptAlert):
(QWebPage::javaScriptConfirm):
(QWebPage::javaScriptPrompt):

  • WebCoreSupport/ChromeClientQt.cpp:

(WebCore::ChromeClientQt::setToolTip):

Location:
trunk/Source
Files:
1 added
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r96419 r96421  
     12011-09-30  Pierre Rossi  <pierre.rossi@gmail.com>
     2
     3        [Qt] Build fix: Qt::escape is deprecated in Qt5
     4        https://bugs.webkit.org/show_bug.cgi?id=69162
     5
     6        Use QString::toHtmlEscaped in the Qt5 case.
     7
     8        Reviewed by Andreas Kling.
     9
     10        * JavaScriptCore.pri:
     11        * wtf/qt/UtilsQt.h: Added.
     12        (escapeHtml):
     13        * wtf/wtf.pri:
     14
    1152011-09-30  Yuqiang Xian  <yuqiang.xian@intel.com>
    216
  • trunk/Source/JavaScriptCore/JavaScriptCore.pri

    r95110 r96421  
    3434    $$PWD/wtf \
    3535    $$PWD/wtf/gobject \
     36    $$PWD/wtf/qt \
    3637    $$PWD/wtf/symbian \
    3738    $$PWD/wtf/unicode \
  • trunk/Source/JavaScriptCore/wtf/wtf.pri

    r96418 r96421  
    8585    wtf/Platform.h \
    8686    wtf/PossiblyNull.h \
     87    wtf/qt/UtilsQt.h \
    8788    wtf/RandomNumber.h \
    8889    wtf/RandomNumberSeed.h \
  • trunk/Source/WebCore/ChangeLog

    r96410 r96421  
     12011-09-30  Pierre Rossi  <pierre.rossi@gmail.com>
     2
     3        [Qt] Build fix: Qt::escape is deprecated in Qt5
     4        https://bugs.webkit.org/show_bug.cgi?id=69162
     5
     6        Use QString::toHtmlEscaped in the Qt5 case.
     7
     8        Reviewed by Andreas Kling.
     9
     10        No new tests needed.
     11
     12        * WebCore.pro: adjust the include path accordingly
     13        in the v8 case.
     14
    1152011-09-30  Ryosuke Niwa  <rniwa@webkit.org>
    216
  • trunk/Source/WebCore/WebCore.pro

    r96339 r96421  
    5858    include($$PWD/../JavaScriptCore/yarr/yarr.pri)
    5959    include($$PWD/../JavaScriptCore/wtf/wtf.pri)
     60
     61    INCLUDEPATH = $$PWD/../JavaScriptCore/wtf/qt $$INCLUDEPATH
    6062
    6163    SOURCES += \
  • trunk/Source/WebKit/qt/Api/qwebpage.cpp

    r94685 r96421  
    109109#endif // Q_OS_WIN32
    110110#include "TextIterator.h"
     111#include "UtilsQt.h"
    111112#include "WebPlatformStrategies.h"
    112113#if USE(QTKIT)
     
    140141#include <QSysInfo>
    141142#include <QTextCharFormat>
    142 #include <QTextDocument>
    143143#include <QTouchEvent>
    144144#include <QNetworkAccessManager>
     
    21112111#ifndef QT_NO_MESSAGEBOX
    21122112    QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
    2113     QMessageBox::information(parent, tr("JavaScript Alert - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Ok);
     2113    QMessageBox::information(parent, tr("JavaScript Alert - %1").arg(mainFrame()->url().host()), escapeHtml(msg), QMessageBox::Ok);
    21142114#endif
    21152115}
     
    21282128#else
    21292129    QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
    2130     return QMessageBox::Yes == QMessageBox::information(parent, tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Yes, QMessageBox::No);
     2130    return QMessageBox::Yes == QMessageBox::information(parent, tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), escapeHtml(msg), QMessageBox::Yes, QMessageBox::No);
    21312131#endif
    21322132}
     
    21482148#ifndef QT_NO_INPUTDIALOG
    21492149    QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
    2150     QString x = QInputDialog::getText(parent, tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QLineEdit::Normal, defaultValue, &ok);
     2150    QString x = QInputDialog::getText(parent, tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), escapeHtml(msg), QLineEdit::Normal, defaultValue, &ok);
    21512151    if (ok && result)
    21522152        *result = x;
  • trunk/Source/WebKit/qt/ChangeLog

    r96345 r96421  
     12011-09-30  Pierre Rossi  <pierre.rossi@gmail.com>
     2
     3        [Qt] Build fix: Qt::escape is deprecated in Qt5
     4        https://bugs.webkit.org/show_bug.cgi?id=69162
     5
     6        Use QString::toHtmlEscaped in the Qt5 case.
     7
     8        Reviewed by Andreas Kling.
     9
     10        * Api/qwebpage.cpp:
     11        (QWebPage::javaScriptAlert):
     12        (QWebPage::javaScriptConfirm):
     13        (QWebPage::javaScriptPrompt):
     14        * WebCoreSupport/ChromeClientQt.cpp:
     15        (WebCore::ChromeClientQt::setToolTip):
     16
    1172011-09-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    218
  • trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp

    r95919 r96421  
    7575#include <qdebug.h>
    7676#include <qeventloop.h>
    77 #include <qtextdocument.h>
    7877#include <qtooltip.h>
    7978#include <wtf/OwnPtr.h>
     79#include <wtf/qt/UtilsQt.h>
    8080
    8181#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
     
    517517        QToolTip::hideText();
    518518    } else {
    519         QString dtip = QLatin1String("<p>") + Qt::escape(tip) + QLatin1String("</p>");
     519        QString dtip = QLatin1String("<p>") + escapeHtml(tip) + QLatin1String("</p>");
    520520        view->setToolTip(dtip);
    521521    }
Note: See TracChangeset for help on using the changeset viewer.