|
|
|
@ -79,15 +79,15 @@ if [ -z "$QTDIR" ]; then
|
|
|
|
|
fi
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
if [ ! -x "$QTDIR/bin/qmake" ]; then
|
|
|
|
|
if [ ! -x "$QTDIR/bin/tqmake" ]; 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
|
|
|
|
|
fi
|
|
|
|
|
qm=`type -p qmake`
|
|
|
|
|
qm=`type -p tqmake`
|
|
|
|
|
if [ -x "$qm" ]; then
|
|
|
|
|
if [ "$QC_DEBUG" = "Y" ]; then
|
|
|
|
|
echo qmake found in $qm
|
|
|
|
|
echo tqmake found in $qm
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
echo fail
|
|
|
|
@ -96,12 +96,12 @@ if [ ! -x "$QTDIR/bin/qmake" ]; then
|
|
|
|
|
echo or I missdetected \$QTDIR=$QTDIR
|
|
|
|
|
echo
|
|
|
|
|
echo Please set \$QTDIR manually and make sure that
|
|
|
|
|
echo \$QTDIR/bin/qmake exists.
|
|
|
|
|
echo \$QTDIR/bin/tqmake exists.
|
|
|
|
|
echo
|
|
|
|
|
exit 1;
|
|
|
|
|
fi
|
|
|
|
|
else
|
|
|
|
|
qm=$QTDIR/bin/qmake
|
|
|
|
|
qm=$QTDIR/bin/tqmake
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
gen_files() {
|
|
|
|
@ -575,7 +575,7 @@ rm -rf .qconftemp
|
|
|
|
|
if [ -x "./qcextra" ]; then
|
|
|
|
|
./qcextra
|
|
|
|
|
fi
|
|
|
|
|
# run qmake
|
|
|
|
|
# run tqmake
|
|
|
|
|
if expr match "$DEB_BUILD_OPTIONS" ".*nostrip"; then
|
|
|
|
|
$qm QMAKE_STRIP=true qca-tls.pro
|
|
|
|
|
else
|
|
|
|
|