diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-13 14:19:29 (GMT) |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@nokia.com> | 2010-04-13 14:20:55 (GMT) |
| commit | a43df009713c7df7b19336db5cee8306da62d186 (patch) | |
| tree | 5a3650f2c73f0831a100f6f7993211ad4cb87d30 /src/3rdparty/webkit/WebKit | |
| parent | 9af4c9174b507b9e56c95a196683b1f3a59cce90 (diff) | |
| download | Qt-a43df009713c7df7b19336db5cee8306da62d186.zip Qt-a43df009713c7df7b19336db5cee8306da62d186.tar.gz Qt-a43df009713c7df7b19336db5cee8306da62d186.tar.bz2 | |
QtWebKit: Fix the QWebHistory serialization auto-test
This patch should be overwritten by the next WebKit import.
Reviewed-by: Kent Hansen
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp index d852012..61ec9d2 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebhistory.cpp @@ -33,7 +33,7 @@ enum { InitialHistoryVersion = 1, - DefaultHistoryVersion = InitialHistoryVersion + DefaultHistoryVersion = 2 }; /*! @@ -524,7 +524,7 @@ QDataStream& operator>>(QDataStream& source, QWebHistory& history) source >> version; - if (version == 1) { + if (version <= 2) { int count; int currentIndex; source >> count >> currentIndex; |