Update sk.po

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index d41332a2fa5529a39365a69733aef2619baebf93..2cd4263f06c29376e04e40d749d0bedffc01e753 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -44,6 +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 QtGui'
                do
                        QT_TRY_LINK($libname)
@@ -230,10 +231,10 @@ AC_DEFUN([QT_DO_IT_ALL],
        CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES"
        AC_CHECK_HEADER(QtGui/qtgui-config.h,
          [lyx_qt5_config=QtGui/qtgui-config.h],
-         [lyx_qt5_config=qconfig.h],[-])
+         [lyx_qt5_config=qconfig.h])
        AC_CHECK_HEADER(QtGui/private/qtgui-config_p.h,
          [lyx_qt6_config=QtGui/private/qtgui-config_p.h],
-         [lyx_qt6_config=qconfig.h],[-])
+         [lyx_qt6_config=qconfig.h])
        AC_MSG_CHECKING([whether Qt uses the X Window system])
        if test x$USE_QT6 = xyes ; then
          dnl FIXME: Check whether defining QPA_XCB makes sense with Qt6
@@ -366,21 +367,27 @@ 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 QtMacExtras; do
+               for i in Qt QtCore QtGui QtWidgets QtSvg QtConcurrent QtSvgWidgets QtCore5Compat 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"
+                       fi
                done
                QT_CORE_INCLUDES="-I$qt_cv_includes -I$qt_cv_includes/QtCore"
        fi
        case "$qt_cv_libraries" in
-       *framework*)
-               QT_LDFLAGS="-F$qt_cv_libraries"
-               QT_CORE_LDFLAGS="-F$qt_cv_libraries"
-               ;;
        "")
                ;;
        *)
-               QT_LDFLAGS="-L$qt_cv_libraries"
-               QT_CORE_LDFLAGS="-L$qt_cv_libraries"
+               if test "$lyx_use_packaging" = "macosx" ; then
+                       QT_INCLUDES="$QT_INCLUDES -F$qt_cv_libraries"
+                       QT_CORE_INCLUDES="$QT_CORE_INCLUDES -I$qt_cv_libraries/QtCore.framework/Headers -F$qt_cv_libraries"
+                       QT_LDFLAGS="-F$qt_cv_libraries"
+                       QT_CORE_LDFLAGS="-F$qt_cv_libraries"
+               else
+                       QT_LDFLAGS="-L$qt_cv_libraries"
+                       QT_CORE_LDFLAGS="-L$qt_cv_libraries"
+               fi
                ;;
        esac
        AC_SUBST(QT_INCLUDES)
@@ -417,6 +424,7 @@ qtHaveModule(core5compat):  QT += core5compat
 percent.target = %
 percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
+QMAKE_PROJECT_DEPTH = 0
 EOF1
            $QT_QMAKE $lyx_test_qt_pro -o $lyx_test_qt_mak 1>/dev/null 2>&1
            QT_CORE_INCLUDES=`cd $lyx_test_qt_dir; make -s -f $lyx_test_qt_mak INCPATH | sed 's/-I\. //g'`
@@ -438,12 +446,14 @@ EOF1
 qtHaveModule(core):            QT += core
 qtHaveModule(core5compat):     QT += core5compat
 qtHaveModule(concurrent):      QT += concurrent
-qtHaveModule(gui):             QT += gui
+qtHaveModule(gui):             QT += gui gui-private
 qtHaveModule(svg):             QT += svg
+qtHaveModule(svgwidgets):      QT += svgwidgets
 qtHaveModule(widgets):         QT += widgets
 percent.target = %
 percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
+QMAKE_PROJECT_DEPTH = 0
 EOF2
                $QT_QMAKE $lyx_test_qt_pro -o $lyx_test_qt_mak 1>/dev/null 2>&1
                QT_INCLUDES=`cd $lyx_test_qt_dir; make -s -f $lyx_test_qt_mak INCPATH | sed 's/-I\. //g'`
@@ -453,7 +463,7 @@ EOF2
                    QT_LDFLAGS="-L`$QT_QMAKE -query QT_INSTALL_LIBS`"
                    QT_LIB="$qt_guilibs"
                else
-                   QT_LIB=`echo $qt_guilibs | tr ' ' '\n' | grep -e "^-l" | tr '\n' ' '`
+                   QT_LIB=`echo $qt_guilibs | tr ' ' '\n' | grep -v "^-L" | tr '\n' ' '`
                fi
                QTLIB_VERSION=`$QT_QMAKE -v | grep "Qt version" | sed -e 's/.*\([[0-9]]\.[[0-9]]*\.[[0-9]]\).*/\1/'`
                if test -z "$QT_LIB"; then