fix choosing qt

master
Marc Wäckerlin 10 years ago
parent 29b1bef6fd
commit 04bf6ce21a
  1. 9
      configure.ac
  2. 2
      src/webtester.pro

@ -22,9 +22,12 @@ AC_CONFIG_FILES(makefile src/makefile debian/changelog debian/control)
AC_PROG_CXX AC_PROG_CXX
AC_PROG_CC AC_PROG_CC
AC_CHECK_PROG(QMAKE, qmake-qt5) AC_CHECK_PROG([QMAKE], [qmake-qt4], [qmake-qt4])
AC_CHECK_PROG(QMAKE, qtchooser, [qtchooser -run-tool=qmake -qt=qt5]) AC_CHECK_PROG([QMAKE], [qtchooser], [qtchooser -run-tool=qmake -qt=4])
AC_CHECK_PROG(QMAKE, qmake) 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=$(tail -n +3 README)
README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g') README_DEB=$(tail -n +3 README | sed -e 's/^$/./g' -e 's/^/ /g')

@ -4,7 +4,7 @@
# #
#------------------------------------------------- #-------------------------------------------------
QT += core webkitwidgets QT += core network webkit webkitwidgets
CONFIG += C++11 CONFIG += C++11
CODECFORSRC = UTF-8 CODECFORSRC = UTF-8

Loading…
Cancel
Save