浏览代码

update to the latest Qt to fix multiple issues

fixes #1539 via wkhtmltopdf/qt@5a8d870c018db33ee63dad821a260939e1b2fbd0
fixes #1638 via wkhtmltopdf/qt@b18df9fc8cd717e43cab87f7b295c4cb2fc39704
fixes #1722 via wkhtmltopdf/qt@7683bbb8c60f595d44692e34f79e3e359580b3bf

also sync the changelog with latest changes
Ashish Kulkarni 11 年之前
父节点
当前提交
200b9a60f0
共有 2 个文件被更改,包括 7 次插入1 次删除
  1. 6 0
      CHANGELOG.md
  2. 1 1
      qt

+ 6 - 0
CHANGELOG.md

@@ -1,10 +1,16 @@
 v0.12.2 (unreleased)
 --------------------
+* use OpenSSL 1.0.1j for the Windows builds
+* fix build failure with unpatched Qt >= 5.3
+* **#1539**: using OpenType fonts now results in selectable text on Windows
+* **#1638**: fix incorrect rendering of JPEG images on Windows Server 2008 x64
 * **#1676**: do not allow overriding the header/footer settings for cover pages
 * **#1676**: set page margins correctly via computed header/footer heights for multiple URLs
 * **#1758**: fix corrupt image when output is specified as "-" in wkhtmltoimage on Windows
+* **#1722**: fix broken hyphenation with soft-hyphens (­)
 * **#1772**: added variable 'isodate' for substitution in headers/footers
 * **#1808**: fix [sitepage] and [sitepages] not working without HTML headers/footers
+* **#1955**: installer does not work on 32-bit OS X (10.6.x or 10.7.x)
 
 v0.12.1 (2014-06-26)
 --------------------

+ 1 - 1
qt

@@ -1 +1 @@
-Subproject commit 82b568bd2e1dfb76208128e682fe0ade392e48d4
+Subproject commit 7683bbb8c60f595d44692e34f79e3e359580b3bf