anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix configuring for Qt 5.8

Browse Source 
They moved the QT_QPA_DEFAULT_PLATFORM_NAME definition to the newly
introduced qtgui-config.h header.
This commit is contained in:
Enrico Forestieri 2017-03-05 00:14:53 +01:00
parent 2b9965aebb
commit 90f7cf2fd0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/qt4.m4
View File

@ -180,10 +180,13 @@ AC_DEFUN([QT_DO_IT_ALL],
if test x$USE_QT5 = xyes ; then if test x$USE_QT5 = xyes ; then
save_CPPFLAGS=$CPPFLAGS save_CPPFLAGS=$CPPFLAGS
AC_MSG_CHECKING([whether Qt uses the X Window system])
CPPFLAGS="$save_CPPFLAGS $QT_CORE_INCLUDES" 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, AC_EGREP_CPP(xcb,
[#include <qconfig.h> [#include <$lyx_qt5_config>
QT_QPA_DEFAULT_PLATFORM_NAME], QT_QPA_DEFAULT_PLATFORM_NAME],
[AC_MSG_RESULT(yes) [AC_MSG_RESULT(yes)
AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])], AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],

1
status.22x
View File

@ -82,6 +82,7 @@ What's new
* BUILD/INSTALLATION * BUILD/INSTALLATION
- Correctly determine whether the X11 backend is used by Qt 5.8.
** Bug fixes: ** Bug fixes: