Ticket #40852: patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff

File patch-src_3rdparty_webkit_Source_WebKit_qt_QtWebKit.pro.diff, 1.5 KB (added by BSeppke (Benjamin Seppke), 8 years ago)

WebKit and Mac OS X 10.9 patch

  • src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro

    old new  
    233233                       $$SOURCE_DIR/../WebKitLibraries/
    234234
    235235        DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
    236         contains(CONFIG, "x86") {
     236        contains(CONFIG, "x86")|contains(CONFIG, "ppc") {
    237237            DEFINES+=NS_BUILD_32_LIKE_64
    238238        }
    239239
     
    255255            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
    256256        } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, ".*MacOSX10.8.sdk") {
    257257            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
     258        } else: equals(DARWIN_MAJOR_VERSION, "13") | contains(QMAKE_MAC_SDK, ".*MacOSX10.9.sdk") {
     259            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceMavericks.a
    258260        }
    259261    }
    260262}
     
    297299
    298300!symbian-abld:!symbian-sbsv2 {
    299301    modfile.files = $$moduleFile
    300     modfile.path = $$[QMAKE_MKSPECS]/modules
     302    modfile.path = $$[QT_INSTALL_DATA]/mkspecs/modules
    301303
    302304    INSTALLS += modfile
    303305} else {
     
    305307
    306308    inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
    307309    inst_modfile.input = moduleFile
    308     inst_modfile.output = $$[QMAKE_MKSPECS]/modules
     310    inst_modfile.output = $$[QT_INSTALL_DATA]/mkspecs/modules
    309311    inst_modfile.CONFIG = no_clean
    310312
    311313    QMAKE_EXTRA_COMPILERS += inst_modfile