Sync again

5 files changed, 10 insertions, 10 deletions

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;
     }