Changeset 57205 in webkit

Timestamp:

Apr 7, 2010 5:48:59 AM (14 years ago)

Author:

Simon Hausmann

Message:

​https://bugs.webkit.org/show_bug.cgi?id=36750

Reviewed by Laszlo Gombos.

[Qt] Package build without touch support is broken

Use the conditional attribute instead of #ifdefs in the idl file for the
touch specific properties, to make the generated files compile with and
without the touch events enabled.

• dom/Document.idl: Use conditional instead of #ifdef.
• dom/Element.idl: Ditto.
• page/DOMWindow.idl: Ditto.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.idl (modified) (1 diff)
• dom/Element.idl (modified) (1 diff)
• page/DOMWindow.idl (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-07  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36750
+
+        [Qt] Package build without touch support is broken
+
+        Use the conditional attribute instead of #ifdefs in the idl file for the
+        touch specific properties, to make the generated files compile with and
+        without the touch events enabled.
+
+        * dom/Document.idl: Use conditional instead of #ifdef.
+        * dom/Element.idl: Ditto.
+        * page/DOMWindow.idl: Ditto.
+
 2010-04-07  Simon Hausmann  <simon.hausmann@nokia.com>
 

trunk/WebCore/dom/Document.idl

@@ -307 +307 @@
         attribute [DontEnum] EventListener onsearch;
         attribute [DontEnum] EventListener onselectstart;
-#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-        attribute [DontEnum] EventListener ontouchstart;
-        attribute [DontEnum] EventListener ontouchmove;
-        attribute [DontEnum] EventListener ontouchend;
-        attribute [DontEnum] EventListener ontouchcancel;
-#endif
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchstart;
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchmove;
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchend;
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchcancel;
 #endif
     };

trunk/WebCore/dom/Element.idl

@@ -196 +196 @@
         attribute [DontEnum] EventListener onsearch;
         attribute [DontEnum] EventListener onselectstart;
-#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-        attribute [DontEnum] EventListener ontouchstart;
-        attribute [DontEnum] EventListener ontouchmove;
-        attribute [DontEnum] EventListener ontouchend;
-        attribute [DontEnum] EventListener ontouchcancel;
-#endif
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchstart;
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchmove;
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchend;
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchcancel;
 #endif
     };

trunk/WebCore/page/DOMWindow.idl

@@ -294 +294 @@
         attribute EventListener onorientationchange;
 #endif
- #if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-        attribute [DontEnum] EventListener ontouchstart;
-        attribute [DontEnum] EventListener ontouchmove;
-        attribute [DontEnum] EventListener ontouchend;
-        attribute [DontEnum] EventListener ontouchcancel;
- #endif
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchstart;
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchmove;
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchend;
+        attribute [DontEnum,Conditional=TOUCH_EVENTS] EventListener ontouchcancel;
 
         // EventTarget interface
@@ -713 +711 @@
 #endif
 
-#if defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-        attribute TouchEventConstructor TouchEvent;
-#endif
+        attribute [Conditional=TOUCH_EVENTS] TouchEventConstructor TouchEvent;
 
         attribute DOMFormDataConstructor FormData;