diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-19 19:15:41 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-06-19 19:15:41 -0500 |
| commit | e07167f4f6448ad4f5565609e5cd56a918d256f8 (patch) | |
| tree | 2b727f0d725e575301e7562fa165e6b9573f4a63 /qmake/generators/unix | |
| parent | d1096751ddb25cdef23919c17389fc268c31edaf (diff) | |
| parent | 1ecf57d6cfc4c0f3703eef6c90df9c3914baec6a (diff) | |
| download | tqt-e07167f4f6448ad4f5565609e5cd56a918d256f8.tar.gz tqt-e07167f4f6448ad4f5565609e5cd56a918d256f8.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'qmake/generators/unix')
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake2.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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")) |