commit 90f7cf2fd024a5056b01df931a2765a8e8db4f58
Author: Enrico Forestieri <[email protected]>
Date: Sun Mar 5 00:14:53 2017 +0100
Fix configuring for Qt 5.8
They moved the QT_QPA_DEFAULT_PLATFORM_NAME definition to the newly
introduced qtgui-config.h header.
---
config/qt4.m4 | 7 +++++--
status.22x | 1 +
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/config/qt4.m4 b/config/qt4.m4
index 9366371..ff8d68f 100644
--- 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 9f9e1fc..9112587 100644
--- 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:
