Qt 6 errors on Windows

[Yu Jin]

Am Mo., 24. Mai 2021 um 15:19 Uhr schrieb Kornel Benko <kornel at lyx.org>:

> Am Mon, 24 May 2021 09:50:27 +0200
> schrieb Yu Jin <yu_jin at lyx.org>:
> > I found what causes this, it is the /Zc compile option. With Qt5 it is
> set
> > to wchar_t and with Qt6 to wchar_t- in all targets, which causes
> troubles.
> > I have changed it in Visual Studio on a test basis and successfully
> > compiled LyX, but I guess it would need to be changed in CMake code.
> > Kornel, can you help me out here?
>
> This is set at ./CMakeLists.txt:1112
> Try to change
>         if (NOT Qt5Core_FOUND)
> to
>         if (NOT (Qt5Core_FOUND OR Qt6Core_FOUND))
>

Yes, that worked, should I commit?
-- 
    Eugene
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20210524/f40428a0/attachment.html>