Update Windows compile instructions (add Qt6 specific info)

diff --git a/INSTALL.Win32 b/INSTALL.Win32
index e74e3b2794d208cd73960a393a12af2811674c04..796ed70de9c0b3333e0ec25bf30645b16a9ad53d 100644 (file)
--- a/INSTALL.Win32
+++ b/INSTALL.Win32
@@ -39,6 +39,8 @@ Compiling with Microsoft Visual C++ (MSVC)
        Qt 5.12.x is recommended, but 5.9.x or later versions should work as well.
        The newest Qt is 5.12.6, in the installer you will need to expand that category and mark MSVC 2017 32-bit and/or
        MSVC 2017 64-bit, depending on which versions of LyX you want to build.
+       Qt6 only delivers prebuild 64 bit binaries. If you install Qt6, you will also need to check
+       "Qt 5 Compatiblity Module"
        Note, you dont need to Install the "old" 2017 build tools in Visual Studio installer,
        the 2019 ones are compatible with MSVC 2017 kits installed with Qt.
        Qt should install in C:\Qt.
@@ -84,10 +86,11 @@ Compiling with Microsoft Visual C++ (MSVC)
           Enable LYX_DEPENDENCIES_DOWNLOAD and click Configure.
           Pre-compiled dependencies will automatically be downloaded.)
 
-       - Set LYX_USE_QT to QT5.
+       - Set LYX_USE_QT to QT5 or Qt6 depending with which one you want to compile.
        
        - set CMAKE_PREFIX_PATH to the path of a Qt-kit
-         e.g. to C:\Qt\5.12.6\msvc2017_64 or C:\Qt\5.12.6\msvc2017 depending on which platform you have chosen
+         e.g. to C:\Qt\5.12.6\msvc2017_64 or C:\Qt\5.12.6\msvc2017 or C:\Qt\6.1.0\msvc2019_64
+         depending on which platform you have chosen
          If you cant find this option, simply add a new entry of type "path" manually
 
        - Disable the LYX_EXTERNAL_DTL option
@@ -128,11 +131,13 @@ Compiling with Microsoft Visual C++ (MSVC)
        Qt5Svg.dll
        Qt5Widgets.dll
        Qt5WinExtras.dll
+       Qt6Core5Compat.dll (if compiling with Qt6)
        Qt5Cored.dll (if compiling Debug version)
        Qt5Guid.dll (if compiling Debug version)
        Qt5Svgd.dll (if compiling Debug version)
        Qt5Widgetsd.dll (if compiling Debug version)
        Qt5WinExtrasd.dll (if compiling Debug version)
+       Qt6Core5Compatd.dll (if compiling with Qt6 and debug version)
        to C:\LyX\build\LYX_INSTALLED\bin
        
        - Go to the Qt-kit directory, which you have specified as CMAKE_PREFIX_PATH, enter the plugins folder

diff --git a/development/Win32/packaging/installer/Readme.txt b/development/Win32/packaging/installer/Readme.txt
index 1d17b7fc2a6f97669d8d8ebe5e42b827a9654041..8875446ece171f28637ea2b145e80c03ffbce24f 100644 (file)
--- a/development/Win32/packaging/installer/Readme.txt
+++ b/development/Win32/packaging/installer/Readme.txt
@@ -22,6 +22,7 @@ To build the installer do the following:
    Qt5OpenGL.dll"
    Qt5PrintSupport.dll"
   to %%lyxbuild%%\LYX_INSTALLED\bin
+  The files will be named Qt6xxx.dll if compiled with Qt6
 - open the file settings.nsh with a text editor and adapt the settings for your need. A good text editor
   for NSIS development is e.g. Visual Studio Code with the NSIS extension.
 - right-click on the file lyx-standard.nsi and choose "Compile NSIS script"