Fix configuring for Qt 5.8

They moved the QT_QPA_DEFAULT_PLATFORM_NAME definition to the newly
introduced qtgui-config.h header.

diff --git a/config/qt4.m4 b/config/qt4.m4
index 93663712fc32153df43a1e492a9a54436060ca44..ff8d68f6a502767918096e64883a7c1755a14171 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -180,10 +180,13 @@ AC_DEFUN([QT_DO_IT_ALL],
 
        if test x$USE_QT5 = xyes ; then
          save_CPPFLAGS=$CPPFLAGS
-         AC_MSG_CHECKING([whether Qt uses the X Window system])
          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_MSG_CHECKING([whether Qt uses the X Window system])
          AC_EGREP_CPP(xcb,
-           [#include <qconfig.h>
+           [#include <$lyx_qt5_config>
            QT_QPA_DEFAULT_PLATFORM_NAME],
            [AC_MSG_RESULT(yes)
             AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],

diff --git a/status.22x b/status.22x
index 9f9e1fc742a1890888e5a235cb8d0d63629bb9ff..91125870c6f67acb42ee02f750a267afb24e90b8 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -82,6 +82,7 @@ What's new
 
 * BUILD/INSTALLATION
 
+- Correctly determine whether the X11 backend is used by Qt 5.8.
 
 
 ** Bug fixes: