summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
Diffstat (limited to 'qmake')
-rw-r--r--qmake/book/qmake-commandreference.leaf10
-rw-r--r--qmake/book/qmake-install.leaf4
-rw-r--r--qmake/generators/mac/metrowerks_xml.cpp8
-rw-r--r--qmake/generators/mac/pbuilder_pbx.cpp2
-rw-r--r--qmake/generators/makefile.cpp8
-rw-r--r--qmake/generators/unix/unixmake.cpp16
-rw-r--r--qmake/generators/unix/unixmake2.cpp2
-rw-r--r--qmake/generators/win32/borland_bmake.cpp14
-rw-r--r--qmake/generators/win32/mingw_make.cpp8
-rw-r--r--qmake/generators/win32/msvc_dsp.cpp28
-rw-r--r--qmake/generators/win32/msvc_nmake.cpp14
-rw-r--r--qmake/generators/win32/msvc_objectmodel.cpp2
-rw-r--r--qmake/generators/win32/msvc_vcproj.cpp18
-rw-r--r--qmake/project.cpp10
14 files changed, 72 insertions, 72 deletions
diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf
index 329648cf9..3cc198b0b 100644
--- a/qmake/book/qmake-commandreference.leaf
+++ b/qmake/book/qmake-commandreference.leaf
@@ -1070,8 +1070,8 @@ value of this variable is typically handled by \e qmake or
-\target QMAKE_INCDIR_QT
-\section3 QMAKE_INCDIR_QT
+\target QMAKE_INCDIR_TQT
+\section3 QMAKE_INCDIR_TQT
This variable contains the location of all known header file
paths to be added to INCLUDEPATH when building a TQt application. The value
@@ -1277,7 +1277,7 @@ directory.The value of this variable is typically handled by
-\section3 QMAKE_LIBDIR_QT
+\section3 QMAKE_LIBDIR_TQT
This variable contains the location of the TQt library
directory.The value of this variable is typically handled by
@@ -1793,7 +1793,7 @@ matches the regular expression specified.
For example:
\code
-exists( $(QTDIR)/lib/libtqt-mt* ) {
+exists( $(TQTDIR)/lib/libtqt-mt* ) {
message( "Configuring for multi-threaded Qt..." )
CONFIG += thread
}
@@ -1943,7 +1943,7 @@ The QMAKESPEC environment variable can contain any of the following:
\list
\i A complete path to a directory containing a qmake.conf file. In this case \e qmake will open the qmake.conf file from within that directory. If the file does not exist, \e qmake will exit with an error.
-\i The name of a platform-compiler combination. In this case, \e qmake will search in the directory specified by the QTDIR environment variable.
+\i The name of a platform-compiler combination. In this case, \e qmake will search in the directory specified by the TQTDIR environment variable.
\endlist
Note: the QMAKESPEC path will automatically be added to the
diff --git a/qmake/book/qmake-install.leaf b/qmake/book/qmake-install.leaf
index 508fd3f81..b988713e1 100644
--- a/qmake/book/qmake-install.leaf
+++ b/qmake/book/qmake-install.leaf
@@ -37,12 +37,12 @@ one of the following:
linux-arm-g++ linux-generic-g++ linux-mips-g++ linux-x86-g++
linux-freebsd-g++ linux-ipaq-g++ linux-solaris-g++ qnx-rtp-g++
-\i QTDIR \BR This must be set to where TQt is (or will be) installed.
+\i TQTDIR \BR This must be set to where TQt is (or will be) installed.
For example, \e {c:\\qt} and \e {\\local\\qt}
\endlist
Once the environment variables are set go into the qmake directory, \e
-$QTDIR/qmake, e.g. \e{C:\\qt\\qmake}. Now run \e make or \e nmake
+$TQTDIR/qmake, e.g. \e{C:\\qt\\qmake}. Now run \e make or \e nmake
depending on your compiler.
When the make has completed, \e qmake is ready for use.
diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 34bf35070..5b8802a0a 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -440,8 +440,8 @@ MetrowerksMakefileGenerator::writeMakeParts(TQTextStream &t)
t << "MYDL";
else
t << "MEXE";
- } else if(variable == "CODEWARRIOR_QTDIR") {
- t << getenv("QTDIR");
+ } else if(variable == "CODEWARRIOR_TQTDIR") {
+ t << getenv("TQTDIR");
} else if(variable == "CODEWARRIOR_CACHEMODDATES") {
t << "true";
} else {
@@ -580,7 +580,7 @@ MetrowerksMakefileGenerator::init()
}
if(project->isActiveConfig("qt"))
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
if(project->isEmpty("FRAMEWORKPATH"))
project->variables()["FRAMEWORKPATH"].append("/System/Library/Frameworks/");
@@ -612,7 +612,7 @@ MetrowerksMakefileGenerator::findTemplate(const TQString &file)
TQString ret;
if(!TQFile::exists(ret = file) &&
!TQFile::exists((ret = Option::mkfile::qmakespec + TQDir::separator() + file)) &&
- !TQFile::exists((ret = TQString(getenv("QTDIR")) + "/mkspecs/mac-mwerks/" + file)) &&
+ !TQFile::exists((ret = TQString(getenv("TQTDIR")) + "/mkspecs/mac-mwerks/" + file)) &&
!TQFile::exists((ret = (TQString(getenv("HOME")) + "/.tmake/" + file))))
return "";
return ret;
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 4f0945029..329b79967 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/tqmake") :
+ (project->isEmpty("QMAKE_QMAKE") ? TQString("$(TQTDIR)/bin/tqmake") :
var("QMAKE_QMAKE")) << endl;
writeMakeQmake(mkt);
mkf.close();
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index fae1dc6c1..c41f8e82f 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1485,8 +1485,8 @@ MakefileGenerator::usePlatformDir()
project->variables()["OBJECTS_DIR"] = filePath
+ (filePath.isEmpty() ? pltDir : slashPltDir);
- filePath = project->first("QMAKE_LIBDIR_QT");
- project->variables()["QMAKE_LIBDIR_QT"] = filePath
+ filePath = project->first("QMAKE_LIBDIR_TQT");
+ project->variables()["QMAKE_LIBDIR_TQT"] = filePath
+ (filePath.isEmpty() ? pltDir : slashPltDir);
filePath = project->first("QMAKE_LIBS_QT");
@@ -2393,7 +2393,7 @@ MakefileGenerator::specdir()
return spec;
spec = Option::mkfile::qmakespec;
#if 0
- if(const char *d = getenv("QTDIR")) {
+ if(const char *d = getenv("TQTDIR")) {
TQString qdir = Option::fixPathToTargetOS(TQString(d));
if(qdir.endsWith(TQString(TQChar(TQDir::separator()))))
qdir.truncate(qdir.length()-1);
@@ -2403,7 +2403,7 @@ MakefileGenerator::specdir()
absSpec = Option::fixPathToTargetOS(absSpec);
//replace what you can
if(absSpec.startsWith(qdir)) {
- absSpec.replace(0, qdir.length(), "$(QTDIR)");
+ absSpec.replace(0, qdir.length(), "$(TQTDIR)");
spec = absSpec;
}
}
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index d018904ce..758634b34 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -163,10 +163,10 @@ UnixMakefileGenerator::init()
configs.append("qtopiainc");
}
if ( project->isActiveConfig("qtopiainc") )
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQTOPIA"];
if ( project->isActiveConfig("qtopialib") ) {
- if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA"))
- project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QTOPIA", "-L", " -L", "");
+ if(!project->isEmpty("QMAKE_LIBDIR_TQTOPIA"))
+ project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_TQTOPIA", "-L", " -L", "");
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
}
if ( project->isActiveConfig("qt") ) {
@@ -175,7 +175,7 @@ UnixMakefileGenerator::init()
if ( project->isActiveConfig("tablet") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_TABLET_SUPPORT");
if(configs.findIndex("moc")) configs.append("moc");
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
if ( !project->isActiveConfig("debug") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
if ( !is_qt ) {
@@ -183,12 +183,12 @@ UnixMakefileGenerator::init()
if ( !project->isEmpty("QMAKE_RTLDIR_QT") )
project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_RTLDIR_QT", " " + var("QMAKE_RPATH"),
" " + var("QMAKE_RPATH"), "");
- else if ( !project->isEmpty("QMAKE_LIBDIR_QT") )
- project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_LIBDIR_QT", " " + var("QMAKE_RPATH"),
+ else if ( !project->isEmpty("QMAKE_LIBDIR_TQT") )
+ project->variables()["QMAKE_LFLAGS"] += varGlue("QMAKE_LIBDIR_TQT", " " + var("QMAKE_RPATH"),
" " + var("QMAKE_RPATH"), "");
}
- if ( !project->isEmpty("QMAKE_LIBDIR_QT") )
- project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_QT", "-L", " -L", "");
+ if ( !project->isEmpty("QMAKE_LIBDIR_TQT") )
+ project->variables()["QMAKE_LIBDIR_FLAGS"] += varGlue("QMAKE_LIBDIR_TQT", "-L", " -L", "");
if ( project->isActiveConfig("thread") && !project->isEmpty("QMAKE_LIBS_QT_THREAD") )
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
else
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 7427269f4..48e6ef545 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.cpp
@@ -687,7 +687,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t)
//moc itself shouldn't have this dependency - this is a little kludgy but it is
//better than the alternative for now.
TQString moc = project->first("QMAKE_MOC"), target = project->first("TARGET"),
- moc_dir = "$(QTDIR)/src/moc";
+ moc_dir = "$(TQTDIR)/src/moc";
if(!project->isEmpty("QMAKE_MOC_SRC"))
moc_dir = project->first("QMAKE_MOC_SRC");
fixEnvVariables(target);
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index 8a565822b..0acae966a 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -469,16 +469,16 @@ BorlandMakefileGenerator::init()
project->variables()["CONFIG"].append("windows");
}
if ( project->isActiveConfig("qtopiainc") )
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQTOPIA"];
if ( project->isActiveConfig("qtopialib") ) {
- if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA"))
- project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"];
+ if(!project->isEmpty("QMAKE_LIBDIR_TQTOPIA"))
+ project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQTOPIA"];
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
}
if ( project->isActiveConfig("qt") ) {
project->variables()["CONFIG"].append("moc");
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
- project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
+ project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
if ( !project->isActiveConfig("debug") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
@@ -492,9 +492,9 @@ BorlandMakefileGenerator::init()
else
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
- int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+ int hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "qt");
if ( hver == -1 )
- hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qtmt");
+ hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "qtmt");
if(hver != -1) {
TQString ver;
ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "mt" : ""), hver);
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 3c4c33c61..2a3ab3e02 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -491,8 +491,8 @@ MingwMakefileGenerator::init()
if ( project->isActiveConfig("qt") ) {
project->variables()["CONFIG"].append("moc");
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
- project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
+ project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
if ( !project->isActiveConfig("debug") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
@@ -507,9 +507,9 @@ MingwMakefileGenerator::init()
else
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
- int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+ int hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "qt");
if ( hver == -1 )
- hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "tqt-mt");
+ hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "tqt-mt");
if(hver != -1) {
TQString ver;
ver.sprintf("-lqt%s" TQTDLL_POSTFIX "%d", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 4e51417d6..fabdd7232 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -151,7 +151,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
"\t" + mocpath + findMocSource((*it)) + " -o " +
(*it) + "\n\n" "# End Custom Build\n\n";
- t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(QTDIR)\\bin\\moc.exe\"" << endl << endl;
+ t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\moc.exe\"" << endl << endl;
t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build
<< "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\""
@@ -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 += "\"$(QTDIR)\\bin\\moc.exe\"";
+ customDependencies += "\"$(TQTDIR)\\bin\\moc.exe\"";
}
if (!createMOC.isEmpty() || !compilePCH.isEmpty()) {
bool doMOC = !createMOC.isEmpty();
@@ -344,7 +344,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
"\t" + mocpath + findMocSource((*it)) + " -o " +
(*it) + "\n\n" "# End Custom Build\n\n";
- t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(QTDIR)\\bin\\moc.exe\"" << endl << endl;
+ t << "USERDEP_" << base << "=\".\\" << findMocSource((*it)) << "\" \"$(TQTDIR)\\bin\\moc.exe\"" << endl << endl;
t << "!IF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Release\"" << build
<< "!ELSEIF \"$(CFG)\" == \"" << var("MSVCDSP_PROJECT") << " - " << platform << " Debug\""
@@ -462,7 +462,7 @@ DspMakefileGenerator::writeDspParts(TQTextStream &t)
uiHeadersDir = fpath;
}
- t << "USERDEP_" << base << "=\"$(QTDIR)\\bin\\moc.exe\" \"$(QTDIR)\\bin\\uic.exe\"" << endl << endl;
+ t << "USERDEP_" << base << "=\"$(TQTDIR)\\bin\\moc.exe\" \"$(TQTDIR)\\bin\\uic.exe\"" << endl << endl;
TQString build = "\n\n# Begin Custom Build - Uic'ing " + base + "...\n"
"InputPath=.\\" + base + "\n\n" "BuildCmds= \\\n\t" + uicpath + base +
@@ -671,17 +671,17 @@ DspMakefileGenerator::init()
}
if ( project->isActiveConfig("qtopiainc") )
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQTOPIA"];
if ( project->isActiveConfig("qtopialib") ) {
- if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA"))
- project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"];
+ if(!project->isEmpty("QMAKE_LIBDIR_TQTOPIA"))
+ project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQTOPIA"];
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
}
if ( project->isActiveConfig("qt") ) {
project->variables()["CONFIG"].append("moc");
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
- project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
+ project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
@@ -694,9 +694,9 @@ DspMakefileGenerator::init()
else
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
- int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+ int hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "qt");
if ( hver == -1 )
- hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "tqt-mt");
+ hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "tqt-mt");
if(hver != -1) {
TQString ver;
ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (thread ? "-mt" : ""), hver);
@@ -940,8 +940,8 @@ DspMakefileGenerator::init()
project->variables()["TARGET"].first().prepend(project->first("DESTDIR"));
Option::fixPathToTargetOS(project->first("TARGET"));
dest = project->first("TARGET");
- if ( project->first("TARGET").startsWith("$(QTDIR)") )
- dest.replace( "$(QTDIR)", getenv("QTDIR") );
+ if ( project->first("TARGET").startsWith("$(TQTDIR)") )
+ dest.replace( "$(TQTDIR)", getenv("TQTDIR") );
project->variables()["MSVCDSP_TARGET"].append(
TQString("/out:\"") + dest + "\"");
if ( project->isActiveConfig("dll") ) {
@@ -1033,7 +1033,7 @@ DspMakefileGenerator::findTemplate(const TQString &file)
TQString ret;
if(!TQFile::exists((ret = file)) &&
!TQFile::exists((ret = TQString(Option::mkfile::qmakespec + "/" + file))) &&
- !TQFile::exists((ret = TQString(getenv("QTDIR")) + "/mkspecs/win32-msvc/" + file)) &&
+ !TQFile::exists((ret = TQString(getenv("TQTDIR")) + "/mkspecs/win32-msvc/" + file)) &&
!TQFile::exists((ret = (TQString(getenv("HOME")) + "/.tmake/" + file))))
return "";
return ret;
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index f813b4cb4..a9e08a855 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -569,16 +569,16 @@ NmakeMakefileGenerator::init()
if ( project->isActiveConfig("qt") || project->isActiveConfig("opengl") )
project->variables()["CONFIG"].append("windows");
if ( project->isActiveConfig("qtopiainc") )
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QTOPIA"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQTOPIA"];
if ( project->isActiveConfig("qtopialib") ) {
- if(!project->isEmpty("QMAKE_LIBDIR_QTOPIA"))
- project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QTOPIA"];
+ if(!project->isEmpty("QMAKE_LIBDIR_TQTOPIA"))
+ project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQTOPIA"];
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QTOPIA"];
}
if ( project->isActiveConfig("qt") ) {
project->variables()["CONFIG"].append("moc");
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
- project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
+ project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
if ( !project->isActiveConfig("debug") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_NO_DEBUG");
if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
@@ -592,9 +592,9 @@ NmakeMakefileGenerator::init()
else
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
- int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+ int hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "qt");
if ( hver == -1 )
- hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "tqt-mt");
+ hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "tqt-mt");
if(hver != -1) {
TQString ver;
ver.sprintf("qt%s" TQTDLL_POSTFIX "%d.lib", (project->isActiveConfig("thread") ? "-mt" : ""), hver);
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 30543709c..13dd83390 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.cpp
@@ -2037,7 +2037,7 @@ bool VCFilter::addIMGstage( TQTextStream &/*strm*/, TQString str )
// The loop below is to avoid the resulting CommandLine buffer
// from being a size of between 2071-#char_replaced and 2102,
// as this triggers a buffer overflow bug in VS2003. As we only
- // the only replacement we use in this buffer is one $(QTDIR),
+ // the only replacement we use in this buffer is one $(TQTDIR),
// we assume this can be upto 256 characters long, making the
// lower-bound to be 1814 characters. So, if the buffer is
// between 1814 and 2103 bytes, the buffer is "padded" til it's
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index b294e1c38..40034ace5 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -468,8 +468,8 @@ void VcprojGenerator::init()
if ( isTQtActive ) {
project->variables()["CONFIG"] += "moc";
project->variables()["CONFIG"] += "windows";
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
- project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
+ project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
if( projectTarget == SharedLib )
project->variables()["DEFINES"] += "QT_DLL";
@@ -1150,8 +1150,8 @@ void VcprojGenerator::initOld()
// QT ------------------------------------------------------------
if ( project->isActiveConfig("qt") ) {
project->variables()["CONFIG"].append("moc");
- project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_QT"];
- project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_QT"];
+ project->variables()["INCLUDEPATH"] += project->variables()["QMAKE_INCDIR_TQT"];
+ project->variables()["QMAKE_LIBDIR"] += project->variables()["QMAKE_LIBDIR_TQT"];
if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) {
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
@@ -1164,9 +1164,9 @@ void VcprojGenerator::initOld()
else
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
if ( !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
- int hver = findHighestVersion(project->first("QMAKE_LIBDIR_QT"), "qt");
+ int hver = findHighestVersion(project->first("QMAKE_LIBDIR_TQT"), "qt");
if( hver==-1 ) {
- hver = findHighestVersion( project->first("QMAKE_LIBDIR_QT"), "tqt-mt" );
+ hver = findHighestVersion( project->first("QMAKE_LIBDIR_TQT"), "tqt-mt" );
}
if(hver != -1) {
@@ -1376,8 +1376,8 @@ void VcprojGenerator::initOld()
project->variables()["MSVCPROJ_TARGET"] = project->first("TARGET");
Option::fixPathToTargetOS(project->first("TARGET"));
dest = project->first("TARGET") + project->first( "TARGET_EXT" );
- if ( project->first("TARGET").startsWith("$(QTDIR)") )
- dest.replace( TQRegExp("\\$\\(QTDIR\\)"), getenv("QTDIR") );
+ if ( project->first("TARGET").startsWith("$(TQTDIR)") )
+ dest.replace( TQRegExp("\\$\\(TQTDIR\\)"), getenv("TQTDIR") );
project->variables()["MSVCPROJ_TARGET"] = dest;
// DLL COPY ------------------------------------------------------
@@ -1509,7 +1509,7 @@ TQString VcprojGenerator::findTemplate(TQString file)
TQString ret;
if(!TQFile::exists((ret = file)) &&
!TQFile::exists((ret = TQString(Option::mkfile::qmakespec + "/" + file))) &&
- !TQFile::exists((ret = TQString(getenv("QTDIR")) + "/mkspecs/win32-msvc.net/" + file)) &&
+ !TQFile::exists((ret = TQString(getenv("TQTDIR")) + "/mkspecs/win32-msvc.net/" + file)) &&
!TQFile::exists((ret = (TQString(getenv("HOME")) + "/.tmake/" + file))))
return "";
debug_msg(1, "Generator: MSVC.NET: Found template \'%s\'", ret.latin1() );
diff --git a/qmake/project.cpp b/qmake/project.cpp
index f60dba06a..0f8eca3f9 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -84,7 +84,7 @@ TQStringList qmake_mkspec_paths()
ret << ((*it) + concat);
#endif
}
- if(const char *qtdir = getenv("QTDIR"))
+ if(const char *qtdir = getenv("TQTDIR"))
ret << (TQString(qtdir) + concat);
#ifdef QT_INSTALL_PREFIX
ret << (QT_INSTALL_PREFIX + concat);
@@ -99,9 +99,9 @@ TQStringList qmake_mkspec_paths()
ret << (tqInstallPathData() + concat);
#endif
- /* prefer $QTDIR if it is set */
- if (getenv("QTDIR"))
- ret << getenv("QTDIR");
+ /* prefer $TQTDIR if it is set */
+ if (getenv("TQTDIR"))
+ ret << getenv("TQTDIR");
ret << tqInstallPathData();
return ret;
}
@@ -925,7 +925,7 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
#endif
}
feature_roots << Option::mkfile::qmakespec;
- if(const char *qtdir = getenv("QTDIR"))
+ if(const char *qtdir = getenv("TQTDIR"))
feature_roots << (qtdir + concat);
#ifdef QT_INSTALL_PREFIX
feature_roots << (QT_INSTALL_PREFIX + concat);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-23 19:00:37 +0000