By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 843
Collapse All | Expand All

(-)a/configure (-7 / +7 lines)
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
(-)a/mkspecs/aix-g++-64/qmake.conf (-2 / +2 lines)
Lines 63-70 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
63
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
63
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
64
QMAKE_LIBS_THREAD	= -lpthreads
64
QMAKE_LIBS_THREAD	= -lpthreads
65
65
66
QMAKE_MOC		= $(QTDIR)/bin/moc
66
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
67
QMAKE_UIC		= $(QTDIR)/bin/uic
67
QMAKE_UIC		= $(QTDIR)/bin/tquic
68
68
69
QMAKE_AR		= ar -X 64 cqs
69
QMAKE_AR		= ar -X 64 cqs
70
QMAKE_RANLIB		=
70
QMAKE_RANLIB		=
(-)a/mkspecs/aix-g++/qmake.conf (-2 / +2 lines)
Lines 63-70 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
63
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
63
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
64
QMAKE_LIBS_THREAD	= -lpthreads
64
QMAKE_LIBS_THREAD	= -lpthreads
65
65
66
QMAKE_MOC		= $(QTDIR)/bin/moc
66
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
67
QMAKE_UIC		= $(QTDIR)/bin/uic
67
QMAKE_UIC		= $(QTDIR)/bin/tquic
68
68
69
QMAKE_AR		= ar cqs
69
QMAKE_AR		= ar cqs
70
QMAKE_RANLIB		=
70
QMAKE_RANLIB		=
(-)a/mkspecs/aix-xlc-64/qmake.conf (-2 / +2 lines)
Lines 72-79 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
72
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
72
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
73
QMAKE_LIBS_THREAD	= -lpthreads
73
QMAKE_LIBS_THREAD	= -lpthreads
74
74
75
QMAKE_MOC		= $(QTDIR)/bin/moc
75
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
76
QMAKE_UIC		= $(QTDIR)/bin/uic
76
QMAKE_UIC		= $(QTDIR)/bin/tquic
77
77
78
QMAKE_AR		= ar -X64 cq
78
QMAKE_AR		= ar -X64 cq
79
QMAKE_RANLIB		= ranlib -X64
79
QMAKE_RANLIB		= ranlib -X64
(-)a/mkspecs/aix-xlc/qmake.conf (-2 / +2 lines)
Lines 70-77 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
70
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
70
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
71
QMAKE_LIBS_THREAD	= -lpthreads
71
QMAKE_LIBS_THREAD	= -lpthreads
72
72
73
QMAKE_MOC		= $(QTDIR)/bin/moc
73
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
74
QMAKE_UIC		= $(QTDIR)/bin/uic
74
QMAKE_UIC		= $(QTDIR)/bin/tquic
75
75
76
QMAKE_AR		= ar cq
76
QMAKE_AR		= ar cq
77
QMAKE_RANLIB		= ranlib
77
QMAKE_RANLIB		= ranlib
(-)a/mkspecs/bsdi-g++/qmake.conf (-2 / +2 lines)
Lines 66-73 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
67
QMAKE_LIBS_THREAD	=
67
QMAKE_LIBS_THREAD	=
68
68
69
QMAKE_MOC		= $(QTDIR)/bin/moc
69
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
70
QMAKE_UIC		= $(QTDIR)/bin/uic
70
QMAKE_UIC		= $(QTDIR)/bin/tquic
71
71
72
QMAKE_AR		= ar cqs
72
QMAKE_AR		= ar cqs
73
QMAKE_RANLIB		=
73
QMAKE_RANLIB		=
(-)a/mkspecs/cygwin-g++/qmake.conf (-2 / +2 lines)
Lines 68-75 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
68
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
68
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
69
QMAKE_LIBS_THREAD	= -lpthread
69
QMAKE_LIBS_THREAD	= -lpthread
70
70
71
QMAKE_MOC		= $(QTDIR)/bin/moc
71
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
72
QMAKE_UIC		= $(QTDIR)/bin/uic
72
QMAKE_UIC		= $(QTDIR)/bin/tquic
73
73
74
QMAKE_AR		= ar cqs
74
QMAKE_AR		= ar cqs
75
QMAKE_RANLIB		=
75
QMAKE_RANLIB		=
(-)a/mkspecs/darwin-g++/qmake.conf (-2 / +2 lines)
Lines 72-79 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
72
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
72
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
73
QMAKE_LIBS_THREAD	=
73
QMAKE_LIBS_THREAD	=
74
74
75
QMAKE_MOC		= $(QTDIR)/bin/moc
75
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
76
QMAKE_UIC		= $(QTDIR)/bin/uic
76
QMAKE_UIC		= $(QTDIR)/bin/tquic
77
77
78
QMAKE_AR		= ar cq
78
QMAKE_AR		= ar cq
79
QMAKE_RANLIB		= ranlib -s
79
QMAKE_RANLIB		= ranlib -s
(-)a/mkspecs/dgux-g++/qmake.conf (-2 / +2 lines)
Lines 59-66 QMAKE_LIBS_QT = -lqt Link Here
59
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
59
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
60
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
60
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
61
61
62
QMAKE_MOC		= $(QTDIR)/bin/moc
62
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
63
QMAKE_UIC		= $(QTDIR)/bin/uic
63
QMAKE_UIC		= $(QTDIR)/bin/tquic
64
64
65
QMAKE_AR		= ar cq
65
QMAKE_AR		= ar cq
66
QMAKE_RANLIB		=
66
QMAKE_RANLIB		=
(-)a/mkspecs/freebsd-g++/qmake.conf (-2 / +2 lines)
Lines 64-71 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
64
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
64
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
65
QMAKE_LIBS_THREAD	=
65
QMAKE_LIBS_THREAD	=
66
66
67
QMAKE_MOC		= $(QTDIR)/bin/moc
67
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
68
QMAKE_UIC		= $(QTDIR)/bin/uic
68
QMAKE_UIC		= $(QTDIR)/bin/tquic
69
69
70
QMAKE_AR		= ar cqs
70
QMAKE_AR		= ar cqs
71
QMAKE_RANLIB		=
71
QMAKE_RANLIB		=
(-)a/mkspecs/freebsd-g++34/qmake.conf (-2 / +2 lines)
Lines 64-71 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
64
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
64
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
65
QMAKE_LIBS_THREAD	=
65
QMAKE_LIBS_THREAD	=
66
66
67
QMAKE_MOC		= $(QTDIR)/bin/moc
67
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
68
QMAKE_UIC		= $(QTDIR)/bin/uic
68
QMAKE_UIC		= $(QTDIR)/bin/tquic
69
69
70
QMAKE_AR		= ar cqs
70
QMAKE_AR		= ar cqs
71
QMAKE_RANLIB		=
71
QMAKE_RANLIB		=
(-)a/mkspecs/freebsd-icc/qmake.conf (-2 / +2 lines)
Lines 82-89 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
82
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
82
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
83
QMAKE_LIBS_THREAD	=
83
QMAKE_LIBS_THREAD	=
84
84
85
QMAKE_MOC		= $(QTDIR)/bin/moc
85
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
86
QMAKE_UIC		= $(QTDIR)/bin/uic
86
QMAKE_UIC		= $(QTDIR)/bin/tquic
87
87
88
QMAKE_AR		= ar cqs
88
QMAKE_AR		= ar cqs
89
QMAKE_RANLIB		= 
89
QMAKE_RANLIB		= 
(-)a/mkspecs/hpux-acc-64/qmake.conf (-2 / +2 lines)
Lines 108-115 QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt Link Here
108
QMAKE_LIBS_THREAD	= -lpthread
108
QMAKE_LIBS_THREAD	= -lpthread
109
QMAKE_LIBS_YACC		= -ly
109
QMAKE_LIBS_YACC		= -ly
110
110
111
QMAKE_MOC		= $(QTDIR)/bin/moc
111
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
112
QMAKE_UIC		= $(QTDIR)/bin/uic
112
QMAKE_UIC		= $(QTDIR)/bin/tquic
113
113
114
QMAKE_AR		= ar cqs
114
QMAKE_AR		= ar cqs
115
QMAKE_RANLIB		=
115
QMAKE_RANLIB		=
(-)a/mkspecs/hpux-acc-o64/qmake.conf (-2 / +2 lines)
Lines 107-114 QMAKE_LIBS_OPENGL_QT = -lGL -lXmu Link Here
107
QMAKE_LIBS_THREAD	= -lpthread
107
QMAKE_LIBS_THREAD	= -lpthread
108
QMAKE_LIBS_YACC		= -ly
108
QMAKE_LIBS_YACC		= -ly
109
109
110
QMAKE_MOC		= $(QTDIR)/bin/moc
110
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
111
QMAKE_UIC		= $(QTDIR)/bin/uic
111
QMAKE_UIC		= $(QTDIR)/bin/tquic
112
112
113
QMAKE_AR		= ar cqs
113
QMAKE_AR		= ar cqs
114
QMAKE_RANLIB		=
114
QMAKE_RANLIB		=
(-)a/mkspecs/hpux-acc/qmake.conf (-2 / +2 lines)
Lines 87-94 QMAKE_LIBS_OPENGL_QT = -lGL -lXt Link Here
87
QMAKE_LIBS_THREAD	= -lpthread
87
QMAKE_LIBS_THREAD	= -lpthread
88
QMAKE_LIBS_YACC		= -ly
88
QMAKE_LIBS_YACC		= -ly
89
89
90
QMAKE_MOC		= $(QTDIR)/bin/moc
90
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
91
QMAKE_UIC		= $(QTDIR)/bin/uic
91
QMAKE_UIC		= $(QTDIR)/bin/tquic
92
92
93
QMAKE_AR		= ar cqs
93
QMAKE_AR		= ar cqs
94
QMAKE_RANLIB		=
94
QMAKE_RANLIB		=
(-)a/mkspecs/hpux-cc/qmake.conf (-2 / +2 lines)
Lines 82-89 QMAKE_LIBS_QT = -lqt Link Here
82
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
82
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
83
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
83
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
84
84
85
QMAKE_MOC		= $(QTDIR)/bin/moc
85
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
86
QMAKE_UIC		= $(QTDIR)/bin/uic
86
QMAKE_UIC		= $(QTDIR)/bin/tquic
87
87
88
QMAKE_AR		= ar cqs
88
QMAKE_AR		= ar cqs
89
QMAKE_RANLIB		=
89
QMAKE_RANLIB		=
(-)a/mkspecs/hpux-g++-64/qmake.conf (-2 / +2 lines)
Lines 68-75 QMAKE_LIBS_OPENGL_QT = -lGL -lXmu Link Here
68
QMAKE_LIBS_THREAD	= -lpthread
68
QMAKE_LIBS_THREAD	= -lpthread
69
QMAKE_LIBS_YACC		= -ly
69
QMAKE_LIBS_YACC		= -ly
70
70
71
QMAKE_MOC		= $(QTDIR)/bin/moc
71
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
72
QMAKE_UIC		= $(QTDIR)/bin/uic
72
QMAKE_UIC		= $(QTDIR)/bin/tquic
73
73
74
QMAKE_AR		= ar cqs
74
QMAKE_AR		= ar cqs
75
QMAKE_RANLIB		=
75
QMAKE_RANLIB		=
(-)a/mkspecs/hpux-g++/qmake.conf (-2 / +2 lines)
Lines 69-76 QMAKE_LIBS_OPENGL_QT = -lGL -lXmu Link Here
69
QMAKE_LIBS_THREAD	= -lpthread
69
QMAKE_LIBS_THREAD	= -lpthread
70
QMAKE_LIBS_YACC		= -ly
70
QMAKE_LIBS_YACC		= -ly
71
71
72
QMAKE_MOC		= $(QTDIR)/bin/moc
72
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
73
QMAKE_UIC		= $(QTDIR)/bin/uic
73
QMAKE_UIC		= $(QTDIR)/bin/tquic
74
74
75
QMAKE_AR		= ar cqs
75
QMAKE_AR		= ar cqs
76
QMAKE_RANLIB		=
76
QMAKE_RANLIB		=
(-)a/mkspecs/hpuxi-acc-32/qmake.conf (-2 / +2 lines)
Lines 106-113 QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt Link Here
106
QMAKE_LIBS_THREAD	= -lpthread
106
QMAKE_LIBS_THREAD	= -lpthread
107
QMAKE_LIBS_YACC		= -ly
107
QMAKE_LIBS_YACC		= -ly
108
108
109
QMAKE_MOC		= $(QTDIR)/bin/moc
109
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
110
QMAKE_UIC		= $(QTDIR)/bin/uic
110
QMAKE_UIC		= $(QTDIR)/bin/tquic
111
111
112
QMAKE_AR		= ar cqs
112
QMAKE_AR		= ar cqs
113
QMAKE_RANLIB		=
113
QMAKE_RANLIB		=
(-)a/mkspecs/hpuxi-acc-64/qmake.conf (-2 / +2 lines)
Lines 106-113 QMAKE_LIBS_OPENGL_QT = -lGL -lXmu -lXt Link Here
106
QMAKE_LIBS_THREAD	= -lpthread
106
QMAKE_LIBS_THREAD	= -lpthread
107
QMAKE_LIBS_YACC		= -ly
107
QMAKE_LIBS_YACC		= -ly
108
108
109
QMAKE_MOC		= $(QTDIR)/bin/moc
109
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
110
QMAKE_UIC		= $(QTDIR)/bin/uic
110
QMAKE_UIC		= $(QTDIR)/bin/tquic
111
111
112
QMAKE_AR		= ar cqs
112
QMAKE_AR		= ar cqs
113
QMAKE_RANLIB		=
113
QMAKE_RANLIB		=
(-)a/mkspecs/hurd-g++/qmake.conf (-2 / +2 lines)
Lines 67-74 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
67
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
67
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
68
QMAKE_LIBS_THREAD	= 
68
QMAKE_LIBS_THREAD	= 
69
69
70
QMAKE_MOC		= $(QTDIR)/bin/moc
70
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
71
QMAKE_UIC		= $(QTDIR)/bin/uic
71
QMAKE_UIC		= $(QTDIR)/bin/tquic
72
72
73
QMAKE_AR		= ar cqs
73
QMAKE_AR		= ar cqs
74
QMAKE_RANLIB		=
74
QMAKE_RANLIB		=
(-)a/mkspecs/irix-cc-64/qmake.conf (-2 / +2 lines)
Lines 95-102 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm Link Here
95
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
95
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
96
QMAKE_LIBS_THREAD	= -lpthread
96
QMAKE_LIBS_THREAD	= -lpthread
97
97
98
QMAKE_MOC		= $(QTDIR)/bin/moc
98
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
99
QMAKE_UIC		= $(QTDIR)/bin/uic
99
QMAKE_UIC		= $(QTDIR)/bin/tquic
100
100
101
QMAKE_AR		= CC -ar -o
101
QMAKE_AR		= CC -ar -o
102
QMAKE_RANLIB		=
102
QMAKE_RANLIB		=
(-)a/mkspecs/irix-cc-o32/qmake.conf (-2 / +2 lines)
Lines 69-76 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm Link Here
69
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
69
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
70
QMAKE_LIBS_THREAD	= -lpthread
70
QMAKE_LIBS_THREAD	= -lpthread
71
71
72
QMAKE_MOC		= $(QTDIR)/bin/moc
72
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
73
QMAKE_UIC		= $(QTDIR)/bin/uic
73
QMAKE_UIC		= $(QTDIR)/bin/tquic
74
74
75
QMAKE_AR		= ar cq
75
QMAKE_AR		= ar cq
76
QMAKE_RANLIB		=
76
QMAKE_RANLIB		=
(-)a/mkspecs/irix-cc/qmake.conf (-2 / +2 lines)
Lines 95-102 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lm Link Here
95
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
95
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
96
QMAKE_LIBS_THREAD	= -lpthread
96
QMAKE_LIBS_THREAD	= -lpthread
97
97
98
QMAKE_MOC		= $(QTDIR)/bin/moc
98
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
99
QMAKE_UIC		= $(QTDIR)/bin/uic
99
QMAKE_UIC		= $(QTDIR)/bin/tquic
100
100
101
QMAKE_AR		= CC -ar -o
101
QMAKE_AR		= CC -ar -o
102
QMAKE_RANLIB		=
102
QMAKE_RANLIB		=
(-)a/mkspecs/irix-g++/qmake.conf (-2 / +2 lines)
Lines 66-73 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
67
QMAKE_LIBS_THREAD	= -lpthread
67
QMAKE_LIBS_THREAD	= -lpthread
68
68
69
QMAKE_MOC		= $(QTDIR)/bin/moc
69
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
70
QMAKE_UIC		= $(QTDIR)/bin/uic
70
QMAKE_UIC		= $(QTDIR)/bin/tquic
71
71
72
QMAKE_AR		= ar cq
72
QMAKE_AR		= ar cq
73
QMAKE_RANLIB		=
73
QMAKE_RANLIB		=
(-)a/mkspecs/linux-cxx/qmake.conf (-2 / +2 lines)
Lines 61-68 QMAKE_LIBS_QT = -lqt Link Here
61
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
61
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
62
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
62
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
63
63
64
QMAKE_MOC		= $(QTDIR)/bin/moc
64
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
65
QMAKE_UIC		= $(QTDIR)/bin/uic
65
QMAKE_UIC		= $(QTDIR)/bin/tquic
66
66
67
QMAKE_AR		= ar cqs
67
QMAKE_AR		= ar cqs
68
QMAKE_RANLIB		=
68
QMAKE_RANLIB		=
(-)a/mkspecs/linux-ecc-64/qmake.conf (-2 / +2 lines)
Lines 66-73 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
67
QMAKE_LIBS_THREAD	= -lpthread
67
QMAKE_LIBS_THREAD	= -lpthread
68
68
69
QMAKE_MOC		= $(QTDIR)/bin/moc
69
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
70
QMAKE_UIC		= $(QTDIR)/bin/uic
70
QMAKE_UIC		= $(QTDIR)/bin/tquic
71
71
72
QMAKE_AR		= ar cqs
72
QMAKE_AR		= ar cqs
73
QMAKE_RANLIB		=
73
QMAKE_RANLIB		=
(-)a/mkspecs/linux-g++-32/qmake.conf (-2 / +2 lines)
Lines 68-75 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
68
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
68
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
69
QMAKE_LIBS_THREAD	= -lpthread
69
QMAKE_LIBS_THREAD	= -lpthread
70
70
71
QMAKE_MOC		= $(QTDIR)/bin/moc
71
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
72
QMAKE_UIC		= $(QTDIR)/bin/uic
72
QMAKE_UIC		= $(QTDIR)/bin/tquic
73
73
74
QMAKE_AR		= ar cqs
74
QMAKE_AR		= ar cqs
75
QMAKE_RANLIB		=
75
QMAKE_RANLIB		=
(-)a/mkspecs/linux-g++-64/qmake.conf (-2 / +2 lines)
Lines 71-78 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
71
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
71
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
72
QMAKE_LIBS_THREAD	= -lpthread
72
QMAKE_LIBS_THREAD	= -lpthread
73
73
74
QMAKE_MOC		= $(QTDIR)/bin/moc
74
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
75
QMAKE_UIC		= $(QTDIR)/bin/uic
75
QMAKE_UIC		= $(QTDIR)/bin/tquic
76
76
77
QMAKE_AR		= ar cqs
77
QMAKE_AR		= ar cqs
78
QMAKE_RANLIB		=
78
QMAKE_RANLIB		=
(-)a/mkspecs/linux-g++-sparc/qmake.conf (-2 / +2 lines)
Lines 68-75 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
68
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
68
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
69
QMAKE_LIBS_THREAD	= -lpthread
69
QMAKE_LIBS_THREAD	= -lpthread
70
70
71
QMAKE_MOC		= $(QTDIR)/bin/moc
71
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
72
QMAKE_UIC		= $(QTDIR)/bin/uic
72
QMAKE_UIC		= $(QTDIR)/bin/tquic
73
73
74
QMAKE_AR		= ar cqs
74
QMAKE_AR		= ar cqs
75
QMAKE_RANLIB		=
75
QMAKE_RANLIB		=
(-)a/mkspecs/linux-g++/qmake.conf (-2 / +2 lines)
Lines 68-75 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
68
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
68
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
69
QMAKE_LIBS_THREAD	= -lpthread
69
QMAKE_LIBS_THREAD	= -lpthread
70
70
71
QMAKE_MOC		= $(QTDIR)/bin/moc
71
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
72
QMAKE_UIC		= $(QTDIR)/bin/uic
72
QMAKE_UIC		= $(QTDIR)/bin/tquic
73
73
74
QMAKE_AR		= ar cqs
74
QMAKE_AR		= ar cqs
75
QMAKE_RANLIB		=
75
QMAKE_RANLIB		=
(-)a/mkspecs/linux-icc/qmake.conf (-2 / +2 lines)
Lines 66-73 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
67
QMAKE_LIBS_THREAD	= -lpthread
67
QMAKE_LIBS_THREAD	= -lpthread
68
68
69
QMAKE_MOC		= $(QTDIR)/bin/moc
69
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
70
QMAKE_UIC		= $(QTDIR)/bin/uic
70
QMAKE_UIC		= $(QTDIR)/bin/tquic
71
71
72
QMAKE_AR		= ar cqs
72
QMAKE_AR		= ar cqs
73
QMAKE_RANLIB		=
73
QMAKE_RANLIB		=
(-)a/mkspecs/linux-kcc/qmake.conf (-2 / +2 lines)
Lines 73-80 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
73
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
73
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
74
QMAKE_LIBS_THREAD	=
74
QMAKE_LIBS_THREAD	=
75
75
76
QMAKE_MOC		= $(QTDIR)/bin/moc
76
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
77
QMAKE_UIC		= $(QTDIR)/bin/uic
77
QMAKE_UIC		= $(QTDIR)/bin/tquic
78
78
79
QMAKE_AR		= ar cqs
79
QMAKE_AR		= ar cqs
80
QMAKE_RANLIB		=
80
QMAKE_RANLIB		=
(-)a/mkspecs/linux-kylix/qmake.conf (-2 / +2 lines)
Lines 65-72 QMAKE_LIBS_OPENGL = -llibGLU -llibGL -llibXmu Link Here
65
QMAKE_LIBS_OPENGL_QT	= -llibGL -llibXmu
65
QMAKE_LIBS_OPENGL_QT	= -llibGL -llibXmu
66
QMAKE_LIBS_THREAD	= -llibpthread
66
QMAKE_LIBS_THREAD	= -llibpthread
67
67
68
QMAKE_MOC		= $(QTDIR)/bin/moc
68
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
69
QMAKE_UIC		= $(QTDIR)/bin/uic
69
QMAKE_UIC		= $(QTDIR)/bin/tquic
70
70
71
QMAKE_AR		= ar cqs
71
QMAKE_AR		= ar cqs
72
QMAKE_RANLIB		=
72
QMAKE_RANLIB		=
(-)a/mkspecs/linux-pgcc/qmake.conf (-2 / +2 lines)
Lines 66-73 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
67
QMAKE_LIBS_THREAD	= -lpthread
67
QMAKE_LIBS_THREAD	= -lpthread
68
68
69
QMAKE_MOC		= $(QTDIR)/bin/moc
69
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
70
QMAKE_UIC		= $(QTDIR)/bin/uic
70
QMAKE_UIC		= $(QTDIR)/bin/tquic
71
71
72
QMAKE_AR		= ar cqs
72
QMAKE_AR		= ar cqs
73
QMAKE_RANLIB		=
73
QMAKE_RANLIB		=
(-)a/mkspecs/lynxos-g++/qmake.conf (-2 / +2 lines)
Lines 67-74 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
67
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
67
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
68
QMAKE_LIBS_THREAD	= -lpthread
68
QMAKE_LIBS_THREAD	= -lpthread
69
69
70
QMAKE_MOC		= $(QTDIR)/bin/moc
70
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
71
QMAKE_UIC		= $(QTDIR)/bin/uic
71
QMAKE_UIC		= $(QTDIR)/bin/tquic
72
72
73
QMAKE_AR		= ar cqs
73
QMAKE_AR		= ar cqs
74
QMAKE_RANLIB		=
74
QMAKE_RANLIB		=
(-)a/mkspecs/macx-g++/qmake.conf (-2 / +2 lines)
Lines 70-77 QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL Link Here
70
QMAKE_LIBS_OPENGL_QT	= $$QMAKE_LIBS_OPENGL
70
QMAKE_LIBS_OPENGL_QT	= $$QMAKE_LIBS_OPENGL
71
QMAKE_LIBS_THREAD	= 
71
QMAKE_LIBS_THREAD	= 
72
72
73
QMAKE_MOC		= $(QTDIR)/bin/moc
73
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
74
QMAKE_UIC		= $(QTDIR)/bin/uic
74
QMAKE_UIC		= $(QTDIR)/bin/tquic
75
75
76
QMAKE_AR		= ar cq
76
QMAKE_AR		= ar cq
77
QMAKE_RANLIB		= ranlib -s
77
QMAKE_RANLIB		= ranlib -s
(-)a/mkspecs/macx-pbuilder/qmake.conf (-2 / +2 lines)
Lines 61-68 QMAKE_LIBS_THREAD = Link Here
61
QMAKE_LIBS_OPENGL	= -framework OpenGL -framework AGL
61
QMAKE_LIBS_OPENGL	= -framework OpenGL -framework AGL
62
QMAKE_LIBS_OPENGL_QT	= $$QMAKE_LIBS_OPENGL
62
QMAKE_LIBS_OPENGL_QT	= $$QMAKE_LIBS_OPENGL
63
63
64
QMAKE_MOC		= $(QTDIR)/bin/moc
64
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
65
QMAKE_UIC		= $(QTDIR)/bin/uic
65
QMAKE_UIC		= $(QTDIR)/bin/tquic
66
66
67
QMAKE_AR		= ar cq
67
QMAKE_AR		= ar cq
68
QMAKE_RANLIB		= ranlib -s
68
QMAKE_RANLIB		= ranlib -s
(-)a/mkspecs/macx-xlc/qmake.conf (-2 / +2 lines)
Lines 70-77 QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL Link Here
70
QMAKE_LIBS_OPENGL_QT	= $$QMAKE_LIBS_OPENGL
70
QMAKE_LIBS_OPENGL_QT	= $$QMAKE_LIBS_OPENGL
71
#QMAKE_LIBS_THREAD	= -lpthreads
71
#QMAKE_LIBS_THREAD	= -lpthreads
72
72
73
QMAKE_MOC		= $(QTDIR)/bin/moc
73
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
74
QMAKE_UIC		= $(QTDIR)/bin/uic
74
QMAKE_UIC		= $(QTDIR)/bin/tquic
75
75
76
QMAKE_AR		= ar cq
76
QMAKE_AR		= ar cq
77
QMAKE_RANLIB		= ranlib -s
77
QMAKE_RANLIB		= ranlib -s
(-)a/mkspecs/netbsd-g++/qmake.conf (-2 / +2 lines)
Lines 64-71 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
64
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
64
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
65
QMAKE_LIBS_THREAD	=
65
QMAKE_LIBS_THREAD	=
66
66
67
QMAKE_MOC		= $(QTDIR)/bin/moc
67
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
68
QMAKE_UIC		= $(QTDIR)/bin/uic
68
QMAKE_UIC		= $(QTDIR)/bin/tquic
69
69
70
QMAKE_AR		= ar cqs
70
QMAKE_AR		= ar cqs
71
QMAKE_RANLIB		= ranlib
71
QMAKE_RANLIB		= ranlib
(-)a/mkspecs/openbsd-g++/qmake.conf (-2 / +2 lines)
Lines 65-72 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_THREAD	=
66
QMAKE_LIBS_THREAD	=
67
67
68
QMAKE_MOC		= $(QTDIR)/bin/moc
68
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
69
QMAKE_UIC		= $(QTDIR)/bin/uic
69
QMAKE_UIC		= $(QTDIR)/bin/tquic
70
70
71
QMAKE_AR		= ar q
71
QMAKE_AR		= ar q
72
QMAKE_RANLIB		= ranlib
72
QMAKE_RANLIB		= ranlib
(-)a/mkspecs/qnx-g++/qmake.conf (-2 / +2 lines)
Lines 65-72 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_THREAD	=
66
QMAKE_LIBS_THREAD	=
67
67
68
QMAKE_MOC		= $(QTDIR)/bin/moc
68
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
69
QMAKE_UIC		= $(QTDIR)/bin/uic
69
QMAKE_UIC		= $(QTDIR)/bin/tquic
70
70
71
QMAKE_AR		= ar cqs
71
QMAKE_AR		= ar cqs
72
QMAKE_RANLIB		=
72
QMAKE_RANLIB		=
(-)a/mkspecs/reliant-cds-64/qmake.conf (-2 / +2 lines)
Lines 65-72 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_THREAD	=
66
QMAKE_LIBS_THREAD	=
67
67
68
QMAKE_MOC		= $(QTDIR)/bin/moc
68
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
69
QMAKE_UIC		= $(QTDIR)/bin/uic
69
QMAKE_UIC		= $(QTDIR)/bin/tquic
70
70
71
QMAKE_AR		= CC -xar -o
71
QMAKE_AR		= CC -xar -o
72
QMAKE_RANLIB		=
72
QMAKE_RANLIB		=
(-)a/mkspecs/reliant-cds/qmake.conf (-2 / +2 lines)
Lines 65-72 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_THREAD	=
66
QMAKE_LIBS_THREAD	=
67
67
68
QMAKE_MOC		= $(QTDIR)/bin/moc
68
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
69
QMAKE_UIC		= $(QTDIR)/bin/uic
69
QMAKE_UIC		= $(QTDIR)/bin/tquic
70
70
71
QMAKE_AR		= CC -xar -o
71
QMAKE_AR		= CC -xar -o
72
QMAKE_RANLIB		=
72
QMAKE_RANLIB		=
(-)a/mkspecs/sco-cc/qmake.conf (-2 / +2 lines)
Lines 61-68 QMAKE_LIBS_QT = -lqt Link Here
61
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu -lXt
61
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu -lXt
62
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
62
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
63
63
64
QMAKE_MOC		= $(QTDIR)/bin/moc
64
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
65
QMAKE_UIC		= $(QTDIR)/bin/uic
65
QMAKE_UIC		= $(QTDIR)/bin/tquic
66
66
67
QMAKE_AR		= ar cq
67
QMAKE_AR		= ar cq
68
QMAKE_RANLIB		=
68
QMAKE_RANLIB		=
(-)a/mkspecs/sco-g++/qmake.conf (-2 / +2 lines)
Lines 58-65 QMAKE_LIBS_QT = -lqt Link Here
58
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
58
QMAKE_LIBS_OPENGL	= -lGLU -lGL -lXmu
59
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
59
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
60
60
61
QMAKE_MOC		= $(QTDIR)/bin/moc
61
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
62
QMAKE_UIC		= $(QTDIR)/bin/uic
62
QMAKE_UIC		= $(QTDIR)/bin/tquic
63
63
64
QMAKE_AR		= ar cqs
64
QMAKE_AR		= ar cqs
65
QMAKE_RANLIB		=
65
QMAKE_RANLIB		=
(-)a/mkspecs/solaris-cc-64/qmake.conf (-2 / +2 lines)
Lines 83-90 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
83
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
83
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
84
QMAKE_LIBS_THREAD	= -lpthread -lrt
84
QMAKE_LIBS_THREAD	= -lpthread -lrt
85
85
86
QMAKE_MOC		= $(QTDIR)/bin/moc
86
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
87
QMAKE_UIC		= $(QTDIR)/bin/uic
87
QMAKE_UIC		= $(QTDIR)/bin/tquic
88
88
89
QMAKE_AR		= CC -xar -o
89
QMAKE_AR		= CC -xar -o
90
QMAKE_RANLIB		=
90
QMAKE_RANLIB		=
(-)a/mkspecs/solaris-cc/qmake.conf (-2 / +2 lines)
Lines 66-73 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
67
QMAKE_LIBS_THREAD	= -lpthread -lrt
67
QMAKE_LIBS_THREAD	= -lpthread -lrt
68
68
69
QMAKE_MOC		= $(QTDIR)/bin/moc
69
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
70
QMAKE_UIC		= $(QTDIR)/bin/uic
70
QMAKE_UIC		= $(QTDIR)/bin/tquic
71
71
72
QMAKE_AR		= CC -xar -o
72
QMAKE_AR		= CC -xar -o
73
QMAKE_RANLIB		=
73
QMAKE_RANLIB		=
(-)a/mkspecs/solaris-g++-64/qmake.conf (-2 / +2 lines)
Lines 87-94 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
87
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
87
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
88
QMAKE_LIBS_THREAD	= -lpthread -lrt
88
QMAKE_LIBS_THREAD	= -lpthread -lrt
89
89
90
QMAKE_MOC		= $(QTDIR)/bin/moc
90
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
91
QMAKE_UIC		= $(QTDIR)/bin/uic
91
QMAKE_UIC		= $(QTDIR)/bin/tquic
92
92
93
QMAKE_AR		= ar cq
93
QMAKE_AR		= ar cq
94
QMAKE_RANLIB		=
94
QMAKE_RANLIB		=
(-)a/mkspecs/solaris-g++/qmake.conf (-2 / +2 lines)
Lines 70-77 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
70
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
70
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
71
QMAKE_LIBS_THREAD	= -lpthread -lrt
71
QMAKE_LIBS_THREAD	= -lpthread -lrt
72
72
73
QMAKE_MOC		= $(QTDIR)/bin/moc
73
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
74
QMAKE_UIC		= $(QTDIR)/bin/uic
74
QMAKE_UIC		= $(QTDIR)/bin/tquic
75
75
76
QMAKE_AR		= ar cq
76
QMAKE_AR		= ar cq
77
QMAKE_RANLIB		=
77
QMAKE_RANLIB		=
(-)a/mkspecs/tru64-cxx/qmake.conf (-2 / +2 lines)
Lines 63-70 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
63
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
63
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
64
QMAKE_LIBS_THREAD	= -lrt
64
QMAKE_LIBS_THREAD	= -lrt
65
65
66
QMAKE_MOC		= $(QTDIR)/bin/moc
66
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
67
QMAKE_UIC		= $(QTDIR)/bin/uic
67
QMAKE_UIC		= $(QTDIR)/bin/tquic
68
68
69
QMAKE_AR		= ar cqs
69
QMAKE_AR		= ar cqs
70
QMAKE_RANLIB		=
70
QMAKE_RANLIB		=
(-)a/mkspecs/tru64-g++/qmake.conf (-2 / +2 lines)
Lines 63-70 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu Link Here
63
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
63
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
64
QMAKE_LIBS_THREAD	= -lpthread -lexc -lrt
64
QMAKE_LIBS_THREAD	= -lpthread -lexc -lrt
65
65
66
QMAKE_MOC		= $(QTDIR)/bin/moc
66
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
67
QMAKE_UIC		= $(QTDIR)/bin/uic
67
QMAKE_UIC		= $(QTDIR)/bin/tquic
68
68
69
QMAKE_AR		= ar cqs
69
QMAKE_AR		= ar cqs
70
QMAKE_RANLIB		=
70
QMAKE_RANLIB		=
(-)a/mkspecs/unixware-cc/qmake.conf (-2 / +2 lines)
Lines 68-75 QMAKE_LIBS_OPENGL_QT = -lGL -lXmu Link Here
68
68
69
QMAKE_LIBS_THREAD	=
69
QMAKE_LIBS_THREAD	=
70
70
71
QMAKE_MOC		= $(QTDIR)/bin/moc
71
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
72
QMAKE_UIC		= $(QTDIR)/bin/uic
72
QMAKE_UIC		= $(QTDIR)/bin/tquic
73
73
74
QMAKE_AR		= ar cq
74
QMAKE_AR		= ar cq
75
QMAKE_RANLIB		=
75
QMAKE_RANLIB		=
(-)a/mkspecs/unixware-g++/qmake.conf (-2 / +2 lines)
Lines 65-72 QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu -lXt Link Here
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
65
QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
66
QMAKE_LIBS_THREAD	= -lthread
66
QMAKE_LIBS_THREAD	= -lthread
67
67
68
QMAKE_MOC		= $(QTDIR)/bin/moc
68
QMAKE_MOC		= $(QTDIR)/bin/tqmoc
69
QMAKE_UIC		= $(QTDIR)/bin/uic
69
QMAKE_UIC		= $(QTDIR)/bin/tquic
70
70
71
QMAKE_AR		= ar cq
71
QMAKE_AR		= ar cq
72
QMAKE_RANLIB		=
72
QMAKE_RANLIB		=
(-)a/mkspecs/win32-watcom/qmake.conf (-2 / +2 lines)
Lines 51-58 QMAKE_LIBS_QT_ENTRY = %QTDIR%\lib\qtmain.lib Link Here
51
51
52
QMAKE_LIBS_OPENGL	= opengl32.lib
52
QMAKE_LIBS_OPENGL	= opengl32.lib
53
53
54
QMAKE_MOC		= $(QTDIR)/bin/moc.exe
54
QMAKE_MOC		= $(QTDIR)/bin/tqmoc.exe
55
QMAKE_UIC		= $(QTDIR)/bin/uic.exe
55
QMAKE_UIC		= $(QTDIR)/bin/tquic.exe
56
QMAKE_IDC		= $(QTDIR)/bin/idc.exe
56
QMAKE_IDC		= $(QTDIR)/bin/idc.exe
57
57
58
QMAKE_LIB		= wlib -b -c -n -q -p=512
58
QMAKE_LIB		= wlib -b -c -n -q -p=512
(-)a/qmake/Makefile.unix (-5 / +5 lines)
Lines 1-4 Link Here
1
#qmake code
1
#tqmake code
2
OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \
2
OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \
3
     borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \
3
     borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \
4
     winmakefile.o projectgenerator.o metrowerks_xml.o  pbuilder_pbx.o \
4
     winmakefile.o projectgenerator.o metrowerks_xml.o  pbuilder_pbx.o \
Lines 39-52 CXXFLAGS= @QMAKE_CXXFLAGS@ \ Link Here
39
	-DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
39
	-DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
40
LFLAGS=@QMAKE_LFLAGS@
40
LFLAGS=@QMAKE_LFLAGS@
41
41
42
qmake: $(OBJS) $(QOBJS)
42
tqmake: $(OBJS) $(QOBJS)
43
	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
43
	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
44
	rm -f @BUILD_PATH@/bin/$@
44
	rm -f @BUILD_PATH@/bin/$@
45
	ln -s ../qmake/$@ @BUILD_PATH@/bin/$@
45
	ln -s ../qmake/$@ @BUILD_PATH@/bin/$@
46
46
47
install: qmake
47
install: tqmake
48
	[ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@
48
	[ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@
49
	-cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@
49
	-cp -f @BUILD_PATH@/bin/tqmake @QT_INSTALL_BINS@
50
	[ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@
50
	[ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@
51
	-cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@
51
	-cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@
52
	-ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default
52
	-ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default
Lines 55-61 clean:: Link Here
55
	rm -f $(OBJS) $(QOBJS)
55
	rm -f $(OBJS) $(QOBJS)
56
56
57
distclean:: clean
57
distclean:: clean
58
	rm -rf qmake .deps
58
	rm -rf tqmake .deps
59
59
60
depend:
60
depend:
61
	makedepend $(CXXFLAGS) -D__MAKEDEPEND__ $(DEPEND_SRC)
61
	makedepend $(CXXFLAGS) -D__MAKEDEPEND__ $(DEPEND_SRC)
(-)a/qmake/Makefile.win32-g++ (-5 / +5 lines)
Lines 9-19 CFLAGS = -c -o$@ -O \ Link Here
9
CXXFLAGS    =   $(CFLAGS)
9
CXXFLAGS    =   $(CFLAGS)
10
LFLAGS	    =	
10
LFLAGS	    =	
11
LIBS	    = -lole32 -luuid 
11
LIBS	    = -lole32 -luuid 
12
LINKQMAKE   =	g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
12
LINKQMAKE   =	g++ $(LFLAGS) -o tqmake.exe $(OBJS) $(QTOBJS) $(LIBS)
13
ADDCLEAN    =	
13
ADDCLEAN    =	
14
14
15
15
16
#qmake code
16
#tqmake code
17
OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_make.o \
17
OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_make.o \
18
	msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o projectgenerator.o \
18
	msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o projectgenerator.o \
19
 	metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o
19
 	metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o
Lines 27-41 QTOBJS=qstring.o quuid.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o Link Here
27
27
28
28
29
29
30
qmake.exe: $(OBJS) $(QTOBJS)
30
tqmake.exe: $(OBJS) $(QTOBJS)
31
	$(LINKQMAKE)
31
	$(LINKQMAKE)
32
	-copy qmake.exe ..\bin\qmake.exe
32
	-copy tqmake.exe ..\bin\tqmake.exe
33
33
34
clean::
34
clean::
35
	-del $(OBJS) $(QTOBJS) $(ADDCLEAN)
35
	-del $(OBJS) $(QTOBJS) $(ADDCLEAN)
36
36
37
distclean:: clean
37
distclean:: clean
38
	-del qmake
38
	-del tqmake
39
39
40
.c.o:
40
.c.o:
41
	$(CXX) $(CFLAGS) $<
41
	$(CXX) $(CFLAGS) $<
(-)a/qmake/generators/mac/pbuilder_pbx.cpp (-1 / +1 lines)
Lines 356-362 ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t) Link Here
356
	    TQTextStream mkt(&mkf);
356
	    TQTextStream mkt(&mkf);
357
	    writeHeader(mkt);
357
	    writeHeader(mkt);
358
	    mkt << "QMAKE    = "	<<
358
	    mkt << "QMAKE    = "	<<
359
		(project->isEmpty("QMAKE_QMAKE") ? TQString("$(QTDIR)/bin/qmake") :
359
		(project->isEmpty("QMAKE_QMAKE") ? TQString("$(QTDIR)/bin/tqmake") :
360
		 var("QMAKE_QMAKE")) << endl;
360
		 var("QMAKE_QMAKE")) << endl;
361
	    writeMakeQmake(mkt);
361
	    writeMakeQmake(mkt);
362
	    mkf.close();
362
	    mkf.close();
(-)a/qmake/generators/makefile.cpp (-1 / +1 lines)
Lines 2183-2189 MakefileGenerator::writeMakeQmake(TQTextStream &t) Link Here
2183
	    t << project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"].join(" \\\n\t\t") << "\n\t"
2183
	    t << project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"].join(" \\\n\t\t") << "\n\t"
2184
	      << qmake <<endl;
2184
	      << qmake <<endl;
2185
	}
2185
	}
2186
	if(project->first("QMAKE_ORIG_TARGET") != "qmake") {
2186
	if(project->first("QMAKE_ORIG_TARGET") != "tqmake") {
2187
	    t << "qmake: " <<
2187
	    t << "qmake: " <<
2188
		project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].join(" \\\n\t\t") << "\n\t"
2188
		project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].join(" \\\n\t\t") << "\n\t"
2189
	      << "@" << qmake << endl << endl;
2189
	      << "@" << qmake << endl << endl;
(-)a/qmake/generators/unix/unixmake.cpp (-1 / +1 lines)
Lines 66-72 UnixMakefileGenerator::init() Link Here
66
	if(project->isEmpty("MAKEFILE"))
66
	if(project->isEmpty("MAKEFILE"))
67
	    project->variables()["MAKEFILE"].append("Makefile");
67
	    project->variables()["MAKEFILE"].append("Makefile");
68
	if(project->isEmpty("QMAKE"))
68
	if(project->isEmpty("QMAKE"))
69
	    project->variables()["QMAKE"].append("qmake");
69
	    project->variables()["QMAKE"].append("tqmake");
70
	if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") == -1)
70
	if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") == -1)
71
	    project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all");
71
	    project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all");
72
	return; /* subdirs is done */
72
	return; /* subdirs is done */
(-)a/qmake/generators/unix/unixmake2.cpp (-2 / +2 lines)
Lines 74-80 UnixMakefileGenerator::writeMakefile(TQTextStream &t) Link Here
74
74
75
    writeHeader(t);
75
    writeHeader(t);
76
    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
76
    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
77
	t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : var("QMAKE_QMAKE")) << endl;
77
	t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? TQString("tqmake") : var("QMAKE_QMAKE")) << endl;
78
	{ //write the extra unix targets..
78
	{ //write the extra unix targets..
79
	    TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
79
	    TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
80
	    for(TQStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
80
	    for(TQStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
Lines 181-187 UnixMakefileGenerator::writeMakeParts(TQTextStream &t) Link Here
181
    t << "RANLIB   = " << var("QMAKE_RANLIB") << endl;
181
    t << "RANLIB   = " << var("QMAKE_RANLIB") << endl;
182
    t << "MOC      = " << var("QMAKE_MOC") << endl;
182
    t << "MOC      = " << var("QMAKE_MOC") << endl;
183
    t << "UIC      = "	<< var("QMAKE_UIC") << endl;
183
    t << "UIC      = "	<< var("QMAKE_UIC") << endl;
184
    t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : var("QMAKE_QMAKE")) << endl;
184
    t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? TQString("tqmake") : var("QMAKE_QMAKE")) << endl;
185
    t << "TAR      = "	<< var("QMAKE_TAR") << endl;
185
    t << "TAR      = "	<< var("QMAKE_TAR") << endl;
186
    t << "GZIP     = " << var("QMAKE_GZIP") << endl;
186
    t << "GZIP     = " << var("QMAKE_GZIP") << endl;
187
    if(project->isActiveConfig("compile_libtool"))
187
    if(project->isActiveConfig("compile_libtool"))
(-)a/qmake/meta.cpp (-1 / +1 lines)
Lines 73-79 TQMakeMetaInfo::readLib(const TQString &lib) Link Here
73
	    if(!proj.read(Option::fixPathToLocalOS(meta_file), 
73
	    if(!proj.read(Option::fixPathToLocalOS(meta_file), 
74
			  TQDir::currentDirPath(), TQMakeProject::ReadProFile))
74
			  TQDir::currentDirPath(), TQMakeProject::ReadProFile))
75
		return FALSE;
75
		return FALSE;
76
	    meta_type = "qmake";
76
	    meta_type = "tqmake";
77
	    vars = proj.variables();
77
	    vars = proj.variables();
78
	    ret = TRUE;
78
	    ret = TRUE;
79
	} else {
79
	} else {
(-)a/src/moc/moc.pro (-1 / +1 lines)
Lines 1-5 Link Here
1
TEMPLATE	= app
1
TEMPLATE	= app
2
TARGET		= moc
2
TARGET		= tqmoc
3
3
4
CONFIG 		= console release qtinc yacc lex_included yacc_no_name_mangle
4
CONFIG 		= console release qtinc yacc lex_included yacc_no_name_mangle
5
DEFINES	       += QT_MOC QT_NO_CODECS QT_LITE_UNICODE QT_NO_COMPONENT \
5
DEFINES	       += QT_MOC QT_NO_CODECS QT_LITE_UNICODE QT_NO_COMPONENT \
(-)a/tools/assistant/assistant.pro (-1 / +1 lines)
Lines 1-6 Link Here
1
TEMPLATE = app
1
TEMPLATE = app
2
LANGUAGE = C++
2
LANGUAGE = C++
3
TARGET	 = assistant
3
TARGET	 = tqassistant
4
4
5
CONFIG	+= qt warn_off
5
CONFIG	+= qt warn_off
6
6
(-)a/tools/designer/app/app.pro (-1 / +1 lines)
Lines 1-5 Link Here
1
TEMPLATE 	= app
1
TEMPLATE 	= app
2
TARGET		= designer
2
TARGET		= tqdesigner
3
3
4
CONFIG 		-= moc
4
CONFIG 		-= moc
5
DESTDIR		= $$QT_BUILD_TREE/bin
5
DESTDIR		= $$QT_BUILD_TREE/bin
(-)a/tools/designer/uic/uic.pro (-1 / +1 lines)
Lines 21-27 SOURCES = main.cpp uic.cpp form.cpp object.cpp \ Link Here
21
DEFINES		+= QT_INTERNAL_XML
21
DEFINES		+= QT_INTERNAL_XML
22
include( ../../../src/qt_professional.pri )
22
include( ../../../src/qt_professional.pri )
23
23
24
TARGET		= uic
24
TARGET		= tquic
25
INCLUDEPATH	+= ../shared
25
INCLUDEPATH	+= ../shared
26
DEFINES 	+= UIC
26
DEFINES 	+= UIC
27
DESTDIR		= ../../../bin
27
DESTDIR		= ../../../bin
(-)a/tools/linguist/linguist/linguist.pro (-1 / +1 lines)
Lines 32-38 DEFINES += QT_INTERNAL_XML Link Here
32
include( ../../../src/qt_professional.pri )
32
include( ../../../src/qt_professional.pri )
33
33
34
DESTDIR		= ../../../bin
34
DESTDIR		= ../../../bin
35
TARGET		= linguist
35
TARGET		= tqlinguist
36
36
37
37
38
LIBS	+= -L$$QT_BUILD_TREE/lib -lqassistantclient
38
LIBS	+= -L$$QT_BUILD_TREE/lib -lqassistantclient
(-)a/tools/linguist/lrelease/lrelease.pro (-1 / +1 lines)
Lines 9-15 SOURCES = main.cpp \ Link Here
9
DEFINES 	+= QT_INTERNAL_XML
9
DEFINES 	+= QT_INTERNAL_XML
10
include( ../../../src/qt_professional.pri )
10
include( ../../../src/qt_professional.pri )
11
11
12
TARGET		= lrelease
12
TARGET		= tqlrelease
13
INCLUDEPATH	+= ../shared
13
INCLUDEPATH	+= ../shared
14
DESTDIR		= ../../../bin
14
DESTDIR		= ../../../bin
15
15
(-)a/tools/linguist/lupdate/lupdate.pro (-1 / +1 lines)
Lines 13-19 SOURCES = fetchtr.cpp \ Link Here
13
DEFINES 	+= QT_INTERNAL_XML
13
DEFINES 	+= QT_INTERNAL_XML
14
include( ../../../src/qt_professional.pri )
14
include( ../../../src/qt_professional.pri )
15
15
16
TARGET		= lupdate
16
TARGET		= tqlupdate
17
INCLUDEPATH	+= ../shared
17
INCLUDEPATH	+= ../shared
18
DESTDIR		= ../../../bin
18
DESTDIR		= ../../../bin
19
19
(-)a/tools/qtconfig/qtconfig.pro (-1 / +1 lines)
Lines 8-14 FORMS = mainwindowbase.ui paletteeditoradvancedbase.ui previewwidgetbase.ui Link Here
8
IMAGES	= images/appicon.png
8
IMAGES	= images/appicon.png
9
9
10
PROJECTNAME	= Qt Configuration
10
PROJECTNAME	= Qt Configuration
11
TARGET		= qtconfig
11
TARGET		= tqtconfig
12
DESTDIR		= ../../bin
12
DESTDIR		= ../../bin
13
13
14
target.path=$$bins.path
14
target.path=$$bins.path

Return to bug 843