anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Qt5 is now the default with configure

Browse Source
This commit is contained in:
Jean-Marc Lasgouttes 2022-11-17 15:10:21 +01:00
parent 22e78cae81
commit cac50fec00
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL
View File

@ -18,7 +18,7 @@ These four steps will compile, test and install LyX:
(for example, "--with-qt-dir=/usr/share/qt4/") if the (for example, "--with-qt-dir=/usr/share/qt4/") if the
environment variable QTDIR is not set and pkg-config is not environment variable QTDIR is not set and pkg-config is not
available. available.
You will need --enable-qt5 switch for choosing qt5 over qt4. You will need --disable-qt5 switch for choosing qt4 over qt5.
See Note below if ./configure script is not present. See Note below if ./configure script is not present.

4
config/lyxinclude.m4
View File

@ -68,8 +68,8 @@ dnl
AC_DEFUN([LYX_CHECK_QT5],[ AC_DEFUN([LYX_CHECK_QT5],[
AC_MSG_CHECKING([whether Qt5 is requested]) AC_MSG_CHECKING([whether Qt5 is requested])
AC_ARG_ENABLE([qt5], AC_ARG_ENABLE([qt5],
[ --enable-qt5 use Qt5 for building], [ --disable-qt5 use Qt4 for building],
USE_QT5=$enableval, USE_QT5=no) USE_QT5=$enableval, USE_QT5=yes)
AC_MSG_RESULT([$USE_QT5]) AC_MSG_RESULT([$USE_QT5])
AC_SUBST([USE_QT5]) AC_SUBST([USE_QT5])
]) ])

2
status.23x
View File

@ -163,6 +163,8 @@ What's new
* BUILD/INSTALLATION * BUILD/INSTALLATION
- compilation with configure now defaults to Qt5, use --disable-qt5 to compile with Qt4.
- Remove use of deprecated Qt methods. - Remove use of deprecated Qt methods.
- Update in-tree hunspell library to 1.7.0. - Update in-tree hunspell library to 1.7.0.