- AC_PATH_PROGS(MOC4, [moc-qt4 moc],[],$qt4_cv_bin:$PATH)
- AC_PATH_PROGS(UIC4, [uic-qt4 uic],[],$qt4_cv_bin:$PATH)
- AC_PATH_PROGS(RCC4, [rcc-qt4 rcc],[],$qt4_cv_bin:$PATH)
- AC_CHECK_PROG(bc_found,[bc],[yes],[no],$PATH)
+ 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_EGREP_CPP(xcb,
+ [#include <qconfig.h>
+ QT_QPA_DEFAULT_PLATFORM_NAME],
+ [AC_MSG_RESULT(yes)
+ AC_DEFINE(QPA_XCB, 1, [Define if Qt uses the X Window System])],
+ [AC_MSG_RESULT(no)])
+ CPPFLAGS=$save_CPPFLAGS
+ fi
+
+ QT_FIND_TOOL([QT_MOC], [moc])
+ QT_FIND_TOOL([QT_UIC], [uic])
+ QT_FIND_TOOL([QT_RCC], [rcc])
+
+ dnl Safety check
+ mocqtver=`$QT_MOC -v 2>&1 | sed -e 's/.*\([[0-9]]\.[[0-9]]\.[[0-9]]\).*/\1/'`
+ if test "x$mocqtver" != "x$QTLIB_VERSION"; then
+ LYX_WARNING([The found moc compiler is for Qt $mocqtver but the Qt library version is $QTLIB_VERSION.])
+ fi