diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-01-18 14:03:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-18 14:42:14 +0100 |
| commit | 75aed8fafb6eb2e4228e10b8895465271b595752 (patch) | |
| tree | 92b5ccedaa43478dafc3277e257f4c757d9fb0c9 | |
| parent | f755a72b77240ed0cfac92f0355aa0464279db62 (diff) | |
| download | qtwebkit-75aed8fafb6eb2e4228e10b8895465271b595752.tar.gz | |
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.
http://trac.webkit.org/changeset/140029
Patch by Poul Sysolyatin <psytonx@gmail.com> on 2013-01-17
Reviewed by Benjamin Poulain.
Change-Id: I2748db966a6dff76add422b791717bce87517e84
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Poul Sysolyatin <psytonx@gmail.com>
| -rw-r--r-- | Source/WebCore/ChangeLog | 12 | ||||
| -rw-r--r-- | Source/WebCore/Target.pri | 2 | ||||
| -rw-r--r-- | Source/WebKit/ChangeLog | 12 | ||||
| -rw-r--r-- | Source/WebKit/WebKit1.pro | 3 | ||||
| -rw-r--r-- | Source/WebKit2/ChangeLog | 12 | ||||
| -rw-r--r-- | Source/WebKit2/Target.pri | 3 |
6 files changed, 41 insertions, 3 deletions
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog index 0b3e57c34..1117245f6 100644 --- a/Source/WebCore/ChangeLog +++ b/Source/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2013-01-17 Poul Sysolyatin <psytonx@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-16 Jocelyn Turcotte <jocelyn.turcotte@digia.com> [Qt] Use the shared HistoryItem serialization for QWebHistory diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri index cf1370fce..266974814 100644 --- a/Source/WebCore/Target.pri +++ b/Source/WebCore/Target.pri @@ -3253,7 +3253,7 @@ enable?(VIDEO) { platform/mac/WebWindowAnimation.mm DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES - contains(CONFIG, "x86") { + isEqual(QT_ARCH, "i386") { DEFINES+=NS_BUILD_32_LIKE_64 } diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index 68e6531f0..fcbb3dd08 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,3 +1,15 @@ +2013-01-17 Poul Sysolyatin <psytonx@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: + 2012-11-30 Simon Hausmann <simon.hausmann@digia.com>, Pierre Rossi <pierre.rossi@digia.com> [Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets diff --git a/Source/WebKit/WebKit1.pro b/Source/WebKit/WebKit1.pro index ea854e6c8..244735b7d 100644 --- a/Source/WebKit/WebKit1.pro +++ b/Source/WebKit/WebKit1.pro @@ -123,8 +123,7 @@ enable?(VIDEO) { $$PWD/../../WebKitLibraries/ DEFINES += NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES - - contains(CONFIG, "x86") { + isEqual(QT_ARCH, "i386") { DEFINES+=NS_BUILD_32_LIKE_64 } diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index 9e62458eb..4a63d2ce4 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,15 @@ +2013-01-17 Poul Sysolyatin <psytonx@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-09 Andras Becsi <andras.becsi@digia.com> [Qt][EFL][WK2] Remove redundant device pixel ratio adjustment from PageViewportController diff --git a/Source/WebKit2/Target.pri b/Source/WebKit2/Target.pri index 098b5b954..aeefadee7 100644 --- a/Source/WebKit2/Target.pri +++ b/Source/WebKit2/Target.pri @@ -866,6 +866,9 @@ have?(QTQUICK) { mac: { use?(QTKIT) { DEFINES += NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES + isEqual(QT_ARCH, "i386") { + DEFINES+=NS_BUILD_32_LIKE_64 + } INCLUDEPATH += \ $$PWD/../../WebKitLibraries/ HEADERS += \ |