[LyX/master] Remove deprecated enum value with Qt5
Richard Kimberly Heck
rikiheck at lyx.org
Fri Nov 27 14:26:31 UTC 2020
On 11/27/20 4:28 AM, Jean-Marc Lasgouttes wrote:
> Le 27/11/2020 à 09:57, Jean-Marc Lasgouttes a écrit :
>> commit 4b15d64f5172f622ec9747f25635a822aef725d3
>> Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
>> Date: Thu Nov 26 20:17:57 2020 +0100
>>
>> Remove deprecated enum value with Qt5
>
> Riki, this is useful in branch too.
I am going to build 2.3.6 this weekend (maybe today). If this is
completely safe, then go ahead. If not, then wait until that's done, please.
Riki
>
>> ---
>> src/frontends/qt/GuiWorkArea.cpp | 4 ++++
>> 1 files changed, 4 insertions(+), 0 deletions(-)
>>
>> diff --git a/src/frontends/qt/GuiWorkArea.cpp
>> b/src/frontends/qt/GuiWorkArea.cpp
>> index 99e88bb..1c76928 100644
>> --- a/src/frontends/qt/GuiWorkArea.cpp
>> +++ b/src/frontends/qt/GuiWorkArea.cpp
>> @@ -1345,7 +1345,11 @@ QVariant
>> GuiWorkArea::inputMethodQuery(Qt::InputMethodQuery query) const
>> switch (query) {
>> // this is the CJK-specific composition window position and
>> // the context menu position when the menu key is pressed.
>> +#if (QT_VERSION < 0x050000)
>> case Qt::ImMicroFocus: {
>> +#else
>> + case Qt::ImCursorRectangle: {
>> +#endif
>> CaretGeometry const & cg = bufferView().caretGeometry();
>> return QRect(cg.left - 10 * (d->preedit_lines_ != 1),
>> cg.top + cg.height() * d->preedit_lines_,
>>
>
More information about the lyx-devel
mailing list