diff options
Diffstat (limited to 'qmake/generators/makefile.cpp')
| -rw-r--r-- | qmake/generators/makefile.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp index c4c42343f..02fa74c53 100644 --- a/qmake/generators/makefile.cpp +++ b/qmake/generators/makefile.cpp @@ -1616,7 +1616,7 @@ MakefileGenerator::writeUicSrc(TQTextStream &t, const TQString &ui) deps.remove(decl); //avoid circular dependencies.. t << decl << ": " << (*it) << " "; t << deps.join(" \\\n\t\t") << "\n\t" - << "$(UIC) " << (*it) << " -o " << decl << endl << endl; + << "$(TQUIC) " << (*it) << " -o " << decl << endl << endl; TQString mildDecl = decl; int k = mildDecl.findRev(Option::dir_sep); @@ -1626,7 +1626,7 @@ MakefileGenerator::writeUicSrc(TQTextStream &t, const TQString &ui) if(TQFile::exists((*it) + Option::h_ext.first())) t << (*it) << Option::h_ext.first() << " "; t << deps.join(" \\\n\t\t") << "\n\t" - << "$(UIC) " << (*it) << " -i " << mildDecl << " -o " << impl << endl << endl; + << "$(TQUIC) " << (*it) << " -i " << mildDecl << " -o " << impl << endl << endl; } } @@ -1807,15 +1807,15 @@ MakefileGenerator::writeImageSrc(TQTextStream &t, const TQString &src) TQString gen = project->first("MAKEFILE_GENERATOR"); if ( gen == "MSVC" ) { t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t" - << "$(UIC) -o " << (*it) << " -embed " << project->first("QMAKE_ORIG_TARGET") + << "$(TQUIC) -o " << (*it) << " -embed " << project->first("QMAKE_ORIG_TARGET") << " -f <<\n" << findDependencies((*it)).join(" ") << "\n<<" << endl << endl; } else if ( gen == "BMAKE" ) { t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t" - << "$(UIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET") + << "$(TQUIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET") << " -f &&|\n" << findDependencies((*it)).join(" ") << "\n| -o " << (*it) << endl << endl; } else { t << (*it) << ": " << findDependencies((*it)).join(" \\\n\t\t") << "\n\t" - << "$(UIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET") + << "$(TQUIC) " << " -embed " << project->first("QMAKE_ORIG_TARGET") << " " << findDependencies((*it)).join(" ") << " -o " << (*it) << endl << endl; } } |