Title: [97387] trunk/Source
- Revision
- 97387
- Author
- [email protected]
- Date
- 2011-10-13 12:47:27 -0700 (Thu, 13 Oct 2011)
Log Message
[Qt] QtWebKit build error for Mac 32bit
https://bugs.webkit.org/show_bug.cgi?id=69914
In WebCore.pro and QtWebKit.pro we define NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
when compiling with ENABLE_VIDEO and with WTF_USE_QTKIT.
But this is meant to be defined in NSGeometry.h under certain preconditions.
Without setting NS_BUILD_32_LIKE_64 none of these preconditions is
met and therefore NSGeometry.h will create several conflicting type definitions.
With this patch we create consistent definitions again.
Due to the order of include files we cannot remove
NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES from WebCore.pro.
Patch by Zeno Albisser <[email protected]> on 2011-10-13
Reviewed by Andreas Kling.
* WebCore.pro:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (97386 => 97387)
--- trunk/Source/WebCore/ChangeLog 2011-10-13 19:37:57 UTC (rev 97386)
+++ trunk/Source/WebCore/ChangeLog 2011-10-13 19:47:27 UTC (rev 97387)
@@ -1,3 +1,22 @@
+2011-10-13 Zeno Albisser <[email protected]>
+
+ [Qt] QtWebKit build error for Mac 32bit
+ https://bugs.webkit.org/show_bug.cgi?id=69914
+
+ In WebCore.pro and QtWebKit.pro we define NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+ when compiling with ENABLE_VIDEO and with WTF_USE_QTKIT.
+ But this is meant to be defined in NSGeometry.h under certain preconditions.
+ Without setting NS_BUILD_32_LIKE_64 none of these preconditions is
+ met and therefore NSGeometry.h will create several conflicting type definitions.
+
+ With this patch we create consistent definitions again.
+ Due to the order of include files we cannot remove
+ NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES from WebCore.pro.
+
+ Reviewed by Andreas Kling.
+
+ * WebCore.pro:
+
2011-10-13 Tom Hudson <[email protected]>
Revert border radius clips (r95239) for Chromium due to performance issues. Update test expectations to skip border radius clip layout tests.
Modified: trunk/Source/WebCore/WebCore.pro (97386 => 97387)
--- trunk/Source/WebCore/WebCore.pro 2011-10-13 19:37:57 UTC (rev 97386)
+++ trunk/Source/WebCore/WebCore.pro 2011-10-13 19:47:27 UTC (rev 97387)
@@ -3109,6 +3109,9 @@
platform/mac/WebWindowAnimation.mm
DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+ contains(CONFIG, "x86") {
+ DEFINES+=NS_BUILD_32_LIKE_64
+ }
} else: contains(DEFINES, WTF_USE_GSTREAMER=1) {
HEADERS += \
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (97386 => 97387)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-10-13 19:37:57 UTC (rev 97386)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-10-13 19:47:27 UTC (rev 97387)
@@ -237,6 +237,9 @@
$$SOURCE_DIR/../WebKitLibraries/
DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+ contains(CONFIG, "x86") {
+ DEFINES+=NS_BUILD_32_LIKE_64
+ }
HEADERS += $$PWD/WebCoreSupport/WebSystemInterface.h \
$$PWD/WebCoreSupport/QTKitFullScreenVideoHandler.h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
