summaryrefslogtreecommitdiffstats
path: root/qmake/generators/unix/unixmake2.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-19 16:47:41 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-06-19 16:47:41 -0500
commit1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a (patch)
tree9a0f14bc0aa25cc54bcbadc7aeae4b62e2a19ace /qmake/generators/unix/unixmake2.cpp
parent6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff)
downloadtqt3-1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a.tar.gz
tqt3-1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a.zip
Automated update from Qt3
Diffstat (limited to 'qmake/generators/unix/unixmake2.cpp')
-rw-r--r--qmake/generators/unix/unixmake2.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index d988819a0..684a6442b 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"))