Changeset 89137 in webkit
- Timestamp:
- Jun 17, 2011 8:08:09 AM (13 years ago)
- Location:
- trunk/Source/WebKit/qt
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/qt/ChangeLog
r89019 r89137 1 2011-06-17 Alexis Menard <alexis.menard@openbossa.org> 2 3 Reviewed by Andreas Kling. 4 5 [Qt] Fix wrong framework generation on MacOS when inside Qt 4.8. 6 https://bugs.webkit.org/show_bug.cgi?id=62815 7 8 Partially revert r85870 which assumed that QtWebKit will never be build inside Qt 9 anymore. Everything inside !QTDIR_build condition is not needed in the Qt tree because 10 qbase.pri is doing the job for us, i.e. using includes generated by syncqt to 11 setup the mac framework. It also use a correct QMAKE_LFLAGS_SONAME making possible 12 to actually run an application linked against QtWebKit. 13 14 * QtWebKit.pro: 15 1 16 2011-06-16 Sheriff Bot <webkit.review.bot@gmail.com> 2 17 -
trunk/Source/WebKit/qt/QtWebKit.pro
r88455 r89137 305 305 } 306 306 307 exists($$OUTPUT_DIR/include/QtWebKit/classheaders.pri): include($$OUTPUT_DIR/include/QtWebKit/classheaders.pri) 308 WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS 309 310 !symbian-abld:!symbian-sbsv2 { 311 headers.files = $$WEBKIT_INSTALL_HEADERS 312 313 !isEmpty(INSTALL_HEADERS): headers.path = $$INSTALL_HEADERS/QtWebKit 314 else: headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit 315 316 !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS 317 else: target.path = $$[QT_INSTALL_LIBS] 318 319 INSTALLS += target headers 320 } else { 321 # INSTALLS is not implemented in qmake's mmp generators, copy headers manually 322 inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} 323 inst_headers.input = WEBKIT_INSTALL_HEADERS 324 inst_headers.CONFIG = no_clean 325 326 !isEmpty(INSTALL_HEADERS): inst_headers.output = $$INSTALL_HEADERS/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} 327 else: inst_headers.output = $$[QT_INSTALL_HEADERS]/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} 328 329 QMAKE_EXTRA_COMPILERS += inst_headers 330 331 install.depends += compiler_inst_headers_make_all 332 } 333 334 unix { 335 CONFIG += create_pc create_prl 336 QMAKE_PKGCONFIG_LIBDIR = $$target.path 337 QMAKE_PKGCONFIG_INCDIR = $$headers.path 338 QMAKE_PKGCONFIG_DESTDIR = pkgconfig 339 lib_replace.match = $$re_escape($$DESTDIR) 340 lib_replace.replace = $$[QT_INSTALL_LIBS] 341 QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace 342 } 343 344 mac { 345 !static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) { 346 !build_pass { 347 message("Building QtWebKit as a framework, as that's how Qt was built. You can") 348 message("override this by passing CONFIG+=webkit_no_framework to build-webkit.") 349 350 CONFIG += build_all 351 } else { 352 isEmpty(QT_SOURCE_TREE):debug_and_release:TARGET = $$qtLibraryTarget($$TARGET) 307 !CONFIG(QTDIR_build) { 308 exists($$OUTPUT_DIR/include/QtWebKit/classheaders.pri): include($$OUTPUT_DIR/include/QtWebKit/classheaders.pri) 309 WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS 310 311 !symbian-abld:!symbian-sbsv2 { 312 headers.files = $$WEBKIT_INSTALL_HEADERS 313 314 !isEmpty(INSTALL_HEADERS): headers.path = $$INSTALL_HEADERS/QtWebKit 315 else: headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit 316 317 !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS 318 else: target.path = $$[QT_INSTALL_LIBS] 319 320 INSTALLS += target headers 321 } else { 322 # INSTALLS is not implemented in qmake's mmp generators, copy headers manually 323 inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT} 324 inst_headers.input = WEBKIT_INSTALL_HEADERS 325 inst_headers.CONFIG = no_clean 326 327 !isEmpty(INSTALL_HEADERS): inst_headers.output = $$INSTALL_HEADERS/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} 328 else: inst_headers.output = $$[QT_INSTALL_HEADERS]/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT} 329 330 QMAKE_EXTRA_COMPILERS += inst_headers 331 332 install.depends += compiler_inst_headers_make_all 333 } 334 335 unix { 336 CONFIG += create_pc create_prl 337 QMAKE_PKGCONFIG_LIBDIR = $$target.path 338 QMAKE_PKGCONFIG_INCDIR = $$headers.path 339 QMAKE_PKGCONFIG_DESTDIR = pkgconfig 340 lib_replace.match = $$re_escape($$DESTDIR) 341 lib_replace.replace = $$[QT_INSTALL_LIBS] 342 QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace 343 } 344 345 mac { 346 !static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) { 347 !build_pass { 348 message("Building QtWebKit as a framework, as that's how Qt was built. You can") 349 message("override this by passing CONFIG+=webkit_no_framework to build-webkit.") 350 351 CONFIG += build_all 352 } else { 353 isEmpty(QT_SOURCE_TREE):debug_and_release:TARGET = $$qtLibraryTarget($$TARGET) 354 } 355 356 CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework 357 FRAMEWORK_HEADERS.version = Versions 358 FRAMEWORK_HEADERS.files = $${headers.files} 359 FRAMEWORK_HEADERS.path = Headers 360 QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS 353 361 } 354 362 355 CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework 356 FRAMEWORK_HEADERS.version = Versions 357 FRAMEWORK_HEADERS.files = $${headers.files} 358 FRAMEWORK_HEADERS.path = Headers 359 QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS 360 } 361 362 QMAKE_LFLAGS_SONAME = "$${QMAKE_LFLAGS_SONAME}$${DESTDIR}$${QMAKE_DIR_SEP}" 363 QMAKE_LFLAGS_SONAME = "$${QMAKE_LFLAGS_SONAME}$${DESTDIR}$${QMAKE_DIR_SEP}" 364 } 363 365 } 364 366
Note: See TracChangeset
for help on using the changeset viewer.