commit cac50fec00e02d97fbd367a4a8bf630398f36e38
Author: Jean-Marc Lasgouttes <[email protected]>
Date: Thu Nov 17 15:10:21 2022 +0100
Qt5 is now the default with configure
---
INSTALL | 2 +-
config/lyxinclude.m4 | 4 ++--
status.23x | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/INSTALL b/INSTALL
index 99114b2..f7eeb78 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,7 +18,7 @@ These four steps will compile, test and install LyX:
(for example, "--with-qt-dir=/usr/share/qt4/") if the
environment variable QTDIR is not set and pkg-config is not
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.
diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index d547662..a6ff955 100644
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -68,8 +68,8 @@ dnl
AC_DEFUN([LYX_CHECK_QT5],[
AC_MSG_CHECKING([whether Qt5 is requested])
AC_ARG_ENABLE([qt5],
- [ --enable-qt5 use Qt5 for building],
- USE_QT5=$enableval, USE_QT5=no)
+ [ --disable-qt5 use Qt4 for building],
+ USE_QT5=$enableval, USE_QT5=yes)
AC_MSG_RESULT([$USE_QT5])
AC_SUBST([USE_QT5])
])
diff --git a/status.23x b/status.23x
index 73665f1..1143ec8 100644
--- a/status.23x
+++ b/status.23x
@@ -163,6 +163,8 @@ What's new
* BUILD/INSTALLATION
+- compilation with configure now defaults to Qt5, use --disable-qt5 to compile
with Qt4.
+
- Remove use of deprecated Qt methods.
- Update in-tree hunspell library to 1.7.0.
--
lyx-cvs mailing list
[email protected]
http://lists.lyx.org/mailman/listinfo/lyx-cvs
