Qt5 is now the default with configure

diff --git a/INSTALL b/INSTALL
index 99114b2de356456c65330ed9caf3d0a1a2ccc27c..f7eeb789192ebbe279808026cf0dacf59a3f4d83 100644 (file)
--- 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 d54766275e2b34167f76d7f3171428b16719d82c..a6ff955c2b96e03b2317880e651617b1aad7779f 100644 (file)
--- 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 73665f109fa7719eff61b5cfac4cefacf81393c1..1143ec8832b48fbdb6282de3e02ba325cfe0647c 100644 (file)
--- 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.