|
Lines 1127-1135
else
Link Here
|
| 1127 |
fi |
1127 |
fi |
| 1128 |
|
1128 |
|
| 1129 |
# binaries from qt |
1129 |
# binaries from qt |
| 1130 |
QMAKE_VARS="$QMAKE_VARS \"QMAKE_MOC=$outpath/bin/moc\"" |
1130 |
QMAKE_VARS="$QMAKE_VARS \"QMAKE_MOC=$outpath/bin/tqmoc\"" |
| 1131 |
QMAKE_VARS="$QMAKE_VARS \"QMAKE_UIC=$outpath/bin/uic -L \$\$QT_BUILD_TREE/plugins\"" |
1131 |
QMAKE_VARS="$QMAKE_VARS \"QMAKE_UIC=$outpath/bin/tquic -L \$\$QT_BUILD_TREE/plugins\"" |
| 1132 |
QMAKE_VARS="$QMAKE_VARS \"QMAKE_QMAKE=$outpath/bin/qmake\"" |
1132 |
QMAKE_VARS="$QMAKE_VARS \"QMAKE_QMAKE=$outpath/bin/tqmake\"" |
| 1133 |
# hacky src line |
1133 |
# hacky src line |
| 1134 |
QMAKE_VARS="$QMAKE_VARS \"QMAKE_MOC_SRC=$outpath/src/moc\"" |
1134 |
QMAKE_VARS="$QMAKE_VARS \"QMAKE_MOC_SRC=$outpath/src/moc\"" |
| 1135 |
|
1135 |
|
|
Lines 2264-2270
if [ "$OPT_SHADOW" = "yes" ]; then
Link Here
|
| 2264 |
fi |
2264 |
fi |
| 2265 |
|
2265 |
|
| 2266 |
# build qmake |
2266 |
# build qmake |
| 2267 |
if true; then ###[ '!' -f "$outpath/bin/qmake" ]; |
2267 |
if true; then ###[ '!' -f "$outpath/bin/tqmake" ]; |
| 2268 |
echo "Creating qmake. Please wait..." |
2268 |
echo "Creating qmake. Please wait..." |
| 2269 |
rm -f mkspecs/default |
2269 |
rm -f mkspecs/default |
| 2270 |
ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default |
2270 |
ln -s `echo $QMAKESPEC | sed "s,^${relpath}/mkspecs/,,"` mkspecs/default |
|
Lines 3257-3263
else
Link Here
|
| 3257 |
if [ -e "${relpath}/projects.pro" ]; then |
3257 |
if [ -e "${relpath}/projects.pro" ]; then |
| 3258 |
for mkfile in "${outpath}/Makefile" "${outpath}/GNUmakefile"; do |
3258 |
for mkfile in "${outpath}/Makefile" "${outpath}/GNUmakefile"; do |
| 3259 |
[ -f "$mkfile" ] && chmod +w "$mkfile" |
3259 |
[ -f "$mkfile" ] && chmod +w "$mkfile" |
| 3260 |
$outpath/bin/qmake "QT_PROJECTS=$QT_PROJECTS" ${relpath}/projects.pro -o $mkfile |
3260 |
$outpath/bin/tqmake "QT_PROJECTS=$QT_PROJECTS" ${relpath}/projects.pro -o $mkfile |
| 3261 |
done |
3261 |
done |
| 3262 |
fi |
3262 |
fi |
| 3263 |
fi |
3263 |
fi |
|
Lines 3436-3442
for file in .projects .projects.3; do
Link Here
|
| 3436 |
# All changes made to this file will be lost. |
3436 |
# All changes made to this file will be lost. |
| 3437 |
|
3437 |
|
| 3438 |
all clean install qmake Makefile: FORCE |
3438 |
all clean install qmake Makefile: FORCE |
| 3439 |
$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a |
3439 |
$outpath/bin/tqmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a |
| 3440 |
cd $OUTDIR |
3440 |
cd $OUTDIR |
| 3441 |
\$(MAKE) \$@ |
3441 |
\$(MAKE) \$@ |
| 3442 |
|
3442 |
|
|
Lines 3444-3450
FORCE:
Link Here
|
| 3444 |
|
3444 |
|
| 3445 |
EOF |
3445 |
EOF |
| 3446 |
else |
3446 |
else |
| 3447 |
EXEC="$outpath/bin/qmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a" |
3447 |
EXEC="$outpath/bin/tqmake $QMAKE_SWITCHES $QMAKE_SPEC_ARGS -o $OUTDIR $a" |
| 3448 |
if [ "$OPT_VERBOSE" = "yes" ]; then |
3448 |
if [ "$OPT_VERBOSE" = "yes" ]; then |
| 3449 |
echo " (`basename $SPEC`)" |
3449 |
echo " (`basename $SPEC`)" |
| 3450 |
if echo '\c' | grep '\c' >/dev/null; then |
3450 |
if echo '\c' | grep '\c' >/dev/null; then |