kotatogram/kotatogram-desktop
kotatogram/kotatogram-desktop
1
0
Fork 0
Code Issues Releases 45 Packages Wiki Activity

Moving to Qt 5.6.2, Xcode build tested.

Browse source
This commit is contained in:
John Preston 2016-10-17 22:24:03 +03:00
parent fd6a312abc
commit 48fde28484
3 changed files with 12140 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Telegram/Patches/qtbase_5_3_2.diff
View file

@ -93,7 +93,7 @@ index ebff950..4300ca4 100644
// Make sure we're inside the viewport. // Make sure we're inside the viewport.
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 4879ae5..3251354 100644 index 4879ae5..56cdcba 100644
--- a/src/gui/text/qtextlayout.cpp --- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp
@@ -654,6 +654,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const @@ -654,6 +654,9 @@ int QTextLayout::nextCursorPosition(int oldPos, CursorMode mode) const
@ -128,7 +128,7 @@ index 4879ae5..3251354 100644
QFixed minw; QFixed minw;
QFixed softHyphenWidth; QFixed softHyphenWidth;
QFixed rightBearing; QFixed rightBearing;
@@ -1634,13 +1641,17 @@ namespace { @@ -1634,13 +1641,19 @@ namespace {
if (currentPosition > 0 && if (currentPosition > 0 &&
logClusters[currentPosition - 1] < glyphs.numGlyphs) { logClusters[currentPosition - 1] < glyphs.numGlyphs) {
previousGlyph = currentGlyph(); // needed to calculate right bearing later previousGlyph = currentGlyph(); // needed to calculate right bearing later
@ -144,11 +144,13 @@ index 4879ae5..3251354 100644
{ {
qreal rb; qreal rb;
- fontEngine->getGlyphBearings(glyph, 0, &rb); - fontEngine->getGlyphBearings(glyph, 0, &rb);
+
+ // Patch: Backport a crash fix.
+ engine->getGlyphBearings(glyph, 0, &rb); + engine->getGlyphBearings(glyph, 0, &rb);
rightBearing = qMin(QFixed(), QFixed::fromReal(rb)); rightBearing = qMin(QFixed(), QFixed::fromReal(rb));
} }
@@ -1648,13 +1659,16 @@ namespace { @@ -1648,13 +1661,16 @@ namespace {
{ {
if (currentPosition <= 0) if (currentPosition <= 0)
return; return;

12134
Telegram/Patches/qtbase_5_6_2.diff Normal file
View file

File diff suppressed because it is too large Load diff

2
Telegram/gyp/qt.gypi
View file

@ -35,7 +35,7 @@
[ 'build_macold', { [ 'build_macold', {
'qt_version%': '5.3.2', 'qt_version%': '5.3.2',
}, { }, {
'qt_version%': '5.6.0', 'qt_version%': '5.6.2',
}] }]
], ],
}, },