Automated update from Qt3

7 files changed, 16 insertions, 16 deletions

diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix
index f73370f9..32029e44 100644
--- a/qmake/Makefile.unix
+++ b/qmake/Makefile.unix
@@ -1,4 +1,4 @@
-#qmake code
+#tqmake code
 OBJS=project.o property.o main.o makefile.o unixmake2.o unixmake.o msvc_nmake.o \
      borland_bmake.o mingw_make.o msvc_dsp.o msvc_vcproj.o option.o \
      winmakefile.o projectgenerator.o metrowerks_xml.o  pbuilder_pbx.o \
@@ -39,14 +39,14 @@ CXXFLAGS= @QMAKE_CXXFLAGS@ \
 	-DQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
 LFLAGS=@QMAKE_LFLAGS@
 
-qmake: $(OBJS) $(QOBJS)
+tqmake: $(OBJS) $(QOBJS)
 	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
 	rm -f @BUILD_PATH@/bin/$@
 	ln -s ../qmake/$@ @BUILD_PATH@/bin/$@
 
-install: qmake
+install: tqmake
 	[ -d @QT_INSTALL_BINS@ ] || mkdir -p @QT_INSTALL_BINS@
-	-cp -f @BUILD_PATH@/bin/qmake @QT_INSTALL_BINS@
+	-cp -f @BUILD_PATH@/bin/tqmake @QT_INSTALL_BINS@
 	[ -d @QT_INSTALL_DATA@ ] || mkdir -p @QT_INSTALL_DATA@
 	-cp -R -f @SOURCE_PATH@/mkspecs @QT_INSTALL_DATA@
 	-ln -s -f @QMAKESPEC@ @QT_INSTALL_DATA@/mkspecs/default
@@ -55,7 +55,7 @@ clean::
 	rm -f $(OBJS) $(QOBJS)
 
 distclean:: clean
-	rm -rf qmake .deps
+	rm -rf tqmake .deps
 
 depend:
 	makedepend $(CXXFLAGS) -D__MAKEDEPEND__ $(DEPEND_SRC)
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++
index aafe9ed8..b1598dfd 100644
--- a/qmake/Makefile.win32-g++
+++ b/qmake/Makefile.win32-g++
@@ -9,11 +9,11 @@ CFLAGS	    =	-c -o$@ -O \
 CXXFLAGS    =   $(CFLAGS)
 LFLAGS	    =	
 LIBS	    = -lole32 -luuid 
-LINKQMAKE   =	g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
+LINKQMAKE   =	g++ $(LFLAGS) -o tqmake.exe $(OBJS) $(QTOBJS) $(LIBS)
 ADDCLEAN    =	
 
 
-#qmake code
+#tqmake code
 OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_make.o \
 	msvc_nmake.o msvc_dsp.o msvc_vcproj.o option.o winmakefile.o projectgenerator.o \
  	metrowerks_xml.o pbuilder_pbx.o msvc_objectmodel.o property.o meta.o qtmd5.o
@@ -27,15 +27,15 @@ QTOBJS=qstring.o quuid.o qtextstream.o qiodevice.o qglobal.o qgdict.o qcstring.o
 
 
 
-qmake.exe: $(OBJS) $(QTOBJS)
+tqmake.exe: $(OBJS) $(QTOBJS)
 	$(LINKQMAKE)
-	-copy qmake.exe ..\bin\qmake.exe
+	-copy tqmake.exe ..\bin\tqmake.exe
 
 clean::
 	-del $(OBJS) $(QTOBJS) $(ADDCLEAN)
 
 distclean:: clean
-	-del qmake
+	-del tqmake
 
 .c.o:
 	$(CXX) $(CFLAGS) $<
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 04c8ab8e..4f094502 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -356,7 +356,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
 	    TQTextStream mkt(&mkf);
 	    writeHeader(mkt);
 	    mkt << "QMAKE    = "	<<
-		(project->isEmpty("QMAKE_QMAKE") ? TQString("$(QTDIR)/bin/qmake") :
+		(project->isEmpty("QMAKE_QMAKE") ? TQString("$(QTDIR)/bin/tqmake") :
 		 var("QMAKE_QMAKE")) << endl;
 	    writeMakeQmake(mkt);
 	    mkf.close();
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index b4348588..fae1dc6c 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2183,7 +2183,7 @@ MakefileGenerator::writeMakeQmake(TQTextStream &t)
 	    t << project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"].join(" \\\n\t\t") << "\n\t"
 	      << qmake <<endl;
 	}
-	if(project->first("QMAKE_ORIG_TARGET") != "qmake") {
+	if(project->first("QMAKE_ORIG_TARGET") != "tqmake") {
 	    t << "qmake: " <<
 		project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].join(" \\\n\t\t") << "\n\t"
 	      << "@" << qmake << endl << endl;
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index f4049c2c..6d72ce12 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -66,7 +66,7 @@ UnixMakefileGenerator::init()
 	if(project->isEmpty("MAKEFILE"))
 	    project->variables()["MAKEFILE"].append("Makefile");
 	if(project->isEmpty("QMAKE"))
-	    project->variables()["QMAKE"].append("qmake");
+	    project->variables()["QMAKE"].append("tqmake");
 	if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") == -1)
 	    project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all");
 	return; /* subdirs is done */
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index d988819a..684a6442 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -74,7 +74,7 @@ UnixMakefileGenerator::writeMakefile(TQTextStream &t)
 
     writeHeader(t);
     if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
-	t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : var("QMAKE_QMAKE")) << endl;
+	t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? TQString("tqmake") : var("QMAKE_QMAKE")) << endl;
 	{ //write the extra unix targets..
 	    TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"];
 	    for(TQStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
@@ -181,7 +181,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
     t << "RANLIB   = " << var("QMAKE_RANLIB") << endl;
     t << "MOC      = " << var("QMAKE_MOC") << endl;
     t << "UIC      = "	<< var("QMAKE_UIC") << endl;
-    t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : var("QMAKE_QMAKE")) << endl;
+    t << "QMAKE    = "	<< (project->isEmpty("QMAKE_QMAKE") ? TQString("tqmake") : var("QMAKE_QMAKE")) << endl;
     t << "TAR      = "	<< var("QMAKE_TAR") << endl;
     t << "GZIP     = " << var("QMAKE_GZIP") << endl;
     if(project->isActiveConfig("compile_libtool"))
diff --git a/qmake/meta.cpp b/qmake/meta.cpp
index 05ffec54..36ae2574 100644
--- a/qmake/meta.cpp
+++ b/qmake/meta.cpp
@@ -73,7 +73,7 @@ TQMakeMetaInfo::readLib(const TQString &lib)
 	    if(!proj.read(Option::fixPathToLocalOS(meta_file), 
 			  TQDir::currentDirPath(), TQMakeProject::ReadProFile))
 		return FALSE;
-	    meta_type = "qmake";
+	    meta_type = "tqmake";
 	    vars = proj.variables();
 	    ret = TRUE;
 	} else {