Revert "pdfform.module: repair whitespace"

[lyx.git] / config / qt4.m4

diff --git a/config/qt4.m4 b/config/qt4.m4
index 10d954641e5c62da01e167672c79306faf0cf5c2..daa11718ee0ea66c5b1f53430738cf1ff8dbba4d 100644 (file)
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -112,14 +112,6 @@ EOF
 dnl start here
 AC_DEFUN([QT_DO_IT_ALL],
 [
-       AC_MSG_CHECKING([whether Qt5 is requested])
-       dnl Default is Qt4
-       AC_ARG_ENABLE([qt5],
-         [  --enable-qt5            use Qt5 for building],
-         USE_QT5=$enableval, USE_QT5=no)
-       AC_MSG_RESULT([$USE_QT5])
-       AC_SUBST([USE_QT5])
-
        dnl this variable is precious
        AC_ARG_VAR(QTDIR, [the place where the Qt files are, e.g. /usr/lib/qt4])
 
@@ -177,6 +169,19 @@ AC_DEFUN([QT_DO_IT_ALL],
        [AC_MSG_ERROR([LyX requires at least version $1 of Qt. Only version $QTLIB_VERSION has been found.])
        ])
 
+       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])
@@ -206,6 +211,11 @@ AC_DEFUN([QT_DO_PKG_CONFIG],
                if $lyx_use_winextras; then
                        qt_guilibs="$qt_guilibs Qt5WinExtras"
                fi
+               lyx_use_macextras=false
+               PKG_CHECK_EXISTS(Qt5MacExtras, [lyx_use_macextras=true], [])
+               if $lyx_use_macextras; then
+                       qt_guilibs="$qt_guilibs Qt5MacExtras"
+               fi
        fi
        PKG_CHECK_MODULES(QT_CORE, $qt_corelibs,,[:])
        if test "$pkg_failed" = "no" ; then