Title: [98619] trunk/Source/WebKit/qt
- Revision
- 98619
- Author
- [email protected]
- Date
- 2011-10-27 12:52:48 -0700 (Thu, 27 Oct 2011)
Log Message
[Qt] Failure to build when QT_NO_MENU defined
https://bugs.webkit.org/show_bug.cgi?id=70970
Patch by Helder Correia <[email protected]> on 2011-10-27
Reviewed by Andreas Kling.
iterateContextMenu() must be wrapped around #ifndef QT_NO_MENU.
Build fix, no new tests.
* WebCoreSupport/DumpRenderTreeSupportQt.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (98618 => 98619)
--- trunk/Source/WebKit/qt/ChangeLog 2011-10-27 19:33:29 UTC (rev 98618)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-10-27 19:52:48 UTC (rev 98619)
@@ -1,3 +1,16 @@
+2011-10-27 Helder Correia <[email protected]>
+
+ [Qt] Failure to build when QT_NO_MENU defined
+ https://bugs.webkit.org/show_bug.cgi?id=70970
+
+ Reviewed by Andreas Kling.
+
+ iterateContextMenu() must be wrapped around #ifndef QT_NO_MENU.
+
+ Build fix, no new tests.
+
+ * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+
2011-10-26 Zalan Bujtas <[email protected]>
Name viewport change event consistently.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp (98618 => 98619)
--- trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2011-10-27 19:33:29 UTC (rev 98618)
+++ trunk/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp 2011-10-27 19:52:48 UTC (rev 98619)
@@ -1033,6 +1033,7 @@
corePage->settings()->setInteractiveFormValidationEnabled(enable);
}
+#ifndef QT_NO_MENU
static QStringList iterateContextMenu(QMenu* menu)
{
if (!menu)
@@ -1050,6 +1051,7 @@
}
return items;
}
+#endif
QStringList DumpRenderTreeSupportQt::contextMenu(QWebPage* page)
{
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
