Fix detection of Qt5.

This commit is contained in:
sledgehammer999 2014-11-26 15:26:12 +02:00
parent 17f56a7744
commit f46a7c1d3f
2 changed files with 1 additions and 4 deletions

2
configure vendored
View file

@ -4533,8 +4533,6 @@ QT_QMAKE=$pkg_cv_QT_QMAKE
if test "x$QT_QMAKE" = x""; then : if test "x$QT_QMAKE" = x""; then :
else
QT_QMAKE=$QT_QMAKE/qmake
fi fi
fi fi

View file

@ -32,8 +32,7 @@ AC_DEFUN([FIND_QT5],
[PKG_CHECK_EXISTS([Qt5Core >= 5.2.0], [PKG_CHECK_EXISTS([Qt5Core >= 5.2.0],
[PKG_CHECK_VAR(QT_QMAKE, [PKG_CHECK_VAR(QT_QMAKE,
[Qt5Core >= 5.2.0], [Qt5Core >= 5.2.0],
[host_bins], [host_bins])
[QT_QMAKE=[$QT_QMAKE]/qmake])
]) ])
AC_MSG_CHECKING([for Qt5 qmake >= 5.2.0]) AC_MSG_CHECKING([for Qt5 qmake >= 5.2.0])