diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-19 16:47:41 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-06-19 16:47:41 -0500 |
| commit | 1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a (patch) | |
| tree | 9a0f14bc0aa25cc54bcbadc7aeae4b62e2a19ace /qmake/generators | |
| parent | 6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff) | |
| download | tqt3-1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a.tar.gz tqt3-1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a.zip | |
Automated update from Qt3
Diffstat (limited to 'qmake/generators')
| -rw-r--r-- | qmake/generators/mac/pbuilder_pbx.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp index 04c8ab8e0..4f0945029 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/qmake") : + (project->isEmpty("QMAKE_QMAKE") ? TQString("$(QTDIR)/bin/tqmake") : var("QMAKE_QMAKE")) << endl; writeMakeQmake(mkt); mkf.close(); diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index b4348588c..fae1dc6c1 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -2183,7 +2183,7 @@ MakefileGenerator::writeMakeQmake(TQTextStream &t) t << project->variables()["QMAKE_INTERNAL_INCLUDED_FILES"].join(" \\\n\t\t") << "\n\t" << qmake <<endl; } - if(project->first("QMAKE_ORIG_TARGET") != "qmake") { + if(project->first("QMAKE_ORIG_TARGET") != "tqmake") { t << "qmake: " << project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].join(" \\\n\t\t") << "\n\t" << "@" << qmake << endl << endl; diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index f4049c2c6..6d72ce126 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -66,7 +66,7 @@ UnixMakefileGenerator::init() if(project->isEmpty("MAKEFILE")) project->variables()["MAKEFILE"].append("Makefile"); if(project->isEmpty("QMAKE")) - project->variables()["QMAKE"].append("qmake"); + project->variables()["QMAKE"].append("tqmake"); if(project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].findIndex("qmake_all") == -1) project->variables()["QMAKE_INTERNAL_QMAKE_DEPS"].append("qmake_all"); return; /* subdirs is done */ 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")) |