|
Lines 60-66
Link Here
|
| 60 |
if [ "$QC_DEBUG" = "Y" ]; then |
60 |
if [ "$QC_DEBUG" = "Y" ]; then |
| 61 |
echo \$QTDIR not set... trying to find Qt manually |
61 |
echo \$QTDIR not set... trying to find Qt manually |
| 62 |
fi |
62 |
fi |
| 63 |
for p in /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib/tqt /usr/local/share/tqt /usr/lib/tqt3 /usr/local/lib/tqt3 /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib/qt /usr/local/share/qt /usr/lib/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do |
63 |
for p in /usr/lib64/tqt /usr/lib/tqt /usr/share/tqt /usr/share/tqt3 /usr/local/lib64/tqt /usr/local/lib/tqt /usr/local/share/tqt /usr/lib64/tqt3 /usr/lib/tqt3 /usr/local/lib64/tqt3 /usr/local/lib/tqt3 /usr/lib64/qt /usr/lib/qt /usr/share/qt /usr/share/qt3 /usr/local/lib64/qt /usr/local/lib/qt /usr/local/share/qt /usr/lib64/qt3 /usr/lib/qt3 /usr/local/lib64/qt3 /usr/local/lib/qt3 /usr/X11R6/share/qt /usr/qt/3 ; do |
| 64 |
if [ -d "$p/mkspecs" ]; then |
64 |
if [ -d "$p/mkspecs" ]; then |
| 65 |
QTDIR=$p |
65 |
QTDIR=$p |
| 66 |
break; |
66 |
break; |
|
Lines 79-93
Link Here
|
| 79 |
fi |
79 |
fi |
| 80 |
fi |
80 |
fi |
| 81 |
|
81 |
|
| 82 |
if [ ! -x "$QTDIR/bin/qmake" ]; then |
82 |
if [ ! -x "$QTDIR/bin/qmake-tqt3" ]; then |
| 83 |
if [ "$QC_DEBUG" = "Y" ]; then |
83 |
if [ "$QC_DEBUG" = "Y" ]; then |
| 84 |
echo Warning: qmake not in \$QTDIR/bin/qmake |
84 |
echo Warning: qmake-tqt3 not in \$QTDIR/bin/qmake-tqt3 |
| 85 |
echo trying to find it in \$PATH |
85 |
echo trying to find it in \$PATH |
| 86 |
fi |
86 |
fi |
| 87 |
qm=`type -p qmake` |
87 |
qm=`type -p qmake-tqt3` |
| 88 |
if [ -x "$qm" ]; then |
88 |
if [ -x "$qm" ]; then |
| 89 |
if [ "$QC_DEBUG" = "Y" ]; then |
89 |
if [ "$QC_DEBUG" = "Y" ]; then |
| 90 |
echo qmake found in $qm |
90 |
echo qmake-tqt3 found in $qm |
| 91 |
fi |
91 |
fi |
| 92 |
else |
92 |
else |
| 93 |
echo fail |
93 |
echo fail |
|
Lines 96-107
Link Here
|
| 96 |
echo or I missdetected \$QTDIR=$QTDIR |
96 |
echo or I missdetected \$QTDIR=$QTDIR |
| 97 |
echo |
97 |
echo |
| 98 |
echo Please set \$QTDIR manually and make sure that |
98 |
echo Please set \$QTDIR manually and make sure that |
| 99 |
echo \$QTDIR/bin/qmake exists. |
99 |
echo \$QTDIR/bin/qmake-tqt3 exists. |
| 100 |
echo |
100 |
echo |
| 101 |
exit 1; |
101 |
exit 1; |
| 102 |
fi |
102 |
fi |
| 103 |
else |
103 |
else |
| 104 |
qm=$QTDIR/bin/qmake |
104 |
qm=$QTDIR/bin/qmake-tqt3 |
| 105 |
fi |
105 |
fi |
| 106 |
|
106 |
|
| 107 |
gen_files() { |
107 |
gen_files() { |
|
Lines 185-190
Link Here
|
| 185 |
|
185 |
|
| 186 |
// Make sure tqtinterface can be found |
186 |
// Make sure tqtinterface can be found |
| 187 |
conf->addIncludePath("/usr/include/tqt"); |
187 |
conf->addIncludePath("/usr/include/tqt"); |
|
|
188 |
// Make sure tqt3 can be found |
| 189 |
conf->addIncludePath("/usr/include/tqt3"); |
| 188 |
|
190 |
|
| 189 |
return true; |
191 |
return true; |
| 190 |
} |
192 |
} |
|
Lines 507-513
Link Here
|
| 507 |
TEMPLATE = app |
509 |
TEMPLATE = app |
| 508 |
CONFIG += qt x11 thread console |
510 |
CONFIG += qt x11 thread console |
| 509 |
TARGET = conf |
511 |
TARGET = conf |
| 510 |
INCLUDEPATH += '/usr/include/tqt' |
512 |
INCLUDEPATH += '/usr/include/tqt' '/usr/include/tqt3' |
| 511 |
|
513 |
|
| 512 |
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' |
514 |
DEFINES += X11_INC='"\$\$QMAKE_INCDIR_X11"' |
| 513 |
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' |
515 |
DEFINES += X11_LIBDIR='"\$\$QMAKE_LIBDIR_X11"' |
|
Lines 533-539
Link Here
|
| 533 |
) |
535 |
) |
| 534 |
|
536 |
|
| 535 |
if [ "$?" != "0" ]; then |
537 |
if [ "$?" != "0" ]; then |
| 536 |
rm -rf .qconftemp |
538 |
# rm -rf .qconftemp |
| 537 |
echo fail |
539 |
echo fail |
| 538 |
echo |
540 |
echo |
| 539 |
echo "There was an error compiling 'conf'. Be sure you have a proper" |
541 |
echo "There was an error compiling 'conf'. Be sure you have a proper" |