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), 11 years ago) |
---|
-
src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
old new 233 233 $$SOURCE_DIR/../WebKitLibraries/ 234 234 235 235 DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES 236 contains(CONFIG, "x86") {236 contains(CONFIG, "x86")|contains(CONFIG, "ppc") { 237 237 DEFINES+=NS_BUILD_32_LIKE_64 238 238 } 239 239 … … 255 255 LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a 256 256 } else: equals(DARWIN_MAJOR_VERSION, "12") | contains(QMAKE_MAC_SDK, ".*MacOSX10.8.sdk") { 257 257 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 258 260 } 259 261 } 260 262 } … … 297 299 298 300 !symbian-abld:!symbian-sbsv2 { 299 301 modfile.files = $$moduleFile 300 modfile.path = $$[Q MAKE_MKSPECS]/modules302 modfile.path = $$[QT_INSTALL_DATA]/mkspecs/modules 301 303 302 304 INSTALLS += modfile 303 305 } else { … … 305 307 306 308 inst_modfile.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} 307 309 inst_modfile.input = moduleFile 308 inst_modfile.output = $$[Q MAKE_MKSPECS]/modules310 inst_modfile.output = $$[QT_INSTALL_DATA]/mkspecs/modules 309 311 inst_modfile.CONFIG = no_clean 310 312 311 313 QMAKE_EXTRA_COMPILERS += inst_modfile