Commit 362cc3f1 authored by ossy@webkit.org's avatar ossy@webkit.org

[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.

Source/JavaScriptCore:

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

* JavaScriptCore.pri:
* wtf/qt/UtilsQt.h: Added.
(escapeHtml):
* wtf/wtf.pri:

Source/WebCore:

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

No new tests needed.

* WebCore.pro: adjust the include path accordingly
in the v8 case.

Source/WebKit/qt:

Patch by Pierre Rossi <pierre.rossi@gmail.com> on 2011-10-03
Reviewed by Andreas.

* Api/qwebpage.cpp:
(QWebPage::javaScriptAlert):
(QWebPage::javaScriptConfirm):
(QWebPage::javaScriptPrompt):
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::setToolTip):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@96503 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b034bd53
2011-10-03 Pierre Rossi <pierre.rossi@gmail.com>
[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.
Reviewed by Andreas Kling.
* JavaScriptCore.pri:
* wtf/qt/UtilsQt.h: Added.
(escapeHtml):
* wtf/wtf.pri:
2011-10-03 Balazs Kelemen <kbalazs@webkit.org>
libdispatch based ParallelJobs is not enough parallel
......@@ -33,6 +33,7 @@ JAVASCRIPTCORE_INCLUDEPATH = \
$$PWD/runtime \
$$PWD/wtf \
$$PWD/wtf/gobject \
$$PWD/wtf/qt \
$$PWD/wtf/symbian \
$$PWD/wtf/unicode \
$$PWD/yarr \
......
/*
Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#ifndef WTF_UtilsQt_h
#define WTF_UtilsQt_h
#include <QString>
#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
#include <QTextDocument>
#endif
inline QString escapeHtml(const QString& string)
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
return string.toHtmlEscaped();
#else
return Qt::escape(string);
#endif
}
#endif // WTF_UtilsQt_h
......@@ -84,6 +84,7 @@ HEADERS += \
wtf/PassTraits.h \
wtf/Platform.h \
wtf/PossiblyNull.h \
wtf/qt/UtilsQt.h \
wtf/RandomNumber.h \
wtf/RandomNumberSeed.h \
wtf/RedBlackTree.h \
......
2011-10-03 Pierre Rossi <pierre.rossi@gmail.com>
[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.
Reviewed by Andreas Kling.
No new tests needed.
* WebCore.pro: adjust the include path accordingly
in the v8 case.
2011-10-03 Ilya Tikhonovsky <loislo@chromium.org>
Web Inspector: debuggerPresentatioModel.linkifyLocation leaks updateAnchor closure instances.
......@@ -58,6 +58,8 @@ v8 {
include($$PWD/../JavaScriptCore/yarr/yarr.pri)
include($$PWD/../JavaScriptCore/wtf/wtf.pri)
INCLUDEPATH = $$PWD/../JavaScriptCore/wtf/qt $$INCLUDEPATH
SOURCES += \
platform/qt/PlatformSupportQt.cpp \
bindings/generic/BindingSecurityBase.cpp \
......
......@@ -108,6 +108,7 @@
#include "SystemInfo.h"
#endif // Q_OS_WIN32
#include "TextIterator.h"
#include "UtilsQt.h"
#include "WebPlatformStrategies.h"
#if USE(QTKIT)
#include "WebSystemInterface.h"
......@@ -139,7 +140,6 @@
#include <QStyle>
#include <QSysInfo>
#include <QTextCharFormat>
#include <QTextDocument>
#include <QTouchEvent>
#include <QNetworkAccessManager>
#include <QNetworkRequest>
......@@ -2110,7 +2110,7 @@ void QWebPage::javaScriptAlert(QWebFrame *frame, const QString& msg)
Q_UNUSED(frame)
#ifndef QT_NO_MESSAGEBOX
QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
QMessageBox::information(parent, tr("JavaScript Alert - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Ok);
QMessageBox::information(parent, tr("JavaScript Alert - %1").arg(mainFrame()->url().host()), escapeHtml(msg), QMessageBox::Ok);
#endif
}
......@@ -2127,7 +2127,7 @@ bool QWebPage::javaScriptConfirm(QWebFrame *frame, const QString& msg)
return true;
#else
QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
return QMessageBox::Yes == QMessageBox::information(parent, tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Yes, QMessageBox::No);
return QMessageBox::Yes == QMessageBox::information(parent, tr("JavaScript Confirm - %1").arg(mainFrame()->url().host()), escapeHtml(msg), QMessageBox::Yes, QMessageBox::No);
#endif
}
......@@ -2147,7 +2147,7 @@ bool QWebPage::javaScriptPrompt(QWebFrame *frame, const QString& msg, const QStr
bool ok = false;
#ifndef QT_NO_INPUTDIALOG
QWidget* parent = (d->client) ? d->client->ownerWidget() : 0;
QString x = QInputDialog::getText(parent, tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QLineEdit::Normal, defaultValue, &ok);
QString x = QInputDialog::getText(parent, tr("JavaScript Prompt - %1").arg(mainFrame()->url().host()), escapeHtml(msg), QLineEdit::Normal, defaultValue, &ok);
if (ok && result)
*result = x;
#endif
......
2011-10-03 Pierre Rossi <pierre.rossi@gmail.com>
[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.
Reviewed by Andreas.
* Api/qwebpage.cpp:
(QWebPage::javaScriptAlert):
(QWebPage::javaScriptConfirm):
(QWebPage::javaScriptPrompt):
* WebCoreSupport/ChromeClientQt.cpp:
(WebCore::ChromeClientQt::setToolTip):
2011-10-01 Sheriff Bot <webkit.review.bot@gmail.com>
Unreviewed, rolling out r96421.
......
......@@ -74,9 +74,9 @@
#include "qwebview.h"
#include <qdebug.h>
#include <qeventloop.h>
#include <qtextdocument.h>
#include <qtooltip.h>
#include <wtf/OwnPtr.h>
#include <wtf/qt/UtilsQt.h>
#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
#include "FullScreenVideoQt.h"
......@@ -516,7 +516,7 @@ void ChromeClientQt::setToolTip(const String &tip, TextDirection)
view->setToolTip(QString());
QToolTip::hideText();
} else {
QString dtip = QLatin1String("<p>") + Qt::escape(tip) + QLatin1String("</p>");
QString dtip = QLatin1String("<p>") + escapeHtml(tip) + QLatin1String("</p>");
view->setToolTip(dtip);
}
#else
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment