Merged remote changes. 5_2_x

Sat, 14 Apr 2012 12:03:40 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Sat, 14 Apr 2012 12:03:40 +0200
branch
5_2_x
changeset 1788
6cde0ffb2667
parent 1787
01e2b040d2ba (diff)
parent 1786
27dab28b0482 (current diff)
child 1790
1155fb831ae2

Merged remote changes.

--- a/Project/Project.py	Fri Apr 13 19:16:01 2012 +0200
+++ b/Project/Project.py	Sat Apr 14 12:03:40 2012 +0200
@@ -660,7 +660,8 @@
             # create hash value, if it doesn't have one
             if not self.pdata["HASH"][0]:
                 hash = str(QCryptographicHash.hash(
-                    QByteArray(self.ppath), QCryptographicHash.Sha1).toHex(),
+                    QByteArray(self.ppath.encode("utf-8")),
+                    QCryptographicHash.Sha1).toHex(),
                     encoding="utf-8")
                 self.pdata["HASH"] = [hash]
                 self.setDirty(True)

eric ide

mercurial