Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (96454 => 96455)
--- trunk/Source/_javascript_Core/ChangeLog 2011-10-01 03:15:10 UTC (rev 96454)
+++ trunk/Source/_javascript_Core/ChangeLog 2011-10-01 07:22:29 UTC (rev 96455)
@@ -1,3 +1,15 @@
+2011-10-01 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r96421.
+ http://trac.webkit.org/changeset/96421
+ https://bugs.webkit.org/show_bug.cgi?id=69206
+
+ It broke Qt-WK2 build (Requested by ossy on #webkit).
+
+ * _javascript_Core.pri:
+ * wtf/qt/UtilsQt.h: Removed.
+ * wtf/wtf.pri:
+
2011-09-30 Daniel Bates <[email protected]>
Attempt to fix the Apple Windows and WinCairo Debug builds after
Modified: trunk/Source/_javascript_Core/_javascript_Core.pri (96454 => 96455)
--- trunk/Source/_javascript_Core/_javascript_Core.pri 2011-10-01 03:15:10 UTC (rev 96454)
+++ trunk/Source/_javascript_Core/_javascript_Core.pri 2011-10-01 07:22:29 UTC (rev 96455)
@@ -33,7 +33,6 @@
$$PWD/runtime \
$$PWD/wtf \
$$PWD/wtf/gobject \
- $$PWD/wtf/qt \
$$PWD/wtf/symbian \
$$PWD/wtf/unicode \
$$PWD/yarr \
Deleted: trunk/Source/_javascript_Core/wtf/qt/UtilsQt.h (96454 => 96455)
--- trunk/Source/_javascript_Core/wtf/qt/UtilsQt.h 2011-10-01 03:15:10 UTC (rev 96454)
+++ trunk/Source/_javascript_Core/wtf/qt/UtilsQt.h 2011-10-01 07:22:29 UTC (rev 96455)
@@ -1,37 +0,0 @@
-/*
- 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
Modified: trunk/Source/_javascript_Core/wtf/wtf.pri (96454 => 96455)
--- trunk/Source/_javascript_Core/wtf/wtf.pri 2011-10-01 03:15:10 UTC (rev 96454)
+++ trunk/Source/_javascript_Core/wtf/wtf.pri 2011-10-01 07:22:29 UTC (rev 96455)
@@ -84,7 +84,6 @@
wtf/PassTraits.h \
wtf/Platform.h \
wtf/PossiblyNull.h \
- wtf/qt/UtilsQt.h \
wtf/RandomNumber.h \
wtf/RandomNumberSeed.h \
wtf/RedBlackTree.h \
Modified: trunk/Source/WebCore/ChangeLog (96454 => 96455)
--- trunk/Source/WebCore/ChangeLog 2011-10-01 03:15:10 UTC (rev 96454)
+++ trunk/Source/WebCore/ChangeLog 2011-10-01 07:22:29 UTC (rev 96455)
@@ -1,3 +1,13 @@
+2011-10-01 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r96421.
+ http://trac.webkit.org/changeset/96421
+ https://bugs.webkit.org/show_bug.cgi?id=69206
+
+ It broke Qt-WK2 build (Requested by ossy on #webkit).
+
+ * WebCore.pro:
+
2011-09-30 Adrienne Walker <[email protected]>
[chromium] Track separate scroll deltas on the compositor thread
Modified: trunk/Source/WebCore/WebCore.pro (96454 => 96455)
--- trunk/Source/WebCore/WebCore.pro 2011-10-01 03:15:10 UTC (rev 96454)
+++ trunk/Source/WebCore/WebCore.pro 2011-10-01 07:22:29 UTC (rev 96455)
@@ -58,8 +58,6 @@
include($$PWD/../_javascript_Core/yarr/yarr.pri)
include($$PWD/../_javascript_Core/wtf/wtf.pri)
- INCLUDEPATH = $$PWD/../_javascript_Core/wtf/qt $$INCLUDEPATH
-
SOURCES += \
platform/qt/PlatformSupportQt.cpp \
bindings/generic/BindingSecurityBase.cpp \
Modified: trunk/Source/WebKit/qt/Api/qwebpage.cpp (96454 => 96455)
--- trunk/Source/WebKit/qt/Api/qwebpage.cpp 2011-10-01 03:15:10 UTC (rev 96454)
+++ trunk/Source/WebKit/qt/Api/qwebpage.cpp 2011-10-01 07:22:29 UTC (rev 96455)
@@ -108,7 +108,6 @@
#include "SystemInfo.h"
#endif // Q_OS_WIN32
#include "TextIterator.h"
-#include "UtilsQt.h"
#include "WebPlatformStrategies.h"
#if USE(QTKIT)
#include "WebSystemInterface.h"
@@ -140,6 +139,7 @@
#include <QStyle>
#include <QSysInfo>
#include <QTextCharFormat>
+#include <QTextDocument>
#include <QTouchEvent>
#include <QNetworkAccessManager>
#include <QNetworkRequest>
@@ -2110,7 +2110,7 @@
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()), escapeHtml(msg), QMessageBox::Ok);
+ QMessageBox::information(parent, tr("_javascript_ Alert - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Ok);
#endif
}
@@ -2127,7 +2127,7 @@
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()), escapeHtml(msg), QMessageBox::Yes, QMessageBox::No);
+ return QMessageBox::Yes == QMessageBox::information(parent, tr("_javascript_ Confirm - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QMessageBox::Yes, QMessageBox::No);
#endif
}
@@ -2147,7 +2147,7 @@
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()), escapeHtml(msg), QLineEdit::Normal, defaultValue, &ok);
+ QString x = QInputDialog::getText(parent, tr("_javascript_ Prompt - %1").arg(mainFrame()->url().host()), Qt::escape(msg), QLineEdit::Normal, defaultValue, &ok);
if (ok && result)
*result = x;
#endif
Modified: trunk/Source/WebKit/qt/ChangeLog (96454 => 96455)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-01 03:15:10 UTC (rev 96454)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-01 07:22:29 UTC (rev 96455)
@@ -1,3 +1,18 @@
+2011-10-01 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r96421.
+ http://trac.webkit.org/changeset/96421
+ https://bugs.webkit.org/show_bug.cgi?id=69206
+
+ It broke Qt-WK2 build (Requested by ossy on #webkit).
+
+ * Api/qwebpage.cpp:
+ (QWebPage::_javascript_Alert):
+ (QWebPage::_javascript_Confirm):
+ (QWebPage::_javascript_Prompt):
+ * WebCoreSupport/ChromeClientQt.cpp:
+ (WebCore::ChromeClientQt::setToolTip):
+
2011-09-30 Pierre Rossi <[email protected]>
[Qt] Build fix: Qt::escape is deprecated in Qt5
Modified: trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp (96454 => 96455)
--- trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2011-10-01 03:15:10 UTC (rev 96454)
+++ trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp 2011-10-01 07:22:29 UTC (rev 96455)
@@ -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 @@
view->setToolTip(QString());
QToolTip::hideText();
} else {
- QString dtip = QLatin1String("<p>") + escapeHtml(tip) + QLatin1String("</p>");
+ QString dtip = QLatin1String("<p>") + Qt::escape(tip) + QLatin1String("</p>");
view->setToolTip(dtip);
}
#else
