Changeset 96421 in webkit
- Timestamp:
- Sep 30, 2011 1:47:43 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 1 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r96419 r96421 1 2011-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 1 15 2011-09-30 Yuqiang Xian <yuqiang.xian@intel.com> 2 16 -
trunk/Source/JavaScriptCore/JavaScriptCore.pri
r95110 r96421 34 34 $$PWD/wtf \ 35 35 $$PWD/wtf/gobject \ 36 $$PWD/wtf/qt \ 36 37 $$PWD/wtf/symbian \ 37 38 $$PWD/wtf/unicode \ -
trunk/Source/JavaScriptCore/wtf/wtf.pri
r96418 r96421 85 85 wtf/Platform.h \ 86 86 wtf/PossiblyNull.h \ 87 wtf/qt/UtilsQt.h \ 87 88 wtf/RandomNumber.h \ 88 89 wtf/RandomNumberSeed.h \ -
trunk/Source/WebCore/ChangeLog
r96410 r96421 1 2011-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 1 15 2011-09-30 Ryosuke Niwa <rniwa@webkit.org> 2 16 -
trunk/Source/WebCore/WebCore.pro
r96339 r96421 58 58 include($$PWD/../JavaScriptCore/yarr/yarr.pri) 59 59 include($$PWD/../JavaScriptCore/wtf/wtf.pri) 60 61 INCLUDEPATH = $$PWD/../JavaScriptCore/wtf/qt $$INCLUDEPATH 60 62 61 63 SOURCES += \ -
trunk/Source/WebKit/qt/Api/qwebpage.cpp
r94685 r96421 109 109 #endif // Q_OS_WIN32 110 110 #include "TextIterator.h" 111 #include "UtilsQt.h" 111 112 #include "WebPlatformStrategies.h" 112 113 #if USE(QTKIT) … … 140 141 #include <QSysInfo> 141 142 #include <QTextCharFormat> 142 #include <QTextDocument>143 143 #include <QTouchEvent> 144 144 #include <QNetworkAccessManager> … … 2111 2111 #ifndef QT_NO_MESSAGEBOX 2112 2112 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); 2114 2114 #endif 2115 2115 } … … 2128 2128 #else 2129 2129 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); 2131 2131 #endif 2132 2132 } … … 2148 2148 #ifndef QT_NO_INPUTDIALOG 2149 2149 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); 2151 2151 if (ok && result) 2152 2152 *result = x; -
trunk/Source/WebKit/qt/ChangeLog
r96345 r96421 1 2011-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 1 17 2011-09-23 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> 2 18 -
trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
r95919 r96421 75 75 #include <qdebug.h> 76 76 #include <qeventloop.h> 77 #include <qtextdocument.h>78 77 #include <qtooltip.h> 79 78 #include <wtf/OwnPtr.h> 79 #include <wtf/qt/UtilsQt.h> 80 80 81 81 #if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT)) … … 517 517 QToolTip::hideText(); 518 518 } else { 519 QString dtip = QLatin1String("<p>") + Qt::escape(tip) + QLatin1String("</p>");519 QString dtip = QLatin1String("<p>") + escapeHtml(tip) + QLatin1String("</p>"); 520 520 view->setToolTip(dtip); 521 521 }
Note: See TracChangeset
for help on using the changeset viewer.