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/makefile.cpp | |
| 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/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 2 | 
1 files changed, 1 insertions, 1 deletions
| 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; | 
