Sync with latest script

1 files changed, 19 insertions, 19 deletions

diff --git a/qmake/project.cpp b/qmake/project.cpp
index a96f6db0d..9b62d4cde 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -16,7 +16,7 @@
 ** and the KDE Free TQt Foundation.
 **
 ** Please review the following information to ensure GNU General
-** Public Licensing retquirements will be met:
+** Public Licensing requirements will be met:
 ** http://trolltech.com/products/qt/licenses/licensing/opensource/.
 ** If you are unsure which license is appropriate for your use, please
 ** review the following information:
@@ -767,11 +767,11 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
     }
     debug_msg(1, "Running project test: %s( %s )", func.latin1(), args.join("::").latin1());
 
-    if(func == "retquires") {
+    if(func == "requires") {
 	return doProjectCheckReqs(args, place);
     } else if(func == "equals") {
 	if(args.count() != 2) {
-	    fprintf(stderr, "%s:%d: equals(variable, value) retquires two arguments.\n", parser.file.latin1(),
+	    fprintf(stderr, "%s:%d: equals(variable, value) requires two arguments.\n", parser.file.latin1(),
 		    parser.line_no);
 	    return FALSE;
 	}
@@ -781,7 +781,7 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	return vars[args[0]].join(" ") == value;
     } else if(func == "exists") {
 	if(args.count() != 1) {
-	    fprintf(stderr, "%s:%d: exists(file) retquires one argument.\n", parser.file.latin1(),
+	    fprintf(stderr, "%s:%d: exists(file) requires one argument.\n", parser.file.latin1(),
 		    parser.line_no);
 	    return FALSE;
 	}
@@ -802,14 +802,14 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	return dir.count() != 0;
     } else if(func == "system") {
 	if(args.count() != 1) {
-	    fprintf(stderr, "%s:%d: system(exec) retquires one argument.\n", parser.file.latin1(),
+	    fprintf(stderr, "%s:%d: system(exec) requires one argument.\n", parser.file.latin1(),
 		    parser.line_no);
 	    return FALSE;
 	}
 	return system(args.first().latin1()) == 0;
     } else if(func == "contains") {
 	if(args.count() != 2) {
-	    fprintf(stderr, "%s:%d: contains(var, val) retquires two arguments.\n", parser.file.latin1(),
+	    fprintf(stderr, "%s:%d: contains(var, val) requires two arguments.\n", parser.file.latin1(),
 		    parser.line_no);
 	    return FALSE;
 	}
@@ -822,7 +822,7 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	return FALSE;
     } else if(func == "infile") {
 	if(args.count() < 2 || args.count() > 3) {
-	    fprintf(stderr, "%s:%d: infile(file, var, val) retquires at least 2 arguments.\n",
+	    fprintf(stderr, "%s:%d: infile(file, var, val) requires at least 2 arguments.\n",
 		    parser.file.latin1(), parser.line_no);
 	    return FALSE;
 	}
@@ -864,14 +864,14 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	return ret;
     } else if(func == "count") {
 	if(args.count() != 2) {
-	    fprintf(stderr, "%s:%d: count(var, count) retquires two arguments.\n", parser.file.latin1(),
+	    fprintf(stderr, "%s:%d: count(var, count) requires two arguments.\n", parser.file.latin1(),
 		    parser.line_no);
 	    return FALSE;
 	}
 	return vars[args[0]].count() == args[1].toUInt();
     } else if(func == "isEmpty") {
 	if(args.count() != 1) {
-	    fprintf(stderr, "%s:%d: isEmpty(var) retquires one argument.\n", parser.file.latin1(),
+	    fprintf(stderr, "%s:%d: isEmpty(var) requires one argument.\n", parser.file.latin1(),
 		    parser.line_no);
 	    return FALSE;
 	}
@@ -884,7 +884,7 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	    TQString func_desc = "include(file)";
 	    if(func == "load")
 		func_desc = "load(feature)";
-	    fprintf(stderr, "%s:%d: %s retquires one argument.\n", parser.file.latin1(),
+	    fprintf(stderr, "%s:%d: %s requires one argument.\n", parser.file.latin1(),
 		    parser.line_no, func_desc.latin1());
 	    return FALSE;
 	}
@@ -1009,7 +1009,7 @@ TQMakeProject::doProjectTest(const TQString& func, TQStringList args, TQMap<TQSt
 	return r;
     } else if(func == "error" || func == "message") {
 	if(args.count() != 1) {
-	    fprintf(stderr, "%s:%d: %s(message) retquires one argument.\n", parser.file.latin1(),
+	    fprintf(stderr, "%s:%d: %s(message) requires one argument.\n", parser.file.latin1(),
 		    parser.line_no, func.latin1());
 	    return FALSE;
 	}
@@ -1181,7 +1181,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 	    debug_msg(1, "Running function: %s( %s )", val.latin1(), arg_list.join("::").latin1());
 	    if(val.lower() == "member") {
 		if(arg_list.count() < 1 || arg_list.count() > 3) {
-		    fprintf(stderr, "%s:%d: member(var, start, end) retquires three arguments.\n",
+		    fprintf(stderr, "%s:%d: member(var, start, end) requires three arguments.\n",
 			    parser.file.latin1(), parser.line_no);
 		} else {
 		    const TQStringList &var = place[varMap(arg_list.first())];
@@ -1205,7 +1205,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		}
 	    } else if(val.lower() == "fromfile") {
 		if(arg_list.count() != 2) {
-		    fprintf(stderr, "%s:%d: fromfile(file, variable) retquires two arguments.\n",
+		    fprintf(stderr, "%s:%d: fromfile(file, variable) requires two arguments.\n",
 			    parser.file.latin1(), parser.line_no);
 		} else {
 		    TQString file = arg_list[0];
@@ -1269,7 +1269,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		    lst += split_value_list((*arg_it));
 	    } else if(val.lower() == "join") {
 		if(arg_list.count() < 1 || arg_list.count() > 4) {
-		    fprintf(stderr, "%s:%d: join(var, glue, before, after) retquires four"
+		    fprintf(stderr, "%s:%d: join(var, glue, before, after) requires four"
 			    "arguments.\n", parser.file.latin1(), parser.line_no);
 		} else {
 		    TQString glue, before, after;
@@ -1285,7 +1285,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		}
 	    } else if(val.lower() == "split") {
 		if(arg_list.count() < 2 || arg_list.count() > 3) {
-		    fprintf(stderr, "%s:%d split(var, sep, join) retquires three arguments\n",
+		    fprintf(stderr, "%s:%d split(var, sep, join) requires three arguments\n",
 			    parser.file.latin1(), parser.line_no);
 		} else {
 		    TQString sep = arg_list[1], join = " ";
@@ -1303,7 +1303,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		}
 	    } else if(val.lower() == "find") {
 		if(arg_list.count() != 2) {
-		    fprintf(stderr, "%s:%d find(var, str) retquires two arguments\n",
+		    fprintf(stderr, "%s:%d find(var, str) requires two arguments\n",
 			    parser.file.latin1(), parser.line_no);
 		} else {
 		    TQRegExp regx(arg_list[1]);
@@ -1319,7 +1319,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		}
 	    } else if(val.lower() == "system") {
 		if(arg_list.count() != 1) {
-		    fprintf(stderr, "%s:%d system(execut) retquires one argument\n",
+		    fprintf(stderr, "%s:%d system(execut) requires one argument\n",
 			    parser.file.latin1(), parser.line_no);
 		} else {
 		    char buff[256];
@@ -1338,7 +1338,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		}
 	    } else if(val.lower() == "files") {
 		if(arg_list.count() != 1) {
-		    fprintf(stderr, "%s:%d files(pattern) retquires one argument\n",
+		    fprintf(stderr, "%s:%d files(pattern) requires one argument\n",
 			    parser.file.latin1(), parser.line_no);
 		} else {
 		    TQString dir, regex = arg_list[0];
@@ -1357,7 +1357,7 @@ TQMakeProject::doVariableReplace(TQString &str, const TQMap<TQString, TQStringLi
 		}
 	    } else if(val.lower() == "prompt") {
 		if(arg_list.count() != 1) {
-		    fprintf(stderr, "%s:%d prompt(question) retquires one argument\n",
+		    fprintf(stderr, "%s:%d prompt(question) requires one argument\n",
 			    parser.file.latin1(), parser.line_no);
 		} else if(projectFile() == "-") {
 		    fprintf(stderr, "%s:%d prompt(question) cannot be used when '-o -' is used.\n",