Changeset 54814 in webkit


Ignore:
Timestamp:
Feb 16, 2010 2:27:03 AM (14 years ago)
Author:
Simon Hausmann
Message:

[Qt] Fix include paths for forwarding headers in standalone builds.

Patch by Jocelyn Turcotte <jocelyn.turcotte@nokia.com> on 2010-02-16
Reviewed by Simon Hausman.

  • Api/DerivedSources.pro: Use relative paths for package builds and added some

documentation.

Location:
trunk/WebKit/qt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKit/qt/Api/DerivedSources.pro

    r54714 r54814  
    3232
    3333for(HEADER, WEBKIT_API_HEADERS) {
     34    # 1. Append to QtWebKit header that includes all other header files
     35
    3436    qtheader_module.depends += $$HEADER
    3537    # Quotes need to be escaped once more when placed in eval()
     
    4042    HEADER_TARGET = "qtheader-$${HEADER_TARGET}"
    4143
     44    # 2. Create forwarding header files for qwebframe.h, etc.
     45    # Normally they contain absolute paths, for package builds we make the path relative so that
     46    # the package sources are relocatable.
     47
     48    PATH_TO_HEADER = $$HEADER
     49    CONFIG(standalone_package): PATH_TO_HEADER = ../../WebKit/qt/Api/$$basename(HEADER)
     50
    4251    eval($${HEADER_TARGET}.target = $${DESTDIR}/$${HEADER_NAME})
    4352    eval($${HEADER_TARGET}.depends = $$HEADER)
    44     eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$HEADER\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
     53    eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$PATH_TO_HEADER\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
    4554
    4655    QMAKE_EXTRA_TARGETS += $$HEADER_TARGET
     56
     57    # 3. Extract class names of exported classes from the headers and generate
     58    # the class name header files
    4759
    4860    src_words = $$cat($$HEADER)
  • trunk/WebKit/qt/ChangeLog

    r54775 r54814  
     12010-02-16  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
     2
     3        Reviewed by Simon Hausman.
     4
     5        [Qt] Fix include paths for forwarding headers in standalone builds.
     6
     7        * Api/DerivedSources.pro: Use relative paths for package builds and added some
     8        documentation.
     9
    1102010-02-15  Noam Rosenthal  <noam.rosenthal@nokia.com>
    211
Note: See TracChangeset for help on using the changeset viewer.