diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-31 14:48:24 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-31 14:48:24 (GMT) |
| commit | 51f56d93578be5021fe449da1165cf0c539343b9 (patch) | |
| tree | 80c17a55afb709fed6575bace76e424fe91414b8 /src/3rdparty/webkit/WebCore | |
| parent | 8a3eee2e2717f2f6ab3ee3223bf798450b9ef39c (diff) | |
| download | Qt-51f56d93578be5021fe449da1165cf0c539343b9.zip Qt-51f56d93578be5021fe449da1165cf0c539343b9.tar.gz Qt-51f56d93578be5021fe449da1165cf0c539343b9.tar.bz2 | |
Updated WebKit to c58dc2f491a824ac56e31c440fcf7fe16dab09c4
Integrate https://trac.webkit.org/changeset/60435 - [Qt] Escape backslashes in the .pro files by Ossi.
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 10 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index daf10fa..ff7d214 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2010-05-31 Oswald Buddenhagen <oswald.buddenhagen@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] Escape backslashes in the .pro files + + qmake in Qt 4.7 warns about unescaped backspaces and deprecates them. + + * WebCore.pro: + 2010-05-28 Antti Koivisto <koivisto@iki.fi> Reviewed by Kenneth Rohde Christiansen. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 5def728..63e78a7 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -159,7 +159,7 @@ defineTest(addExtraCompiler) { for(file,input) { base = $$basename(file) - base ~= s/\..+// + base ~= s/\\..+// newfile=$$replace(outputRule,\\$\\{QMAKE_FILE_BASE\\},$$base) SOURCES += $$newfile } |