[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.16-1409-g5afdf4d
hausmann at webkit.org
hausmann at webkit.org
Thu Dec 3 13:27:36 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit a596e86efa2e204756f880e207545229f541a680
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 5 08:30:51 2009 +0000
Another prospective build fix against Qt 4.5 (build bot)
Patch by Simon Hausmann <hausmann at webkit.org> on 2009-11-05
Don't compile & run the QGraphicsWebView portion of the
input methods auto test with Qt 4.5.
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::inputMethods_data):
(inputMethodHints):
(inputMethodEnabled):
(tst_QWebPage::inputMethods):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50554 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 8cf5141..fff3164 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,18 @@
2009-11-05 Simon Hausmann <hausmann at webkit.org>
+ Another prospective build fix against Qt 4.5 (build bot)
+
+ Don't compile & run the QGraphicsWebView portion of the
+ input methods auto test with Qt 4.5.
+
+ * tests/qwebpage/tst_qwebpage.cpp:
+ (tst_QWebPage::inputMethods_data):
+ (inputMethodHints):
+ (inputMethodEnabled):
+ (tst_QWebPage::inputMethods):
+
+2009-11-05 Simon Hausmann <hausmann at webkit.org>
+
Prospective build fix against Qt 4.5 (build bot)
* Api/qgraphicswebview.cpp:
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 26690cb..ead25fb 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -1272,23 +1272,29 @@ void tst_QWebPage::inputMethods_data()
{
QTest::addColumn<QString>("viewType");
QTest::newRow("QWebView") << "QWebView";
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
QTest::newRow("QGraphicsWebView") << "QGraphicsWebView";
+#endif
}
static Qt::InputMethodHints inputMethodHints(QObject* object)
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
if (QGraphicsObject* o = qobject_cast<QGraphicsObject*>(object))
return o->inputMethodHints();
- else if (QWidget* w = qobject_cast<QWidget*>(object))
+#endif
+ if (QWidget* w = qobject_cast<QWidget*>(object))
return w->inputMethodHints();
return Qt::InputMethodHints();
}
static bool inputMethodEnabled(QObject* object)
{
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
if (QGraphicsObject* o = qobject_cast<QGraphicsObject*>(object))
return o->flags() & QGraphicsItem::ItemAcceptsInputMethod;
- else if (QWidget* w = qobject_cast<QWidget*>(object))
+#endif
+ if (QWidget* w = qobject_cast<QWidget*>(object))
return w->testAttribute(Qt::WA_InputMethodEnabled);
return false;
}
@@ -1304,7 +1310,9 @@ void tst_QWebPage::inputMethods()
wv->setPage(page);
view = wv;
container = view;
- } else if (viewType == "QGraphicsWebView") {
+ }
+#if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
+ else if (viewType == "QGraphicsWebView") {
QGraphicsWebView* wv = new QGraphicsWebView;
wv->setPage(page);
view = wv;
@@ -1316,7 +1324,9 @@ void tst_QWebPage::inputMethods()
wv->setGeometry(QRect(0, 0, 500, 500));
container = gv;
- } else
+ }
+#endif
+ else
QVERIFY2(false, "Unknown view type");
page->mainFrame()->setHtml("<html><body>" \
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list