Changeset 148204 in webkit


Ignore:
Timestamp:
Apr 11, 2013 8:09:53 AM (11 years ago)
Author:
abecsi@webkit.org
Message:

[Qt][Mac] Linking fails with Qt 5.1
​https://bugs.webkit.org/show_bug.cgi?id=114435

Reviewed by Tor Arne Vestbø.

Qt 5.1 enables C++11 by default when using clang on Mac
and links against the libc++ standard library. As a result
building the QtWebKit shared library fails when linking
agains the ANGLE intermediate static library because libc++
misses some symbols needed by ANGLE.
Disable C++11 for the ANGLE intermediate library to fix the build.

  • ANGLE.pri:
Location:
trunk/Source/ThirdParty/ANGLE
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/ThirdParty/ANGLE/ANGLE.pri

    r139705 r148204  
    88SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/ThirdParty/ANGLE
    99
     10*clang: QT_CONFIG -= c++11
     11
    1012INCLUDEPATH += \
    1113    $$SOURCE_DIR/include/GLSLANG \

  • trunk/Source/ThirdParty/ANGLE/ChangeLog

    r148159 r148204  
     12013-04-11  Andras Becsi  <andras.becsi@digia.com>
     2
     3        [Qt][Mac] Linking fails with Qt 5.1
     4        https://bugs.webkit.org/show_bug.cgi?id=114435
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        Qt 5.1 enables C++11 by default when using clang on Mac
     9        and links against the libc++ standard library. As a result
     10        building the QtWebKit shared library fails when linking
     11        agains the ANGLE intermediate static library because libc++
     12        misses some symbols needed by ANGLE.
     13        Disable C++11 for the ANGLE intermediate library to fix the build.
     14
     15        * ANGLE.pri:
     16
    1172013-04-10  Benjamin Poulain  <bpoulain@apple.com>
    218
Note: See TracChangeset for help on using the changeset viewer.