diff options
Diffstat (limited to 'qmake/generators/win32')
| -rw-r--r-- | qmake/generators/win32/borland_bmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/mingw_make.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_dsp.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_nmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.cpp | 10 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 2 | ||||
| -rw-r--r-- | qmake/generators/win32/msvc_vcproj.cpp | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp index 4e97ba527..c7d94e51f 100644 --- a/qmake/generators/win32/borland_bmake.cpp +++ b/qmake/generators/win32/borland_bmake.cpp @@ -117,7 +117,7 @@ BorlandMakefileGenerator::writeBorlandParts(TQTextStream &t) } t << "MOC = " << (project->isEmpty("QMAKE_MOC") ? TQString("moc") : Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; - t << "UIC = " << (project->isEmpty("QMAKE_UIC") ? TQString("uic") : + t << "TQUIC = " << (project->isEmpty("QMAKE_UIC") ? TQString("tquic") : Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp index e59e7e3a2..a63d6454d 100644 --- a/qmake/generators/win32/mingw_make.cpp +++ b/qmake/generators/win32/mingw_make.cpp @@ -137,7 +137,7 @@ MingwMakefileGenerator::writeMingwParts(TQTextStream &t) } t << "MOC = " << (project->isEmpty("QMAKE_MOC") ? TQString("moc") : Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; - t << "UIC = " << (project->isEmpty("QMAKE_UIC") ? TQString("uic") : + t << "TQUIC = " << (project->isEmpty("QMAKE_UIC") ? TQString("tquic") : Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp index 988d4632d..568ff616f 100644 --- a/qmake/generators/win32/msvc_dsp.cpp +++ b/qmake/generators/win32/msvc_dsp.cpp @@ -365,7 +365,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) list.sort(); TQStringList::Iterator it; - // dump the image list to a file UIC can read. + // dump the image list to a file TQUIC can read. TQFile f( "images.tmp" ); f.open( IO_WriteOnly ); TQTextStream ts( &f ); @@ -464,7 +464,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t) t << "USERDEP_" << base << "=\"$(TQTDIR)\\bin\\tqmoc.exe\" \"$(TQTDIR)\\bin\\tquic.exe\"" << endl << endl; - TQString build = "\n\n# Begin Custom Build - Uic'ing " + base + "...\n" + TQString build = "\n\n# Begin Custom Build - TQUic'ing " + base + "...\n" "InputPath=.\\" + base + "\n\n" "BuildCmds= \\\n\t" + uicpath + base + " -o " + uiHeadersDir + fname + ".h \\\n" "\t" + uicpath + base + " -i " + fname + ".h -o " + uiSourcesDir + fname + ".cpp \\\n" diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp index b95289f89..7dafb1f60 100644 --- a/qmake/generators/win32/msvc_nmake.cpp +++ b/qmake/generators/win32/msvc_nmake.cpp @@ -147,7 +147,7 @@ NmakeMakefileGenerator::writeNmakeParts(TQTextStream &t) } t << "MOC = " << (project->isEmpty("QMAKE_MOC") ? TQString("moc") : Option::fixPathToTargetOS(var("QMAKE_MOC"), FALSE)) << endl; - t << "UIC = " << (project->isEmpty("QMAKE_UIC") ? TQString("uic") : + t << "TQUIC = " << (project->isEmpty("QMAKE_UIC") ? TQString("tquic") : Option::fixPathToTargetOS(var("QMAKE_UIC"), FALSE)) << endl; t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : Option::fixPathToTargetOS(var("QMAKE_QMAKE"), FALSE)) << endl; diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp index 1683de57d..1b17cdfde 100644 --- a/qmake/generators/win32/msvc_objectmodel.cpp +++ b/qmake/generators/win32/msvc_objectmodel.cpp @@ -1949,7 +1949,7 @@ void VCFilter::addUICstage( TQTextStream & /*strm*/, TQString str ) if ( mocDir.isEmpty() ) mocDir = pname; - CustomBuildTool.Description = ("Uic'ing " + str + "...\""); + CustomBuildTool.Description = ("TQUic'ing " + str + "...\""); CustomBuildTool.CommandLine += // Create .h from .ui file uicApp + " " + str + " -o " + uiHeaders + fname + ".h"; CustomBuildTool.CommandLine += // Create .cpp from .ui file @@ -2011,8 +2011,8 @@ bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str ) useCustomBuildTool = TRUE; // Some projects (like designer core) may have too many images to - // call uic directly. Therefor we have to create a temporary - // file, with the image list, and call uic with the -f option. + // call tquic directly. Therefor we have to create a temporary + // file, with the image list, and call tquic with the -f option. TQString tmpFileCmd = "echo "; TQString tmpImageFilename = ".imgcol"; TQStringList& list = Project->project->variables()["IMAGES"]; @@ -2139,10 +2139,10 @@ TQTextStream &operator<<( TQTextStream &strm, VCFilter &tool ) tool.useCustomBuildTool = FALSE; tool.useCompilerTool = FALSE; - // Add UIC, MOC and PCH stages to file + // Add TQUIC, MOC and PCH stages to file if ( tool.CustomBuild == moc ) tool.addMOCstage( strm, *it ); - else if ( tool.CustomBuild == uic ) + else if ( tool.CustomBuild == tquic ) tool.addUICstage( strm, *it ); else if ( tool.CustomBuild == lexyacc ) tool.addLexYaccStage( strm, *it ); diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index fc2a39e20..1141e8a9c 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -66,7 +66,7 @@ enum DotNET { enum customBuildCheck { none, moc, - uic, + tquic, lexyacc, resource }; diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp index df6001580..128811ef9 100644 --- a/qmake/generators/win32/msvc_vcproj.cpp +++ b/qmake/generators/win32/msvc_vcproj.cpp @@ -358,9 +358,9 @@ void VcprojGenerator::writeSubDirs(TQTextStream &t) if(newDep->target.endsWith(".dll")) newDep->target = newDep->target.left(newDep->target.length()-3) + "lib"; - // All projects using Forms are dependent on uic.exe + // All projects using Forms are dependent on tquic.exe if(!tmp_proj.isEmpty("FORMS")) - newDep->dependencies << "uic.exe"; + newDep->dependencies << "tquic.exe"; // Add all unknown libs to the deps TQStringList where("QMAKE_LIBS"); @@ -970,7 +970,7 @@ void VcprojGenerator::initFormsFiles() vcProject.FormFiles.flat_files ); vcProject.FormFiles.Project = this; vcProject.FormFiles.Config = &(vcProject.Configuration); - vcProject.FormFiles.CustomBuild = uic; + vcProject.FormFiles.CustomBuild = tquic; } void VcprojGenerator::initTranslationFiles() |