From 04bf6ce21ad59e36c4075d31040b0c1c7be8e21c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Mon, 23 Feb 2015 13:40:33 +0000 Subject: [PATCH] fix choosing qt --- configure.ac | 9 ++++++--- src/webtester.pro | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 9432a7a..566e586 100644 --- 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') diff --git a/src/webtester.pro b/src/webtester.pro index 6d3efa6..60cba03 100644 --- 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