pull/1/head
Timothy Pearson 12 years ago
parent c539cec821
commit 1fcb8ace14

14
configure vendored

@ -71,15 +71,15 @@ if [ -z "$QTDIR" ]; then
fi fi
fi fi
if [ ! -x "$QTDIR/bin/qmake" ]; then if [ ! -x "$QTDIR/bin/tqmake" ]; then
if [ "$QC_DEBUG" = "Y" ]; then if [ "$QC_DEBUG" = "Y" ]; then
echo Warning: qmake not in \$QTDIR/bin/qmake echo Warning: tqmake not in \$QTDIR/bin/tqmake
echo trying to find it in \$PATH echo trying to find it in \$PATH
fi fi
qm=`type -p qmake` qm=`type -p tqmake`
if [ -x "$qm" ]; then if [ -x "$qm" ]; then
if [ "$QC_DEBUG" = "Y" ]; then if [ "$QC_DEBUG" = "Y" ]; then
echo qmake found in $qm echo tqmake found in $qm
fi fi
else else
echo fail echo fail
@ -88,12 +88,12 @@ if [ ! -x "$QTDIR/bin/qmake" ]; then
echo or I missdetected \$QTDIR=$QTDIR echo or I missdetected \$QTDIR=$QTDIR
echo echo
echo Please set \$QTDIR manually and make sure that echo Please set \$QTDIR manually and make sure that
echo \$QTDIR/bin/qmake exists. echo \$QTDIR/bin/tqmake exists.
echo echo
exit 1; exit 1;
fi fi
else else
qm=$QTDIR/bin/qmake qm=$QTDIR/bin/tqmake
fi fi
gen_files() { gen_files() {
@ -480,7 +480,7 @@ rm -rf .qconftemp
if [ -x "./qcextra" ]; then if [ -x "./qcextra" ]; then
./qcextra ./qcextra
fi fi
# run qmake # run tqmake
$qm qca.pro $qm qca.pro
if [ "$?" != "0" ]; then if [ "$?" != "0" ]; then
echo echo

Loading…
Cancel
Save