Remove traces of QtCore5Compat in autoconf script

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index d89f30ada59de49614c9d21b79f24813cda8b39a..aa90d56348b3205473189b0eed99ce86c7cb7c4a 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -27,8 +27,8 @@ AC_DEFUN([QT_CHECK_COMPILE],
                qt_corelibs="-lQtCore -lQtCore4"
                qt_guilibs="'-lQtCore -lQtGui' '-lQtCore4 -lQtGui4'"
                if test $USE_QT6 = "yes" ; then
-                   qt_corelibs="-lQt6Core -lQt6Core5Compat"
-                   qt_guilibs="-lQt6Core -lQt6Core5Compat -lQt6Concurrent -lQt6Gui -lQt6Svg -lQt6Widgets"
+                   qt_corelibs="-lQt6Core"
+                   qt_guilibs="-lQt6Core -lQt6Concurrent -lQt6Gui -lQt6Svg -lQt6Widgets"
                else
                    qt_corelibs="-lQt5Core"
                    qt_guilibs="-lQt5Core -lQt5Concurrent -lQt5Gui -lQt5Svg -lQt5Widgets"
@@ -44,7 +44,7 @@ AC_DEFUN([QT_CHECK_COMPILE],
                qt_cv_libname=
                for libname in $qt_guilibs \
                               '-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtWidgets -framework QtMacExtras -framework QtGui'\
-                              '-framework QtCore -framework QtConcurrent -framework QtCore5Compat -framework QtSvg -framework QtSvgWidgets -framework QtWidgets -framework QtGui'\
+                              '-framework QtCore -framework QtConcurrent -framework QtSvg -framework QtSvgWidgets -framework QtWidgets -framework QtGui'\
                               '-framework QtCore -framework QtGui'
                do
                        QT_TRY_LINK($libname)
@@ -128,7 +128,7 @@ dnl start here
 AC_DEFUN([QT_DO_IT_ALL],
 [
        dnl this variable is precious
-       AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt4])
+       AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt5])
 
        AC_ARG_WITH(qt-dir, [AS_HELP_STRING([--with-qt-dir], [where the root of Qt is installed])],
                [ qt_cv_dir=`eval echo "$withval"/` ])
@@ -184,7 +184,7 @@ AC_DEFUN([QT_DO_IT_ALL],
        fi
 
        if test -z "$QT_LIB"; then
-         dnl Try again with Qt5 and then Qt4 if configuring for Qt6/5 fails
+         dnl Try again with Qt5 and if configuring for Qt6/5 fails
          if test x$USE_QT6 = xyes ; then
                USE_QT6=no
                AC_SUBST([USE_QT6])
@@ -207,6 +207,14 @@ AC_DEFUN([QT_DO_IT_ALL],
        [AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QTLIB_VERSION has been found.])
        ])
 
+       case $QTLIB_VERSION in
+       6.*) if test $enable_stdlib_debug = "yes" ; then
+                   LYX_WARNING([Compiling LyX with stdlib-debug and Qt6 library may lead to
+   crashes. Consider dropping --enable-stdlib-debug.])
+            fi;;
+       esac
+
+
        save_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES"
        AC_CHECK_HEADER(QtGui/qtgui-config.h,
@@ -331,7 +339,7 @@ AC_DEFUN([QT_DO_MANUAL_CONFIG],
        QT_CORE_LDFLAGS=
        if test -n "$qt_cv_includes"; then
                QT_INCLUDES="-I$qt_cv_includes"
-               for i in Qt QtCore QtGui QtWidgets QtSvg QtConcurrent QtSvgWidgets QtCore5Compat QtMacExtras; do
+               for i in Qt QtCore QtGui QtWidgets QtSvg QtConcurrent QtSvgWidgets QtMacExtras; do
                        QT_INCLUDES="$QT_INCLUDES -I$qt_cv_includes/$i"
                        if test "$lyx_use_packaging" = "macosx" ; then
                                QT_INCLUDES="$QT_INCLUDES -I$qt_cv_libraries/${i}.framework/Headers"
@@ -384,7 +392,6 @@ AC_DEFUN([QT6_QMAKE_CONFIG],
            lyx_test_qt_mak="$lyx_test_qt_dir/Makefile"
            cat > $lyx_test_qt_pro << EOF1
 qtHaveModule(core):            QT += core
-qtHaveModule(core5compat):     QT += core5compat
 percent.target = %
 percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
@@ -408,7 +415,6 @@ EOF1
                AC_SUBST(QT_CORE_LIB)
                cat > $lyx_test_qt_pro << EOF2
 qtHaveModule(core):            QT += core
-qtHaveModule(core5compat):     QT += core5compat
 qtHaveModule(concurrent):      QT += concurrent
 qtHaveModule(gui):             QT += gui gui-private
 qtHaveModule(svg):             QT += svg