diff --git a/installer/windows/freeze.py b/installer/windows/freeze.py index ae5b503be7..8e9d315807 100644 --- a/installer/windows/freeze.py +++ b/installer/windows/freeze.py @@ -6,7 +6,7 @@ __docformat__ = 'restructuredtext en' ''' Freeze app into executable using py2exe. ''' -QT_DIR = 'C:\\Qt\\4.4.3' +QT_DIR = 'C:\\Qt\\4.5.1' LIBUSB_DIR = 'C:\\libusb' LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll' PDFTOHTML = 'C:\\cygwin\\home\\kovid\\poppler-0.10.6\\rel\\pdftohtml.exe' diff --git a/src/calibre/ebooks/lit/writer.py b/src/calibre/ebooks/lit/writer.py index a3ab345c0a..86d10965a4 100644 --- a/src/calibre/ebooks/lit/writer.py +++ b/src/calibre/ebooks/lit/writer.py @@ -475,7 +475,7 @@ class LitWriter(object): elif isinstance(data, unicode): data = data.encode('utf-8') elif hasattr(data, 'cssText'): - data = str(data) + data = str(item) self._add_file(name, data, secnum) item.size = len(data)