Mercurial > hg > svcore
diff acinclude.m4 @ 1170:6877f4200912 3.0-integration
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Wed, 02 Mar 2016 16:16:36 +0000 |
| parents | 8a1328ab9c48 |
| children |
line wrap: on
line diff
--- a/acinclude.m4 Thu Feb 04 11:16:05 2016 +0000 +++ b/acinclude.m4 Wed Mar 02 16:16:36 2016 +0000 @@ -69,6 +69,9 @@ AC_CHECK_PROG(QMAKE, qmake-qt5, $QTDIR/bin/qmake-qt5,,$QTDIR/bin/) fi if test x$QMAKE = x ; then + AC_CHECK_PROG(QMAKE, qt5-qmake, $QTDIR/bin/qt5-qmake,,$QTDIR/bin/) +fi +if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake, $QTDIR/bin/qmake,,$QTDIR/bin/) fi if test x$QMAKE = x ; then @@ -78,6 +81,9 @@ AC_CHECK_PROG(QMAKE, qmake-qt5, qmake-qt5,,$PATH) fi if test x$QMAKE = x ; then + AC_CHECK_PROG(QMAKE, qt5-qmake, qt5-qmake,,$PATH) +fi +if test x$QMAKE = x ; then AC_CHECK_PROG(QMAKE, qmake, qmake,,$PATH) fi if test x$QMAKE = x ; then