From 499a91bde837e57f6d16aa1cd9e07807c166db86 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 23 Mar 2015 17:40:59 +0530 Subject: [PATCH] Update build instructions for Qt 5.4 on windows --- setup/installer/windows/notes.rst | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst index edc62d014b..7f1e917424 100644 --- a/setup/installer/windows/notes.rst +++ b/setup/installer/windows/notes.rst @@ -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 :file:`qtwebkit/Tools/qmake/mkspecs/features/configure.prf` and remove build_webkit2. Edit qt.pro and comment out the addModule() lines for - qtxmlpatterns, qtdeclarative, qtquick1, qtwebsockets. 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))); - - + qtxmlpatterns, qtdeclarative, qtquick1, qttools, qtwebsockets, + qtwebengine. Change the addModule line for qtwebkit to depend on qtbase + instead of qtdeclarative. * 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