Changeset 140029 in webkit


Ignore:
Timestamp:
Jan 17, 2013, 12:40:39 PM (13 years ago)
Author:
commit-queue@webkit.org
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 <​psytonx@gmail.com> on 2013-01-17
Reviewed by Benjamin Poulain.

  • Target.pri:

Source/WebKit:

Patch by Poul Sysolyatin <​psytonx@gmail.com> on 2013-01-17
Reviewed by Benjamin Poulain.

  • WebKit1.pro:

Source/WebKit2:

Patch by Poul Sysolyatin <​psytonx@gmail.com> on 2013-01-17
Reviewed by Benjamin Poulain.

  • Target.pri:
Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r140027 r140029  
     12013-01-17  Poul Sysolyatin  <psytonx@gmail.com>
     2
     3        32-bit build for Qt5 on Mac OS fails.
     4        https://bugs.webkit.org/show_bug.cgi?id=107094
     5
     6        We need to define NS_BUILD_32_LIKE_64 for 32-bit build for Mac OS.
     7        Fixed 32-bit build detection for support Qt5.
     8
     9        Reviewed by Benjamin Poulain.
     10 
     11        * Target.pri:
     12
    1132013-01-17  Joshua Bell  <jsbell@chromium.org>
    214

  • trunk/Source/WebCore/Target.pri

    r139950 r140029  
    33163316
    33173317        DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    3318         contains(CONFIG, "x86") {
     3318        isEqual(QT_ARCH, "i386") {
    33193319            DEFINES+=NS_BUILD_32_LIKE_64
    33203320        }

  • trunk/Source/WebKit/ChangeLog

    r139702 r140029  
     12013-01-17  Poul Sysolyatin  <psytonx@gmail.com>
     2
     3        32-bit build for Qt5 on Mac OS fails.
     4        https://bugs.webkit.org/show_bug.cgi?id=107094
     5
     6        We need to define NS_BUILD_32_LIKE_64 for 32-bit build for Mac OS.
     7        Fixed 32-bit build detection for support Qt5.
     8
     9        Reviewed by Benjamin Poulain.
     10
     11        * WebKit1.pro:
     12
    1132013-01-14  Dean Jackson  <dino@apple.com>
    214

  • trunk/Source/WebKit/WebKit1.pro

    r136461 r140029  
    128128
    129129        DEFINES += NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    130 
    131         contains(CONFIG, "x86") {
     130        isEqual(QT_ARCH, "i386") {
    132131            DEFINES+=NS_BUILD_32_LIKE_64
    133132        }

  • trunk/Source/WebKit2/ChangeLog

    r140021 r140029  
     12013-01-17  Poul Sysolyatin  <psytonx@gmail.com>
     2
     3        32-bit build for Qt5 on Mac OS fails.
     4        https://bugs.webkit.org/show_bug.cgi?id=107094
     5
     6        We need to define NS_BUILD_32_LIKE_64 for 32-bit build for Mac OS.
     7        Fixed 32-bit build detection for support Qt5.
     8
     9        Reviewed by Benjamin Poulain.
     10
     11        * Target.pri:
     12
    1132013-01-17  Martin Robinson  <mrobinson@igalia.com>
    214

  • trunk/Source/WebKit2/Target.pri

    r138881 r140029  
    885885    use?(QTKIT) {
    886886        DEFINES += NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
     887        isEqual(QT_ARCH, "i386") {
     888            DEFINES+=NS_BUILD_32_LIKE_64
     889        }
    887890        INCLUDEPATH += \
    888891            $$PWD/../../WebKitLibraries/
Note: See TracChangeset for help on using the changeset viewer.