Title: [136240] trunk/Source/WebKit/qt
- Revision
- 136240
- Author
- [email protected]
- Date
- 2012-11-30 07:25:27 -0800 (Fri, 30 Nov 2012)
Log Message
Prospective build fix for --minimal build.
* WebCoreSupport/QWebPageAdapter.cpp:
(QWebPageAdapter::triggerAction):
(QWebPageAdapter::contextMenuItemTagForAction):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (136239 => 136240)
--- trunk/Source/WebKit/qt/ChangeLog 2012-11-30 15:22:45 UTC (rev 136239)
+++ trunk/Source/WebKit/qt/ChangeLog 2012-11-30 15:25:27 UTC (rev 136240)
@@ -1,3 +1,11 @@
+2012-11-30 Simon Hausmann <[email protected]>
+
+ Prospective build fix for --minimal build.
+
+ * WebCoreSupport/QWebPageAdapter.cpp:
+ (QWebPageAdapter::triggerAction):
+ (QWebPageAdapter::contextMenuItemTagForAction):
+
2012-11-30 Pierre Rossi <[email protected]>
[Qt] Fix zoomIn/zoomOut related regression.
Modified: trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp (136239 => 136240)
--- trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2012-11-30 15:22:45 UTC (rev 136239)
+++ trunk/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp 2012-11-30 15:25:27 UTC (rev 136240)
@@ -1134,13 +1134,13 @@
case SetTextDirectionRightToLeft:
editor->setBaseWritingDirection(RightToLeftWritingDirection);
break;
+#if ENABLE(INSPECTOR)
case InspectElement: {
-#if ENABLE(INSPECTOR)
ASSERT(hitTestResult != &hitTest);
page->inspectorController()->inspect(hitTestResult->innerNonSharedNode);
-#endif
break;
}
+#endif
default:
if (commandName)
editor->command(commandName).execute();
@@ -1213,8 +1213,10 @@
*checkable = true;
return contextMenuItemTagUnderline();
+#if ENABLE(INSPECTOR)
case InspectElement:
return contextMenuItemTagInspectElement();
+#endif
default:
ASSERT_NOT_REACHED();
return QString();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
