Commit a65308cc authored by vestbo@webkit.org's avatar vestbo@webkit.org

[Qt] Fix generation of forwaring headers

Reviewed by Kenneth Rohde Christiansen.

The dependencies were a bit wrong, so we ended up not generating
forwarding headers for qwebkitversion.h and qwebkitglobal.h

The forwardning headers are now the only targets depending on the
real headers. All other targets either depend on the generated
class headers, or the forwarding headers.

* Api/DerivedSources.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55515 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 193c5f86
......@@ -32,8 +32,6 @@ regex = ".*\sclass\sQWEBKIT_EXPORT\s(\w+)\s(.*)"
for(HEADER, WEBKIT_API_HEADERS) {
# 1. Append to QtWebKit header that includes all other header files
qtheader_module.depends += $$HEADER
# Quotes need to be escaped once more when placed in eval()
eval(qtheader_module.commands += echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$basename(HEADER)\\\"$${DOUBLE_ESCAPED_QUOTE} >> $${qtheader_module.target} &&)
......@@ -53,6 +51,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$PATH_TO_HEADER\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
QMAKE_EXTRA_TARGETS += $$HEADER_TARGET
qtheader_module.depends += $$eval($${HEADER_TARGET}.target)
# 3. Extract class names of exported classes from the headers and generate
# the class name header files
......@@ -97,7 +96,7 @@ qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}endif // QT_QTWEBKIT_M
QMAKE_EXTRA_TARGETS += qtheader_module
qtheader_pri.target = $${DESTDIR}/classheaders.pri
qtheader_pri.depends = $${WEBKIT_API_HEADERS} $${_PRO_FILE_}
qtheader_pri.depends += $${_PRO_FILE_}
qtheader_pri.commands = echo $${QUOTE}WEBKIT_CLASS_HEADERS = $${WEBKIT_CLASS_HEADERS}$${QUOTE} > $${qtheader_pri.target}
QMAKE_EXTRA_TARGETS += qtheader_pri
......
2010-03-02 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Reviewed by Kenneth Rohde Christiansen.
[Qt] Fix generation of forwarding headers
The dependencies were a bit wrong, so we ended up not generating
forwarding headers for qwebkitversion.h and qwebkitglobal.h
The forwarding headers are now the only targets depending on the
real headers. All other targets either depend on the generated
class headers, or the forwarding headers.
* Api/DerivedSources.pro:
2010-03-02 Eric Uhrhane <ericu@chromium.org>
Reviewed by David Levin.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment