Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update build instructions for Qt 5.4 on windows

Browse Source
This commit is contained in:
Kovid Goyal 2015-03-23 17:40:59 +05:30
parent a005cc5f56
commit 499a91bde8
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
setup/installer/windows/notes.rst
View File

@ -492,23 +492,9 @@ Download Qt sourcecode (.zip) from: http://download.qt-project.org/official_rele
* Slim down Qt by not building various things we dont need. Edit * Slim down Qt by not building various things we dont need. Edit
:file:`qtwebkit/Tools/qmake/mkspecs/features/configure.prf` and remove :file:`qtwebkit/Tools/qmake/mkspecs/features/configure.prf` and remove
build_webkit2. Edit qt.pro and comment out the addModule() lines for build_webkit2. Edit qt.pro and comment out the addModule() lines for
qtxmlpatterns, qtdeclarative, qtquick1, qtwebsockets. Change the qtxmlpatterns, qtdeclarative, qtquick1, qttools, qtwebsockets,
addModule line for qtwebkit to depend on qtbase instead of qtdeclarative. qtwebengine. Change the addModule line for qtwebkit to depend on qtbase
instead of qtdeclarative.
* Patch to fix soft hyphen rendering in viewer (https://bugreports.qt-project.org/browse/QTBUG-40912):
--- qtwebkit/Source/WebCore/platform/graphics/WidthIterator.cpp
+++ qtwebkit/Source/WebCore/platform/graphics/WidthIterator.cpp
@@ -265,7 +265,7 @@ inline unsigned WidthIterator::advanceInternal(TextIterator& textIterator, Glyph
m_isAfterExpansion = false;
}
- if (shouldApplyFontTransforms() && glyphBuffer && Font::treatAsSpace(character))
+ if (shouldApplyFontTransforms() && glyphBuffer && (Font::treatAsSpace(character) || Font::treatAsZeroWidthSpace(character)))
charactersTreatedAsSpace.append(make_pair(glyphBuffer->size(),
OriginalAdvancesForCharacterTreatedAsSpace(character == ' ', glyphBuffer->size() ? glyphBuffer->advanceAt(glyphBuffer->size() - 1).width() : 0, width)));
* Qt uses its own routine to locate and load "system libraries" including * Qt uses its own routine to locate and load "system libraries" including
the openssl libraries needed for "Get Books". This means that we have to the openssl libraries needed for "Get Books". This means that we have to