diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-01 13:32:57 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-06-01 13:32:57 (GMT) |
| commit | f370fa5c6758cdce3c161de94888ed1d05ae2c9f (patch) | |
| tree | bd5edee4afc03c7bd9a5969ca8197b1f0122b1ae /src/3rdparty/webkit/WebKit | |
| parent | c9bb16f0b34f180bf955682ab31fc1ff63d5de84 (diff) | |
| download | Qt-f370fa5c6758cdce3c161de94888ed1d05ae2c9f.zip Qt-f370fa5c6758cdce3c161de94888ed1d05ae2c9f.tar.gz Qt-f370fa5c6758cdce3c161de94888ed1d05ae2c9f.tar.bz2 | |
Updated WebKit to f59a934694947496cedecc5256a71bff60c43c4c
Integrated changes:
|| <https://webkit.org/b/36826> || [Qt] QtWebkit.pc is broken ||
Plus a fix for the installation/setup of qt_webkit_version.pri
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/ChangeLog | 8 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri (renamed from src/3rdparty/webkit/WebKit/qt/qtwebkit_version.pri) | 0 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index b6cbf92..39f2cf3 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,11 @@ +2010-06-01 Simon Hausmann <simon.hausmann@nokia.com> + + Reviewed by Laszlo Gombos. + + [Qt] Rename versioning .pri file to what Qt's mkspecs/features/qt.pri expects. + + * qt_webkit_version.pri: Renamed from WebKit/qt/qtwebkit_version.pri. + 2010-05-31 Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed by Simon Hausmann. diff --git a/src/3rdparty/webkit/WebKit/qt/qtwebkit_version.pri b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri index ffd192c..ffd192c 100644 --- a/src/3rdparty/webkit/WebKit/qt/qtwebkit_version.pri +++ b/src/3rdparty/webkit/WebKit/qt/qt_webkit_version.pri |