summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
Diffstat (limited to 'qmake')
-rw-r--r--qmake/book/qmake-commandreference.leaf16
-rw-r--r--qmake/book/qmake-preface.leaf2
-rw-r--r--qmake/generators/mac/pbuilder_pbx.cpp4
-rw-r--r--qmake/generators/makefile.cpp10
-rw-r--r--qmake/generators/unix/unixmake2.cpp2
-rw-r--r--qmake/generators/win32/borland_bmake.cpp2
-rw-r--r--qmake/generators/win32/mingw_make.cpp2
-rw-r--r--qmake/generators/win32/msvc_dsp.cpp4
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp2
-rw-r--r--qmake/generators/win32/msvc_objectmodel.cpp10
-rw-r--r--qmake/generators/win32/msvc_objectmodel.h2
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp6
12 files changed, 31 insertions, 31 deletions
diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf
index 965d96190..ee2584972 100644
--- a/qmake/book/qmake-commandreference.leaf
+++ b/qmake/book/qmake-commandreference.leaf
@@ -336,7 +336,7 @@ For example:
\section3 FORMS
This variable specifies the .ui files (see \link
-designer-manual.book TQt Designer \endlink) to be processed through \e uic
+designer-manual.book TQt Designer \endlink) to be processed through \e tquic
before compiling. All dependencies, headers and source files required
to build these .ui files will automatically be added to the project.
@@ -415,7 +415,7 @@ win32:OBJECTS__DIR = c:\myproject\tmp
\target UI_DIR
\section3 UI_DIR
-This variable specifies the directory where all intermediate files from uic
+This variable specifies the directory where all intermediate files from tquic
should be placed. This variable overrides both UI_SOURCES_DIR and
UI_HEADERS_DIR.
@@ -430,7 +430,7 @@ win32:UI_DIR = c:\myproject\ui
\section3 UI_HEADERS_DIR
This variable specifies the directory where all declaration files (as
-generated by uic) should be placed.
+generated by tquic) should be placed.
For example:
@@ -443,7 +443,7 @@ win32:UI_HEADERS_DIR = c:\myproject\ui\include
\section3 UI_SOURCES_DIR
This variable specifies the directory where all implementation files (as generated
-by uic) should be placed.
+by tquic) should be placed.
For example:
@@ -1572,15 +1572,15 @@ this variable is typically handled by \e qmake or
\section3 QMAKE_UIC
-This variable contains the location of uic if it is not in the path.
+This variable contains the location of tquic if it is not in the path.
The value of this variable is typically handled by \e qmake or
\link #QMAKESPEC qmake.conf \endlink and rarely needs to be modified.
-It can be used to specify arguments to uic as well, such as additional plugin
+It can be used to specify arguments to tquic as well, such as additional plugin
paths. For example:
\code
- QMAKE_UIC = uic -L /path/to/plugin
+ QMAKE_UIC = tquic -L /path/to/plugin
\endcode
@@ -1634,7 +1634,7 @@ modified.
\section3 UICIMPLS
-This variable contains a list of the generated implementation files by UIC.
+This variable contains a list of the generated implementation files by TQUIC.
The value of this variable
is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
modified.
diff --git a/qmake/book/qmake-preface.leaf b/qmake/book/qmake-preface.leaf
index 59230c092..b716903f6 100644
--- a/qmake/book/qmake-preface.leaf
+++ b/qmake/book/qmake-preface.leaf
@@ -15,4 +15,4 @@ uses \e qmake as the primary build tool for the TQt library, and for
the tools supplied with Qt.
\e qmake also takes care of Qt's special requirements, automatically
-including build rules for \link tqmoc.html tqmoc\endlink and \e uic.
+including build rules for \link tqmoc.html tqmoc\endlink and \e tquic.
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index efd17ee62..691dc4306 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -403,7 +403,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
else if(srcs[i] == "SRCMOC")
src_group = "Sources [moc]";
else if(srcs[i] == "UICIMPLS" || srcs[i] == "FORMS")
- src_group = "Sources [uic]";
+ src_group = "Sources [tquic]";
else if(srcs[i] == "QMAKE_IMAGE_COLLECTION")
src_group = "Sources [images]";
else if(srcs[i] == "QMAKE_INTERNAL_INCLUDED_FILES")
@@ -545,7 +545,7 @@ ProjectBuilderMakefileGenerator::writeMakeParts(TQTextStream &t)
TQTextStream mkt(&mkf);
writeHeader(mkt);
mkt << "MOC = " << Option::fixPathToTargetOS(var("QMAKE_MOC")) << endl;
- mkt << "UIC = " << Option::fixPathToTargetOS(var("QMAKE_UIC")) << endl;
+ mkt << "TQUIC = " << Option::fixPathToTargetOS(var("QMAKE_UIC")) << endl;
mkt << "LEX = " << var("QMAKE_LEX") << endl;
mkt << "LEXFLAGS = " << var("QMAKE_LEXFLAGS") << endl;
mkt << "YACC = " << var("QMAKE_YACC") << endl;
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index c4c42343f..02fa74c53 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1616,7 +1616,7 @@ MakefileGenerator::writeUicSrc(TQTextStream &t, const TQString &ui)
deps.remove(decl); //avoid circular dependencies..
t << decl << ": " << (*it) << " ";
t << deps.join(" \\\n\t\t") << "\n\t"
- << "$(UIC) " << (*it) << " -o " << decl << endl << endl;
+ << "$(TQUIC) " << (*it) << " -o " << decl << endl << endl;
TQString mildDecl = decl;
int k = mildDecl.findRev(Option::dir_sep);
@@ -1626,7 +1626,7 @@ MakefileGenerator::writeUicSrc(TQTextStream &t, const TQString &ui)
if(TQFile::exists((*it) + Option::h_ext.first()))
t << (*it) << Option::h_ext.first() << " ";
t << deps.join(" \\\n\t\t") << "\n\t"
- << "$(UIC) " << (*it) << " -i " << mildDecl << " -o " << impl << endl << endl;
+ << "$(TQUIC) " << (*it) << " -i " << mildDecl << " -o " << impl << endl << endl;
}
}
@@ -1807,15 +1807,15 @@ MakefileGenerator::writeImageSrc(TQTextStream &t, const TQString &src)
TQString gen = project->first("MAKEFILE_GENERATOR");
if ( gen == "MSVC" ) {
t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
- << "$(UIC) -o " << (*it) << " -embed " << project->first("QMAKE_ORIG_TARGET")
+ << "$(TQUIC) -o " << (*it) << " -embed " << project->first("QMAKE_ORIG_TARGET")
<< " -f <<\n" << findDependencies((*it)).join(" ") << "\n<<" << endl << endl;
} else if ( gen == "BMAKE" ) {
t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
- << "$(UIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET")
+ << "$(TQUIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET")
<< " -f &&|\n" << findDependencies((*it)).join(" ") << "\n| -o " << (*it) << endl << endl;
} else {
t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t"
- << "$(UIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET")
+ << "$(TQUIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET")
<< " " << findDependencies((*it)).join(" ") << " -o " << (*it) << endl << endl;
}
}
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index c117a2d29..af0707441 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -182,7 +182,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
t << "AR = " << var("QMAKE_AR") << endl;
t << "RANLIB = " << var("QMAKE_RANLIB") << endl;
t << "MOC = " << var("QMAKE_MOC") << endl;
- t << "UIC = " << var("QMAKE_UIC") << endl;
+ t << "TQUIC = " << var("QMAKE_UIC") << 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;
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()
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-22 20:06:34 +0000