Rename moc to tqmoc

Signed-off-by: Michele Calgaro <[email protected]>

5 files changed, 7 insertions, 7 deletions

diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index 61906de29..4e97ba527 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -557,7 +557,7 @@ BorlandMakefileGenerator::init()
         project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_RT"];
     }
     if ( project->isActiveConfig("moc") ) {
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
     }
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
     // Update -lname to name.lib, and -Ldir to
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 18aa73c21..e59e7e3a2 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -574,7 +574,7 @@ MingwMakefileGenerator::init()
     }
 
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
 
     // add -L libs to libdir
     TQStringList &libs = project->variables()["QMAKE_LIBS"];
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 910400315..988d4632d 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -227,7 +227,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 			mocpath = mocpath.replace( TQRegExp( "\\..*$" ), "" ) + " ";
 			buildCmds += "\t" + mocpath + (*it)  + " -o " + findMocDestination((*it)) + " \\\n";
 			createMOC  = "\"" + findMocDestination((*it)) +	"\" : $(SOURCE) \"$(INTDIR)\" \"$(OUTDIR)\"\n   $(BuildCmds)\n\n";
-			customDependencies += "\"$(TQTDIR)\\bin\\moc.exe\"";
+			customDependencies += "\"$(TQTDIR)\\bin\\tqmoc.exe\"";
 		    }
 		    if (!createMOC.isEmpty() || !compilePCH.isEmpty()) {
 			bool doMOC = !createMOC.isEmpty();
@@ -462,7 +462,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
 			    uiHeadersDir = fpath;
 		    }
 
-		    t << "USERDEP_" << base << "=\"$(TQTDIR)\\bin\\moc.exe\" \"$(TQTDIR)\\bin\\uic.exe\"" << endl << endl;
+		    t << "USERDEP_" << base << "=\"$(TQTDIR)\\bin\\tqmoc.exe\" \"$(TQTDIR)\\bin\\tquic.exe\"" << endl << endl;
 
 		    TQString build = "\n\n# Begin Custom Build - Uic'ing " + base + "...\n"
 			"InputPath=.\\" + base + "\n\n" "BuildCmds= \\\n\t" + uicpath + base +
@@ -818,7 +818,7 @@ DspMakefileGenerator::init()
     TQString targetfilename = project->variables()["TARGET"].first();
     project->variables()["TARGET"].first() += project->first("TARGET_EXT");
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
 
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
     project->variables()["QMAKE_FILETAGS"] += TQStringList::split(' ',
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index 302e2532d..b95289f89 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -653,7 +653,7 @@ NmakeMakefileGenerator::init()
 
 
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
     project->variables()["QMAKE_LIBS"] += project->variables()["LIBS"];
 
     TQStringList &libList = project->variables()["QMAKE_LIBS"];
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index f22c0c148..df6001580 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1214,7 +1214,7 @@ void VcprojGenerator::initOld()
 
     // MOC -----------------------------------------------------------
     if ( project->isActiveConfig("moc") )
-	setMocAware(TRUE);
+	setTQMocAware(TRUE);
 
     // /VERSION:x.yz -------------------------------------------------
     if ( !project->variables()["VERSION"].isEmpty() ) {