[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
jocelyn.turcotte at nokia.com
jocelyn.turcotte at nokia.com
Fri Feb 26 22:18:37 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 0c057df8b62b5e0b614eca98989f5b9528ef80cf
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 12 10:01:49 2010 +0000
[Qt] Ensure relative paths in generated .pri files to ensure that
a source package with pre-generated derived sources can be compiled.
- Re-add a separate headers.pri file for WEBKIT_API_HEADERS
- Rename the generated headers.pri to classheaders.pri to avoid
confusion with the one generated by synqt since they don't have the
same content.
- Remove private headers list variable from classheaders.pri
- Use $$PWD in classheaders.pri
- Remove classheaders.pri from the installed files
Reviewed by Tor Arne Vestbo.
WebCore:
* WebCore.pro:
WebKit\qt:
* Api/DerivedSources.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54714 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 72fb468..596b63e 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,23 @@
Reviewed by Tor Arne Vestbø.
+ [Qt] Ensure relative paths in generated .pri files to ensure that
+ a source package with pre-generated derived sources can be compiled.
+
+ - Re-add a separate headers.pri file for WEBKIT_API_HEADERS
+ - Rename the generated headers.pri to classheaders.pri to avoid
+ confusion with the one generated by synqt since they don't have the
+ same content.
+ - Remove private headers list variable from classheaders.pri
+ - Use $$PWD in classheaders.pri
+ - Remove classheaders.pri from the installed files
+
+ * WebCore.pro:
+
+2010-02-10 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
[Qt] Manually add support for the install target on Symbian.
This is required to copy the headers over the ones in Qt.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 720c26b..eb6f1df 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2664,9 +2664,10 @@ SOURCES += \
}
}
-include(../include/QtWebKit/headers.pri)
+include($$PWD/../WebKit/qt/Api/headers.pri)
+include(../include/QtWebKit/classheaders.pri)
HEADERS += $$WEBKIT_API_HEADERS
-WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS $$OUTPUT_DIR/include/headers.pri
+WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
!symbian {
headers.files = $$WEBKIT_INSTALL_HEADERS
diff --git a/WebKit/qt/Api/DerivedSources.pro b/WebKit/qt/Api/DerivedSources.pro
index a03635a..8702fde 100644
--- a/WebKit/qt/Api/DerivedSources.pro
+++ b/WebKit/qt/Api/DerivedSources.pro
@@ -1,29 +1,7 @@
TEMPLATE = lib
TARGET = dummy
-WEBKIT_API_HEADERS = $$PWD/qwebframe.h \
- $$PWD/qgraphicswebview.h \
- $$PWD/qwebkitglobal.h \
- $$PWD/qwebpage.h \
- $$PWD/qwebview.h \
- $$PWD/qwebsettings.h \
- $$PWD/qwebhistoryinterface.h \
- $$PWD/qwebdatabase.h \
- $$PWD/qwebsecurityorigin.h \
- $$PWD/qwebelement.h \
- $$PWD/qwebpluginfactory.h \
- $$PWD/qwebhistory.h \
- $$PWD/qwebinspector.h \
- $$PWD/qwebkitversion.h
-
-WEBKIT_PRIVATE_HEADERS = $$PWD/qwebdatabase_p.h \
- $$PWD/qwebframe_p.h \
- $$PWD/qwebhistory_p.h \
- $$PWD/qwebinspector_p.h \
- $$PWD/qwebpage_p.h \
- $$PWD/qwebplugindatabase_p.h \
- $$PWD/qwebsecurityorigin_p.h
-
+include(headers.pri)
CONFIG -= debug_and_release
@@ -48,7 +26,7 @@ qtheader_module.depends = $${_PRO_FILE_}
qtheader_module.commands = echo $${QUOTE}$${LITERAL_HASH}ifndef QT_QTWEBKIT_MODULE_H$${QUOTE} > $${qtheader_module.target} &&
qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}define QT_QTWEBKIT_MODULE_H$${QUOTE} >> $${qtheader_module.target} &&
qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}include $${ESCAPE}<QtNetwork/QtNetwork$${ESCAPE}>$${QUOTE} >> $${qtheader_module.target} &&
-WEBKIT_CLASS_HEADERS = ../include/QtWebKit
+WEBKIT_CLASS_HEADERS = $${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}PWD/QtWebKit
regex = ".*\sclass\sQWEBKIT_EXPORT\s(\w+)\s(.*)"
@@ -91,7 +69,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
eval($${CLASS_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$basename(HEADER)\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${CLASS_TARGET}.target))
QMAKE_EXTRA_TARGETS += $$CLASS_TARGET
- WEBKIT_CLASS_HEADERS += ../include/QtWebKit/$${EXPORTED_CLASS}
+ WEBKIT_CLASS_HEADERS += $${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}PWD/$${EXPORTED_CLASS}
generated_files.depends += $$eval($${CLASS_TARGET}.target)
qtheader_pri.depends += $$eval($${CLASS_TARGET}.target)
@@ -106,11 +84,9 @@ for(HEADER, WEBKIT_API_HEADERS) {
qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}endif // QT_QTWEBKIT_MODULE_H$${QUOTE} >> $${qtheader_module.target}
QMAKE_EXTRA_TARGETS += qtheader_module
-qtheader_pri.target = $${DESTDIR}/headers.pri
-qtheader_pri.depends = $${WEBKIT_API_HEADERS} $${WEBKIT_PRIVATE_HEADERS} $${_PRO_FILE_}
-qtheader_pri.commands = echo $${QUOTE}WEBKIT_API_HEADERS = $${WEBKIT_API_HEADERS}$${QUOTE} > $${qtheader_pri.target} &&
-qtheader_pri.commands += echo $${QUOTE}WEBKIT_CLASS_HEADERS = $${WEBKIT_CLASS_HEADERS}$${QUOTE} > $${qtheader_pri.target} &&
-qtheader_pri.commands += echo $${QUOTE}WEBKIT_PRIVATE_HEADERS = $${WEBKIT_PRIVATE_HEADERS}$${QUOTE} >> $${qtheader_pri.target}
+qtheader_pri.target = $${DESTDIR}/classheaders.pri
+qtheader_pri.depends = $${WEBKIT_API_HEADERS} $${_PRO_FILE_}
+qtheader_pri.commands = echo $${QUOTE}WEBKIT_CLASS_HEADERS = $${WEBKIT_CLASS_HEADERS}$${QUOTE} > $${qtheader_pri.target}
QMAKE_EXTRA_TARGETS += qtheader_pri
generated_files.depends += $${qtheader_module.target} $${qtheader_pri.target}
diff --git a/WebKit/qt/Api/headers.pri b/WebKit/qt/Api/headers.pri
new file mode 100644
index 0000000..1a42597
--- /dev/null
+++ b/WebKit/qt/Api/headers.pri
@@ -0,0 +1,14 @@
+WEBKIT_API_HEADERS = $$PWD/qwebframe.h \
+ $$PWD/qgraphicswebview.h \
+ $$PWD/qwebkitglobal.h \
+ $$PWD/qwebpage.h \
+ $$PWD/qwebview.h \
+ $$PWD/qwebsettings.h \
+ $$PWD/qwebhistoryinterface.h \
+ $$PWD/qwebdatabase.h \
+ $$PWD/qwebsecurityorigin.h \
+ $$PWD/qwebelement.h \
+ $$PWD/qwebpluginfactory.h \
+ $$PWD/qwebhistory.h \
+ $$PWD/qwebinspector.h \
+ $$PWD/qwebkitversion.h
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b81b9f5..5b8545b 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,23 @@
Reviewed by Tor Arne Vestbø.
+ [Qt] Ensure relative paths in generated .pri files to ensure that
+ a source package with pre-generated derived sources can be compiled.
+
+ - Re-add a separate headers.pri file for WEBKIT_API_HEADERS
+ - Rename the generated headers.pri to classheaders.pri to avoid
+ confusion with the one generated by synqt since they don't have the
+ same content.
+ - Remove private headers list variable from classheaders.pri
+ - Use $$PWD in classheaders.pri
+ - Remove classheaders.pri from the installed files
+
+ * Api/DerivedSources.pro:
+
+2010-02-10 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
[Qt] Minor fixes on QtWebKit headers generation.
- Adds QtWebKit to the generated headers destination path
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list