Mercurial Repositories > eric / changeset
changeset
Set the format of the data stream used to save information explicitly to ensure compatibility of the resulting file with Qt 5.0.
Wed, 03 Oct 2012 16:38:44 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 03 Oct 2012 16:38:44 +0200
- branch
- 5_2_x
- changeset 2096
- 63205cd717b5
- parent 2093
- 060d051757a2
- child 2098
- b5dbf1a6c9ff
Set the format of the data stream used to save information explicitly to ensure compatibility of the resulting file with Qt 5.0.
(grafted from 5bf2d8a73173bda97a4f1c95156b9a815b21f5b8)
--- a/E5Gui/E5SideBar.py Wed Oct 03 15:34:18 2012 +0200 +++ b/E5Gui/E5SideBar.py Wed Oct 03 16:38:44 2012 +0200 @@ -492,6 +492,7 @@ data = QByteArray() stream = QDataStream(data, QIODevice.WriteOnly) + stream.setVersion(QDataStream.Qt_4_6) stream.writeUInt16(self.Version) stream.writeBool(self.__minimized) @@ -524,6 +525,7 @@ data = QByteArray(state) stream = QDataStream(data, QIODevice.ReadOnly) + stream.setVersion(QDataStream.Qt_4_6) stream.readUInt16() # version minimized = stream.readBool()
--- a/E5Gui/E5ToolBarManager.py Wed Oct 03 15:34:18 2012 +0200 +++ b/E5Gui/E5ToolBarManager.py Wed Oct 03 16:38:44 2012 +0200 @@ -444,6 +444,7 @@ """ data = QByteArray() stream = QDataStream(data, QIODevice.WriteOnly) + stream.setVersion(QDataStream.Qt_4_6) stream.writeUInt16(E5ToolBarManager.VersionMarker) stream.writeUInt16(version) @@ -499,6 +500,7 @@ data = QByteArray(state) stream = QDataStream(data, QIODevice.ReadOnly) + stream.setVersion(QDataStream.Qt_4_6) marker = stream.readUInt16() vers = stream.readUInt16() if marker != E5ToolBarManager.VersionMarker or vers != version:
--- a/Helpviewer/CookieJar/CookieJar.py Wed Oct 03 15:34:18 2012 +0200 +++ b/Helpviewer/CookieJar/CookieJar.py Wed Oct 03 16:38:44 2012 +0200 @@ -65,6 +65,7 @@ """ data = QByteArray() stream = QDataStream(data, QIODevice.WriteOnly) + stream.setVersion(QDataStream.Qt_4_6) stream.writeUInt16(self.JAR_VERSION) stream.writeUInt32(len(cookiesList)) for cookie in cookiesList: @@ -85,6 +86,7 @@ cookiesList = [] data = QByteArray(cookies) stream = QDataStream(data, QIODevice.ReadOnly) + stream.setVersion(QDataStream.Qt_4_6) version = stream.readUInt16() if version != self.JAR_VERSION:
--- a/Helpviewer/History/HistoryManager.py Wed Oct 03 15:34:18 2012 +0200 +++ b/Helpviewer/History/HistoryManager.py Wed Oct 03 16:38:44 2012 +0200 @@ -354,6 +354,7 @@ lastInsertedItem = HistoryEntry() data = QByteArray(historyFile.readAll()) stream = QDataStream(data, QIODevice.ReadOnly) + stream.setVersion(QDataStream.Qt_4_6) while not stream.atEnd(): ver = stream.readUInt32() if ver != HISTORY_VERSION: @@ -427,6 +428,7 @@ for index in range(first, -1, -1): data = QByteArray() stream = QDataStream(data, QIODevice.WriteOnly) + stream.setVersion(QDataStream.Qt_4_6) itm = self.__history[index] stream.writeUInt32(HISTORY_VERSION) stream.writeString(itm.url.encode())
