From 3ad1b623ac4af0f19db3580e4ef6b0d923260ba0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 22:07:55 -0600 Subject: Sync again --- qmake/generators/unix/unixmake2.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qmake/generators/unix/unixmake2.cpp') diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp index 8b6430bcd..a7f7dc6bd 100644 --- a/qmake/generators/unix/unixmake2.cpp +++ b/qmake/generators/unix/unixmake2.cpp @@ -73,7 +73,7 @@ UnixMakefileGenerator::writeMakefile(TQTextStream &t) { writeHeader(t); - if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) { + if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) { t << "QMAKE = " << (project->isEmpty("QMAKE_QMAKE") ? TQString("qmake") : var("QMAKE_QMAKE")) << endl; { //write the extra unix targets.. TQStringList &qut = project->variables()["QMAKE_EXTRA_UNIX_TARGETS"]; @@ -82,7 +82,7 @@ UnixMakefileGenerator::writeMakefile(TQTextStream &t) } t << "all clean install distclean mocables uninstall uicables:" << "\n\t" << "@echo \"Some of the required modules (" - << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t" + << var("QMAKE_FAILED_REQUIREMENTS") << ") are not available.\"" << "\n\t" << "@echo \"Skipped.\"" << endl << endl; writeMakeQmake(t); return TRUE; @@ -690,7 +690,7 @@ UnixMakefileGenerator::writeMakeParts(TQTextStream &t) } writeMakeQmake(t); - if(project->isEmpty("QMAKE_FAILED_RETQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) { + if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake")) { TQString meta_files; if(project->isActiveConfig("create_libtool") && project->first("TEMPLATE") == "lib" && !project->isActiveConfig("compile_libtool")) { //libtool -- cgit v1.2.3