From 4d2845c02832e3b3a11518da1f84a7a2bbb3a608 Mon Sep 17 00:00:00 2001 From: Martin Kleusberg Date: Thu, 2 Nov 2017 23:10:02 +0100 Subject: [PATCH] Add separate patch file for commit 3a0e29cf284294ea818396078e5e1a38e7b4657e This way we can keep track of the changed we did to the included third party libraries. --- libs/{DB4S_PATCHES => DB4S_PATCH_01} | 0 libs/DB4S_PATCH_02 | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+) rename libs/{DB4S_PATCHES => DB4S_PATCH_01} (100%) create mode 100644 libs/DB4S_PATCH_02 diff --git a/libs/DB4S_PATCHES b/libs/DB4S_PATCH_01 similarity index 100% rename from libs/DB4S_PATCHES rename to libs/DB4S_PATCH_01 diff --git a/libs/DB4S_PATCH_02 b/libs/DB4S_PATCH_02 new file mode 100644 index 00000000..c7175082 --- /dev/null +++ b/libs/DB4S_PATCH_02 @@ -0,0 +1,18 @@ +diff --git a/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp b/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp +index d40b742..4c9fe75 100644 +--- a/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp ++++ b/libs/qscintilla/Qt4Qt5/qsciscintilla.cpp +@@ -386,7 +386,12 @@ void QsciScintilla::callTip() + ct = ct_entries.join("\n"); + } + +- QByteArray ct_ba = ct.toLatin1(); ++ QByteArray ct_ba; ++ if (isUtf8()) ++ ct_ba = ct.toUtf8(); ++ else ++ ct_ba = ct.toLatin1(); ++ + const char *cts = ct_ba.data(); + + SendScintilla(SCI_CALLTIPSHOW, adjustedCallTipPosition(shift), cts);