[LyX/master] Wininstaller Qt6.7 changed file name

[Yu Jin]

Am So., 26. Mai 2024 um 10:08 Uhr schrieb Pavel Sanda:

> On Sun, May 26, 2024 at 07:35:16AM +0000, Eugene Chornyi wrote:
> > commit a6d0d7ea92b686fc102b05970830ee11fc51e47b
> > Author: Eugene Chornyi
> > Date:   Sun May 26 09:35:10 2024 +0200
> >
> >     Wininstaller Qt6.7 changed file name
> > ---
> >  development/Win32/packaging/installer/src/main.nsh | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/development/Win32/packaging/installer/src/main.nsh
> b/development/Win32/packaging/installer/src/main.nsh
> > index b3713862d1..5062267720 100644
> > --- a/development/Win32/packaging/installer/src/main.nsh
> > +++ b/development/Win32/packaging/installer/src/main.nsh
> > @@ -629,7 +629,8 @@ Section -ProgramFiles
> >    File "${FILES_QT}\bin\platforms\qwindows.dll"
> >
> >    SetOutPath "$INSTDIR\bin\styles"
> > -  File "${FILES_QT}\bin\styles\qwindowsvistastyle.dll"
> > +  File /nonfatal "${FILES_QT}\bin\styles\qwindowsvistastyle.dll"
> > +  File /nonfatal "${FILES_QT}\bin\styles\qmodernwindowsstyle.dll"
>
> I guess it would make sense to document in INSTALL.Win32
> what combination of Qt and MSVC the build was tested and works?
>

I don't test every possible combination, I usually try to update to the
most recent versions, but the INSTALL.Win32 is still actual regarding the
instructions. This commit regards this line
https://git.lyx.org/gitweb/?p=lyx.git;a=blob;f=INSTALL.Win32;h=796ed70de9c0b3333e0ec25bf30645b16a9ad53d;hb=HEAD#l148

In the NSIS Script I just don't copy the whole folder recursively, because
there is also a ...d.dll (debug dll) and also might be a .pdb file
depending what exactly is chosen when installing Qt. I don't want those in
the Installer at the end so the individual file is copied.

-- 
  Eugene
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20240526/d3198ebd/attachment.html>