Title: [140029] trunk/Source
- Revision
- 140029
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-17 12:40:39 -0800 (Thu, 17 Jan 2013)
Log Message
32-bit build for Qt5 on Mac OS fails.
https://bugs.webkit.org/show_bug.cgi?id=107094
We need to define NS_BUILD_32_LIKE_64 for 32-bit build for Mac OS.
Fixed 32-bit build detection for support Qt5.
Source/WebCore:
Patch by Poul Sysolyatin <psyt...@gmail.com> on 2013-01-17
Reviewed by Benjamin Poulain.
* Target.pri:
Source/WebKit:
Patch by Poul Sysolyatin <psyt...@gmail.com> on 2013-01-17
Reviewed by Benjamin Poulain.
* WebKit1.pro:
Source/WebKit2:
Patch by Poul Sysolyatin <psyt...@gmail.com> on 2013-01-17
Reviewed by Benjamin Poulain.
* Target.pri:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (140028 => 140029)
--- trunk/Source/WebCore/ChangeLog 2013-01-17 20:38:12 UTC (rev 140028)
+++ trunk/Source/WebCore/ChangeLog 2013-01-17 20:40:39 UTC (rev 140029)
@@ -1,3 +1,15 @@
+2013-01-17 Poul Sysolyatin <psyt...@gmail.com>
+
+ 32-bit build for Qt5 on Mac OS fails.
+ https://bugs.webkit.org/show_bug.cgi?id=107094
+
+ We need to define NS_BUILD_32_LIKE_64 for 32-bit build for Mac OS.
+ Fixed 32-bit build detection for support Qt5.
+
+ Reviewed by Benjamin Poulain.
+
+ * Target.pri:
+
2013-01-17 Joshua Bell <jsb...@chromium.org>
IndexedDB: Prevent crash dereferencing null if script context has stopped
Modified: trunk/Source/WebCore/Target.pri (140028 => 140029)
--- trunk/Source/WebCore/Target.pri 2013-01-17 20:38:12 UTC (rev 140028)
+++ trunk/Source/WebCore/Target.pri 2013-01-17 20:40:39 UTC (rev 140029)
@@ -3315,7 +3315,7 @@
platform/mac/WebWindowAnimation.mm
DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
- contains(CONFIG, "x86") {
+ isEqual(QT_ARCH, "i386") {
DEFINES+=NS_BUILD_32_LIKE_64
}
Modified: trunk/Source/WebKit/ChangeLog (140028 => 140029)
--- trunk/Source/WebKit/ChangeLog 2013-01-17 20:38:12 UTC (rev 140028)
+++ trunk/Source/WebKit/ChangeLog 2013-01-17 20:40:39 UTC (rev 140029)
@@ -1,3 +1,15 @@
+2013-01-17 Poul Sysolyatin <psyt...@gmail.com>
+
+ 32-bit build for Qt5 on Mac OS fails.
+ https://bugs.webkit.org/show_bug.cgi?id=107094
+
+ We need to define NS_BUILD_32_LIKE_64 for 32-bit build for Mac OS.
+ Fixed 32-bit build detection for support Qt5.
+
+ Reviewed by Benjamin Poulain.
+
+ * WebKit1.pro:
+
2013-01-14 Dean Jackson <d...@apple.com>
[ANGLE] Update ANGLE in WebKit
Modified: trunk/Source/WebKit/WebKit1.pro (140028 => 140029)
--- trunk/Source/WebKit/WebKit1.pro 2013-01-17 20:38:12 UTC (rev 140028)
+++ trunk/Source/WebKit/WebKit1.pro 2013-01-17 20:40:39 UTC (rev 140029)
@@ -127,8 +127,7 @@
$$PWD/../../WebKitLibraries/
DEFINES += NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
-
- contains(CONFIG, "x86") {
+ isEqual(QT_ARCH, "i386") {
DEFINES+=NS_BUILD_32_LIKE_64
}
Modified: trunk/Source/WebKit2/ChangeLog (140028 => 140029)
--- trunk/Source/WebKit2/ChangeLog 2013-01-17 20:38:12 UTC (rev 140028)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-17 20:40:39 UTC (rev 140029)
@@ -1,3 +1,15 @@
+2013-01-17 Poul Sysolyatin <psyt...@gmail.com>
+
+ 32-bit build for Qt5 on Mac OS fails.
+ https://bugs.webkit.org/show_bug.cgi?id=107094
+
+ We need to define NS_BUILD_32_LIKE_64 for 32-bit build for Mac OS.
+ Fixed 32-bit build detection for support Qt5.
+
+ Reviewed by Benjamin Poulain.
+
+ * Target.pri:
+
2013-01-17 Martin Robinson <mrobin...@igalia.com>
[GTK] Build with LevelDB when IndexedDB is enabled
Modified: trunk/Source/WebKit2/Target.pri (140028 => 140029)
--- trunk/Source/WebKit2/Target.pri 2013-01-17 20:38:12 UTC (rev 140028)
+++ trunk/Source/WebKit2/Target.pri 2013-01-17 20:40:39 UTC (rev 140029)
@@ -884,6 +884,9 @@
mac: {
use?(QTKIT) {
DEFINES += NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
+ isEqual(QT_ARCH, "i386") {
+ DEFINES+=NS_BUILD_32_LIKE_64
+ }
INCLUDEPATH += \
$$PWD/../../WebKitLibraries/
HEADERS += \
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
