[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:36 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 91c963e4e675f35ce0c40aa3618adc9e3918c417
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Feb 12 10:00:21 2010 +0000
[Qt] Minor fixes on QtWebKit headers generation.
- Adds QtWebKit to the generated headers destination path
- Improve compatibility with MinGW
Reviewed by Tor Arne Vestbo.
WebCore:
No new tests. (OOPS!)
* WebCore.pro:
WebKit\qt:
* Api/DerivedSources.pro:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54712 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0b901fa..d933994 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+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
+ - Improve compatibility with MinGW
+
+ * WebCore.pro:
+
2010-02-11 Fumitoshi Ukai <ukai at chromium.org>
Reviewed by Alexey Proskuryakov.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 976f795..5c17e1d 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2664,11 +2664,7 @@ SOURCES += \
}
}
-CONFIG(standalone_package) {
- include($$PWD/../include/headers.pri)
-} else {
- include($$OUTPUT_DIR/include/headers.pri)
-}
+include(../include/QtWebKit/headers.pri)
HEADERS += $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
@@ -2681,18 +2677,19 @@ headers.files = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS $$OUTPUT_DIR/include
headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
INSTALLS += headers
-!CONFIG(standalone_package) {
+# Qt will set the version for us when building in Qt's tree
+!CONFIG(QTDIR_build): VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
- VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
+win32-*|wince* {
+ DLLDESTDIR = $$OUTPUT_DIR/bin
+ TARGET = $$qtLibraryTarget($$TARGET)
- win32-*|wince* {
- DLLDESTDIR = $$OUTPUT_DIR/bin
- TARGET = $$qtLibraryTarget($$TARGET)
+ dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS]
+ dlltarget.CONFIG = no_path
+ INSTALLS += dlltarget
+}
- dlltarget.commands = $(COPY_FILE) $(DESTDIR)$(TARGET) $$[QT_INSTALL_BINS]
- dlltarget.CONFIG = no_path
- INSTALLS += dlltarget
- }
+!CONFIG(standalone_package) {
unix {
CONFIG += create_pc create_prl
diff --git a/WebKit/qt/Api/DerivedSources.pro b/WebKit/qt/Api/DerivedSources.pro
index e2ecd22..a03635a 100644
--- a/WebKit/qt/Api/DerivedSources.pro
+++ b/WebKit/qt/Api/DerivedSources.pro
@@ -27,28 +27,35 @@ WEBKIT_PRIVATE_HEADERS = $$PWD/qwebdatabase_p.h \
CONFIG -= debug_and_release
-DESTDIR = ../../../include
+DESTDIR = ../../../include/QtWebKit
-win32 {
- QUOTE = ""
+QUOTE = ""
+DOUBLE_ESCAPED_QUOTE = ""
+ESCAPE = ""
+win32-msvc*|symbian {
+ ESCAPE = "^"
+} else:win32-g++:isEmpty(QMAKE_SH) {
+ # MinGW's make will run makefile commands using sh, even if make
+ # was run from the Windows shell, if it finds sh in the path.
ESCAPE = "^"
} else {
- QUOTE = "\\\'"
- ESCAPE = ""
+ QUOTE = "\'"
+ DOUBLE_ESCAPED_QUOTE = "\\\'"
}
qtheader_module.target = $${DESTDIR}/QtWebKit
qtheader_module.depends = $${_PRO_FILE_}
-eval(qtheader_module.commands = echo $${QUOTE}\$${LITERAL_HASH}ifndef QT_QTWEBKIT_MODULE_H$${QUOTE} > $${qtheader_module.target} &&)
-eval(qtheader_module.commands += echo $${QUOTE}\$${LITERAL_HASH}define QT_QTWEBKIT_MODULE_H$${QUOTE} >> $${qtheader_module.target} &&)
-eval(qtheader_module.commands += echo $${QUOTE}\$${LITERAL_HASH}include $${ESCAPE}<QtNetwork/QtNetwork$${ESCAPE}>$${QUOTE} >> $${qtheader_module.target} &&)
+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
regex = ".*\sclass\sQWEBKIT_EXPORT\s(\w+)\s(.*)"
for(HEADER, WEBKIT_API_HEADERS) {
qtheader_module.depends += $$HEADER
- eval(qtheader_module.commands += echo $${QUOTE}\$${LITERAL_HASH}include \\\"$$basename(HEADER)\\\"$${QUOTE} >> $${qtheader_module.target} &&)
+ # 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} &&)
HEADER_NAME = $$basename(HEADER)
HEADER_TARGET = $$replace(HEADER_NAME, [^a-zA-Z0-9_], -)
@@ -56,7 +63,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
eval($${HEADER_TARGET}.target = $${DESTDIR}/$${HEADER_NAME})
eval($${HEADER_TARGET}.depends = $$HEADER)
- eval($${HEADER_TARGET}.commands = echo $${QUOTE}\$${LITERAL_HASH}include \\\"$$HEADER\\\"$${QUOTE} > $$eval($${HEADER_TARGET}.target))
+ eval($${HEADER_TARGET}.commands = echo $${DOUBLE_ESCAPED_QUOTE}\$${LITERAL_HASH}include \\\"$$HEADER\\\"$${DOUBLE_ESCAPED_QUOTE} > $$eval($${HEADER_TARGET}.target))
QMAKE_EXTRA_TARGETS += $$HEADER_TARGET
@@ -81,10 +88,10 @@ for(HEADER, WEBKIT_API_HEADERS) {
eval($${CLASS_TARGET}.target = $${DESTDIR}/$${EXPORTED_CLASS})
eval($${CLASS_TARGET}.depends = $$eval($${HEADER_TARGET}.target))
- eval($${CLASS_TARGET}.commands = echo $${QUOTE}\$${LITERAL_HASH}include \\\"$$basename(HEADER)\\\"$${QUOTE} > $$eval($${CLASS_TARGET}.target))
+ 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/$${EXPORTED_CLASS}
+ WEBKIT_CLASS_HEADERS += ../include/QtWebKit/$${EXPORTED_CLASS}
generated_files.depends += $$eval($${CLASS_TARGET}.target)
qtheader_pri.depends += $$eval($${CLASS_TARGET}.target)
@@ -96,14 +103,14 @@ for(HEADER, WEBKIT_API_HEADERS) {
}
}
-eval(qtheader_module.commands += echo $${QUOTE}\$${LITERAL_HASH}endif // QT_QTWEBKIT_MODULE_H$${QUOTE} >> $${qtheader_module.target})
+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_}
-eval(qtheader_pri.commands = echo $${QUOTE}WEBKIT_API_HEADERS = $${WEBKIT_API_HEADERS}$${QUOTE} > $${qtheader_pri.target} &&)
-eval(qtheader_pri.commands += echo $${QUOTE}WEBKIT_CLASS_HEADERS = $${WEBKIT_CLASS_HEADERS}$${QUOTE} >> $${qtheader_pri.target} &&)
-eval(qtheader_pri.commands += echo $${QUOTE}WEBKIT_PRIVATE_HEADERS = $${WEBKIT_PRIVATE_HEADERS}$${QUOTE} >> $${qtheader_pri.target})
+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}
QMAKE_EXTRA_TARGETS += qtheader_pri
generated_files.depends += $${qtheader_module.target} $${qtheader_pri.target}
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b618430..b81b9f5 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+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
+ - Improve compatibility with MinGW
+
+ * Api/DerivedSources.pro:
+
2010-02-09 Jocelyn Turcotte <jocelyn.turcotte at nokia.com>
Reviewed by nobody, build fix.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list