fix choosing qt

10 years ago · 04bf6ce21a
parent 29b1bef6fd
commit 04bf6ce21a
2 changed files with 7 additions and 4 deletions
--- a/configure.ac
+++ b/configure.ac
@ -22,9 +22,12 @@ AC_CONFIG_FILES(makefile src/makefile debian/changelog debian/control)
 AC_PROG_CXX
 AC_PROG_CC

-AC_CHECK_PROG(QMAKE, qmake-qt5)
-AC_CHECK_PROG(QMAKE, qtchooser, [qtchooser -run-tool=qmake -qt=qt5])
-AC_CHECK_PROG(QMAKE, qmake)
+AC_CHECK_PROG([QMAKE], [qmake-qt4], [qmake-qt4])
+AC_CHECK_PROG([QMAKE], [qtchooser], [qtchooser -run-tool=qmake -qt=4])
+AC_CHECK_PROG([QMAKE], [qmake], [qmake])
+if test -z "${QMAKE}"; then
+  AC_MSG_ERROR([cannot find a qmake command])
+fi

 README=$(tail -n +3 README)
 README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g')
--- a/src/webtester.pro
+++ b/src/webtester.pro
@ -4,7 +4,7 @@
 #
 #-------------------------------------------------

-QT += core webkitwidgets
+QT += core network webkit webkitwidgets
 CONFIG += C++11

 CODECFORSRC = UTF-8