commit 0bd6cc30bc30d3ae4315709c23b8aeb4bdccaf74
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date: Wed Oct 11 11:20:22 2017 +0200
autoconf
---
config/qt4.m4 | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/config/qt4.m4 b/config/qt4.m4
index 1cf557d..306ffe8 100644
--- a/config/qt4.m4
+++ b/config/qt4.m4
@@ -4,8 +4,7 @@ AC_DEFUN([QT_TRY_LINK],
SAVE_LIBS="$LIBS"
LIBS="$LIBS $1"
AC_TRY_LINK([
- #include <qglobal.h>
- #include <qstring.h>
+ #include <QtCore/QString>
],
[
QString s("mangle_failure");
@@ -104,7 +103,7 @@ AC_DEFUN([QT_GET_VERSION],
cat > conftest.$ac_ext <<EOF
#line __oline__ "configure"
#include "confdefs.h"
-#include <qglobal.h>
+#include <QtCore/qglobal.h>
"%%%"QT_VERSION_STR"%%%"
EOF
lyx_cv_qtversion=`(eval "$ac_cpp conftest.$ac_ext") 2>&5 | \
@@ -193,7 +192,7 @@ AC_DEFUN([QT_DO_IT_ALL],
[AC_MSG_RESULT(no)])
else
AC_PREPROC_IFELSE([AC_LANG_SOURCE([
- [#include <qglobal.h>],
+ [#include <QtCore/qglobal.h>],
[#ifndef Q_WS_X11],
[#error Fail],
[#endif]])],
