Sync again

11 files changed, 24 insertions, 24 deletions

diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 4a81eb71a..9633ef3d1 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.cpp
@@ -57,10 +57,10 @@ MetrowerksMakefileGenerator::MetrowerksMakefileGenerator(TQMakeProject *p) : Mak
 bool
 MetrowerksMakefileGenerator::writeMakefile(TQTextStream &t)
 {
-    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
 	/* for now just dump, I need to generated an empty xml or something.. */
 	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
-		var("QMAKE_FAILED_RETQUIREMENTS").latin1());
+		var("QMAKE_FAILED_REQUIREMENTS").latin1());
 	return TRUE;
     }
 
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 4cd383605..ebbcb3ce9 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.cpp
@@ -60,10 +60,10 @@ ProjectBuilderMakefileGenerator::ProjectBuilderMakefileGenerator(TQMakeProject *
 bool
 ProjectBuilderMakefileGenerator::writeMakefile(TQTextStream &t)
 {
-    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
 	/* for now just dump, I need to generated an empty xml or something.. */
 	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
-		var("QMAKE_FAILED_RETQUIREMENTS").latin1());
+		var("QMAKE_FAILED_REQUIREMENTS").latin1());
 	return TRUE;
     }
 
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index e937570a9..c769e93eb 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -1427,7 +1427,7 @@ MakefileGenerator::write()
     findLibraries();
     if((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE || //write prl
        Option::qmake_mode == Option::QMAKE_GENERATE_PRL) &&
-       project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty() &&
+       project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty() &&
        project->isActiveConfig("create_prl") && project->first("TEMPLATE") == "lib" &&
        !project->isActiveConfig("plugin")) {
 	TQString prl = var("TARGET");
@@ -2160,7 +2160,7 @@ bool
 MakefileGenerator::writeMakeQmake(TQTextStream &t)
 {
     TQString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.name()));
-    if(project->isEmpty("QMAKE_FAILED_RETQUIREMENTS") && !project->isActiveConfig("no_autoqmake") &&
+    if(project->isEmpty("QMAKE_FAILED_REQUIREMENTS") && !project->isActiveConfig("no_autoqmake") &&
        !project->isEmpty("QMAKE_INTERNAL_PRL_FILE")) {
 	TQStringList files = fileFixify(Option::mkfile::project_files);
 	t << project->first("QMAKE_INTERNAL_PRL_FILE") << ": " << "\n\t"
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 985fcb139..f55132d4a 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -52,7 +52,7 @@ UnixMakefileGenerator::init()
 	return;
     init_flag = TRUE;
 
-    if(!project->isEmpty("QMAKE_FAILED_RETQUIREMENTS")) /* no point */
+    if(!project->isEmpty("QMAKE_FAILED_REQUIREMENTS")) /* no point */
 	return;
 
     TQStringList &configs = project->variables()["CONFIG"];
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
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index fbbc1dfcb..1f942417b 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.cpp
@@ -53,10 +53,10 @@ bool
 BorlandMakefileGenerator::writeMakefile(TQTextStream &t)
 {
     writeHeader(t);
-    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
 	t << "all clean:" << "\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;
 	return TRUE;
     }
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index c792ae3c5..d08359ca1 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.cpp
@@ -59,10 +59,10 @@ bool
 MingwMakefileGenerator::writeMakefile(TQTextStream &t)
 {
     writeHeader(t);
-    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
 	t << "all clean:" << "\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;
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index e027bd121..2ab133e48 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.cpp
@@ -51,10 +51,10 @@ DspMakefileGenerator::DspMakefileGenerator(TQMakeProject *p) : Win32MakefileGene
 bool
 DspMakefileGenerator::writeMakefile(TQTextStream &t)
 {
-    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
 	/* for now just dump, I need to generated an empty dsp or something.. */
 	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
-		var("QMAKE_FAILED_RETQUIREMENTS").latin1());
+		var("QMAKE_FAILED_REQUIREMENTS").latin1());
 	return TRUE;
     }
 
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index e8b0cde59..49eaf0515 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.cpp
@@ -53,7 +53,7 @@ bool
 NmakeMakefileGenerator::writeMakefile(TQTextStream &t)
 {
     writeHeader(t);
-    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
 	{ //write the extra unix targets..
 	    TQStringList &qut = project->variables()["QMAKE_EXTRA_WIN_TARGETS"];
 	    for(TQStringList::ConstIterator it = qut.begin(); it != qut.end(); ++it)
@@ -61,7 +61,7 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t)
 	}
 	t << "all clean:" << "\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;
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index a17b32ac7..b11b9a934 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -182,9 +182,9 @@ VcprojGenerator::VcprojGenerator(TQMakeProject *p) : Win32MakefileGenerator(p),
 bool VcprojGenerator::writeMakefile(TQTextStream &t)
 {
     // Check if all requirements are fullfilled
-    if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
+    if(!project->variables()["QMAKE_FAILED_REQUIREMENTS"].isEmpty()) {
 	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
-		var("QMAKE_FAILED_RETQUIREMENTS").latin1());
+		var("QMAKE_FAILED_REQUIREMENTS").latin1());
 	return TRUE;
     }
 
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 9b62d4cde..5b883b3c4 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -448,7 +448,7 @@ TQMakeProject::parse(const TQString &t, TQMap<TQString, TQStringList> &place)
 		varlist.remove((*valit));
 	}
     }
-    if(var == "RETQUIRES") /* special case to get communicated to backends! */
+    if(var == "REQUIRES") /* special case to get communicated to backends! */
 	doProjectCheckReqs(vallist, place);
 
     return TRUE;
@@ -1050,7 +1050,7 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap<TQString, TQSt
 	    int rparen = chk.findRev(')');
 	    if(rparen == -1) {
 		TQCString error;
-		error.sprintf("Function (in RETQUIRES) missing right paren: %s", chk.latin1());
+		error.sprintf("Function (in REQUIRES) missing right paren: %s", chk.latin1());
 		qmake_error_msg(error);
 	    } else {
 		TQString func = chk.left(lparen);
@@ -1064,9 +1064,9 @@ TQMakeProject::doProjectCheckReqs(const TQStringList &deps, TQMap<TQString, TQSt
 	    test = !test;
 	}
 	if(!test) {
-	    debug_msg(1, "Project Parser: %s:%d Failed test: RETQUIRES = %s",
+	    debug_msg(1, "Project Parser: %s:%d Failed test: REQUIRES = %s",
 		      parser.file.latin1(), parser.line_no, chk.latin1());
-	    place["QMAKE_FAILED_RETQUIREMENTS"].append(chk);
+	    place["QMAKE_FAILED_REQUIREMENTS"].append(chk);
 	    ret = FALSE;
 	}
     }