summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2010-05-29 14:02:22 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2010-05-29 14:02:22 (GMT)
commite27032a8c5e759a0f7132dfbded5d5eeb9d0bbd3 (patch)
treee0b891cf94b1162645331702c52bb53372c8ab72 /src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
parentab8581692310db4d2786eeff21b0a8e024097d1c (diff)
downloadQt-e27032a8c5e759a0f7132dfbded5d5eeb9d0bbd3.zip
Qt-e27032a8c5e759a0f7132dfbded5d5eeb9d0bbd3.tar.gz
Qt-e27032a8c5e759a0f7132dfbded5d5eeb9d0bbd3.tar.bz2
Updated WebKit to eb07c6f9bd50d0d74e9ac19ade4a2fbd5cece7c7
Changes integrated: || <https://webkit.org/b/39488> || [Qt] QtTestBrowser is still called QtLauncher in the code || || <https://webkit.org/b/38722> || [Qt] qwebframe auto test doesn't compile || || <https://webkit.org/b/39491> || [Qt] QtTestBrowser has two graphicsview options that aren't enabled correctly || || <https://webkit.org/b/39063> || [Qt] Tiled backing store checker pattern does not paint correctly when scaling factor is not 1 || || <https://webkit.org/b/39217> || Add an optional "starting node' parameter to scrollRecursively and scrollOverflow of EventHandler || || <https://webkit.org/b/38389> || [Qt] Update the Symbian version for the user agent || || <https://webkit.org/b/35702> || [Qt] Add more support for InputTextController || || <https://webkit.org/b/39513> || [Qt] Using Accelerated Composing the rocket back animation on http://www.the-art-of-web.com/css/css-animation/ works differently as when not using AC. || || <https://webkit.org/b/39609> || [Qt] Running with accelerated compositing enabled sometimes result in a crash || Plus autotest fix.
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro')
-rw-r--r--src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro b/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
index 22d4c8d..389fb5f 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
+++ b/src/3rdparty/webkit/WebKit/qt/Api/DerivedSources.pro
@@ -28,7 +28,7 @@ qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}define QT_QTWEBKIT_MOD
qtheader_module.commands += echo $${QUOTE}$${LITERAL_HASH}include $${ESCAPE}<QtNetwork/QtNetwork$${ESCAPE}>$${QUOTE} >> $${qtheader_module.target} &&
WEBKIT_CLASS_HEADERS = $${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}$${LITERAL_DOLLAR}PWD/QtWebKit
-regex = ".*\\sclass\\sQWEBKIT_EXPORT\\s(\\w+)\\s(.*)"
+regex = ".*\sclass\sQWEBKIT_EXPORT\s(\w+)\s(.*)"
for(HEADER, WEBKIT_API_HEADERS) {
# 1. Append to QtWebKit header that includes all other header files
@@ -70,7 +70,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
res = $$find(src, $$regex)
isEmpty(res):break()
- exp = $$replace(src, $$regex, "EXPORTED_CLASS = \\1")
+ exp = $$replace(src, $$regex, "EXPORTED_CLASS = \1")
eval($$exp)
CLASS_TARGET = "qtheader_$${EXPORTED_CLASS}"
@@ -87,7 +87,7 @@ for(HEADER, WEBKIT_API_HEADERS) {
# Qt's QRegExp does not support inline non-greedy matching,
# so we'll have to work around it by updating the haystack
- src = $$replace(src, $$regex, "\\2")
+ src = $$replace(src, $$regex, "\2")
src_words = $$join(src, $${LITERAL_WHITESPACE})
}
}