anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-24 18:43:37 +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 fix is also necessary for cmake, but I don't know how to do it.
It would be simply a matter of using QtGui/qtgui-config.h instead
of QtCore/qconfig.h, if QtGui/qtgui-config.h exists.
This commit is contained in:
Enrico Forestieri 2017-02-07 11:29:30 +01:00
parent 5665209caa
commit b541692823
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/qt4.m4
View File

@ -179,11 +179,14 @@ AC_DEFUN([QT_DO_IT_ALL],
])
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])
if test x$USE_QT5 = xyes ; then
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])],