Reformat lyx2lyx code using ruff

[lyx.git] / config / qt.m4

diff --git a/config/qt.m4 b/config/qt.m4
index aa90d56348b3205473189b0eed99ce86c7cb7c4a..7e7ffd6df2af62275fd72a873f351b5fd31b27a1 100644 (file)
--- a/config/qt.m4
+++ b/config/qt.m4
@@ -218,16 +218,13 @@ AC_DEFUN([QT_DO_IT_ALL],
        save_CPPFLAGS=$CPPFLAGS
        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])
-       AC_CHECK_HEADER(QtGui/private/qtgui-config_p.h,
-         [lyx_qt6_config=QtGui/private/qtgui-config_p.h],
-         [lyx_qt6_config=qconfig.h])
+         [lyx_qt_config=QtGui/qtgui-config.h],
+         [lyx_qt_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
          AC_PREPROC_IFELSE([AC_LANG_SOURCE([
-           [#include <$lyx_qt6_config>]
+           [#include <$lyx_qt_config>]
            [#if !defined(QT_FEATURE_xcb) || QT_FEATURE_xcb < 0]
            [#error Fail]
            [#endif]])],
@@ -236,7 +233,7 @@ AC_DEFUN([QT_DO_IT_ALL],
            [AC_MSG_RESULT(no)])
        else
          AC_EGREP_CPP(xcb,
-           [#include <$lyx_qt5_config>
+           [#include <$lyx_qt_config>
            QT_QPA_DEFAULT_PLATFORM_NAME],
            [AC_MSG_RESULT(yes)
             AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],
@@ -414,12 +411,14 @@ EOF1
                AC_SUBST(QT_CORE_LDFLAGS)
                AC_SUBST(QT_CORE_LIB)
                cat > $lyx_test_qt_pro << EOF2
-qtHaveModule(core):            QT += core
-qtHaveModule(concurrent):      QT += concurrent
-qtHaveModule(gui):             QT += gui gui-private
-qtHaveModule(svg):             QT += svg
-qtHaveModule(svgwidgets):      QT += svgwidgets
-qtHaveModule(widgets):         QT += widgets
+QMAKE_EXTRA_VARIABLES = MISSING
+qtHaveModule(core)             {QT += core} else {MISSING += core}
+qtHaveModule(concurrent)       {QT += concurrent} else {MISSING += concurrent}
+qtHaveModule(gui)              {QT += gui} else {MISSING += gui}
+qtHaveModule(gui-private)      {QT += gui-private} else {MISSING += gui-private}
+qtHaveModule(svg)              {QT += svg} else {MISSING += svg}
+qtHaveModule(svgwidgets)       {QT += svgwidgets} else {MISSING += svgwidgets}
+qtHaveModule(widgets)          {QT += widgets} else {MISSING += widgets}
 percent.target = %
 percent.commands = @echo -n "\$(\$(@))\ "
 QMAKE_EXTRA_TARGETS += percent
@@ -439,6 +438,10 @@ EOF2
                if test -z "$QT_LIB"; then
                    AC_MSG_RESULT(no)
                else
+                   QT_MISSING=`cd $lyx_test_qt_dir; make -s -f $lyx_test_qt_mak EXPORT_MISSING | sed 's/^ *//'`
+                   if test -n "$QT_MISSING"; then
+                           AC_MSG_ERROR([Qt6 module(s) $QT_MISSING not found.])
+                   fi
                    AC_MSG_RESULT(yes)
                    AC_SUBST(QT_INCLUDES)
                    AC_SUBST(QT_LDFLAGS)