Sync with latest script

25 files changed, 35 insertions, 35 deletions

diff --git a/qmake/generators/mac/metrowerks_xml.cpp b/qmake/generators/mac/metrowerks_xml.cpp
index 2fbb5b1d7..4a81eb71a 100644
--- a/qmake/generators/mac/metrowerks_xml.cpp
+++ b/qmake/generators/mac/metrowerks_xml.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:
@@ -59,7 +59,7 @@ MetrowerksMakefileGenerator::writeMakefile(TQTextStream &t)
 {
     if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
 	/* for now just dump, I need to generated an empty xml or something.. */
-	fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n",
+	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
 		var("QMAKE_FAILED_RETQUIREMENTS").latin1());
 	return TRUE;
     }
diff --git a/qmake/generators/mac/metrowerks_xml.h b/qmake/generators/mac/metrowerks_xml.h
index f018dd708..60c0321ae 100644
--- a/qmake/generators/mac/metrowerks_xml.h
+++ b/qmake/generators/mac/metrowerks_xml.h
@@ -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:
diff --git a/qmake/generators/mac/pbuilder_pbx.cpp b/qmake/generators/mac/pbuilder_pbx.cpp
index 84e9494ad..4cd383605 100644
--- a/qmake/generators/mac/pbuilder_pbx.cpp
+++ b/qmake/generators/mac/pbuilder_pbx.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:
@@ -62,7 +62,7 @@ ProjectBuilderMakefileGenerator::writeMakefile(TQTextStream &t)
 {
     if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
 	/* for now just dump, I need to generated an empty xml or something.. */
-	fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n",
+	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
 		var("QMAKE_FAILED_RETQUIREMENTS").latin1());
 	return TRUE;
     }
diff --git a/qmake/generators/mac/pbuilder_pbx.h b/qmake/generators/mac/pbuilder_pbx.h
index df314060e..a3f43eb8e 100644
--- a/qmake/generators/mac/pbuilder_pbx.h
+++ b/qmake/generators/mac/pbuilder_pbx.h
@@ -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:
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 18f42be79..e937570a9 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.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:
diff --git a/qmake/generators/makefile.h b/qmake/generators/makefile.h
index 3acbb0237..7aa76d06e 100644
--- a/qmake/generators/makefile.h
+++ b/qmake/generators/makefile.h
@@ -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:
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp
index 4decf2a90..1e49949bc 100644
--- a/qmake/generators/projectgenerator.cpp
+++ b/qmake/generators/projectgenerator.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:
diff --git a/qmake/generators/projectgenerator.h b/qmake/generators/projectgenerator.h
index 0711ccefa..a35aa2647 100644
--- a/qmake/generators/projectgenerator.h
+++ b/qmake/generators/projectgenerator.h
@@ -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:
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 8a739a4df..985fcb139 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.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:
diff --git a/qmake/generators/unix/unixmake.h b/qmake/generators/unix/unixmake.h
index 164a06879..e243e1a5f 100644
--- a/qmake/generators/unix/unixmake.h
+++ b/qmake/generators/unix/unixmake.h
@@ -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:
diff --git a/qmake/generators/unix/unixmake2.cpp b/qmake/generators/unix/unixmake2.cpp
index 8bb851b69..8b6430bcd 100644
--- a/qmake/generators/unix/unixmake2.cpp
+++ b/qmake/generators/unix/unixmake2.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:
@@ -81,7 +81,7 @@ UnixMakefileGenerator::writeMakefile(TQTextStream &t)
 		t << *it << " ";
 	}
 	t << "all clean install distclean mocables uninstall uicables:" << "\n\t"
-	  << "@echo \"Some of the retquired modules ("
+	  << "@echo \"Some of the required modules ("
 	  << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t"
 	  << "@echo \"Skipped.\"" << endl << endl;
 	writeMakeQmake(t);
diff --git a/qmake/generators/win32/borland_bmake.cpp b/qmake/generators/win32/borland_bmake.cpp
index 218014b0c..fbbc1dfcb 100644
--- a/qmake/generators/win32/borland_bmake.cpp
+++ b/qmake/generators/win32/borland_bmake.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:
@@ -55,7 +55,7 @@ BorlandMakefileGenerator::writeMakefile(TQTextStream &t)
     writeHeader(t);
     if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
 	t << "all clean:" << "\n\t"
-	  << "@echo \"Some of the retquired modules ("
+	  << "@echo \"Some of the required modules ("
 	  << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t"
 	  << "@echo \"Skipped.\"" << endl << endl;
 	return TRUE;
diff --git a/qmake/generators/win32/borland_bmake.h b/qmake/generators/win32/borland_bmake.h
index bae9752fa..73af89b76 100644
--- a/qmake/generators/win32/borland_bmake.h
+++ b/qmake/generators/win32/borland_bmake.h
@@ -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:
diff --git a/qmake/generators/win32/mingw_make.cpp b/qmake/generators/win32/mingw_make.cpp
index 5afb16d37..c792ae3c5 100644
--- a/qmake/generators/win32/mingw_make.cpp
+++ b/qmake/generators/win32/mingw_make.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:
@@ -61,7 +61,7 @@ MingwMakefileGenerator::writeMakefile(TQTextStream &t)
     writeHeader(t);
     if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
 	t << "all clean:" << "\n\t"
-	  << "@echo \"Some of the retquired modules ("
+	  << "@echo \"Some of the required modules ("
 	  << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t"
 	  << "@echo \"Skipped.\"" << endl << endl;
 	writeMakeQmake(t);
diff --git a/qmake/generators/win32/mingw_make.h b/qmake/generators/win32/mingw_make.h
index 6058d7d13..51679bf51 100644
--- a/qmake/generators/win32/mingw_make.h
+++ b/qmake/generators/win32/mingw_make.h
@@ -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:
diff --git a/qmake/generators/win32/msvc_dsp.cpp b/qmake/generators/win32/msvc_dsp.cpp
index 8534d6908..e027bd121 100644
--- a/qmake/generators/win32/msvc_dsp.cpp
+++ b/qmake/generators/win32/msvc_dsp.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:
@@ -53,7 +53,7 @@ DspMakefileGenerator::writeMakefile(TQTextStream &t)
 {
     if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
 	/* for now just dump, I need to generated an empty dsp or something.. */
-	fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n",
+	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
 		var("QMAKE_FAILED_RETQUIREMENTS").latin1());
 	return TRUE;
     }
diff --git a/qmake/generators/win32/msvc_dsp.h b/qmake/generators/win32/msvc_dsp.h
index 99c6a1051..eedc81a95 100644
--- a/qmake/generators/win32/msvc_dsp.h
+++ b/qmake/generators/win32/msvc_dsp.h
@@ -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:
diff --git a/qmake/generators/win32/msvc_nmake.cpp b/qmake/generators/win32/msvc_nmake.cpp
index d82977f0b..e8b0cde59 100644
--- a/qmake/generators/win32/msvc_nmake.cpp
+++ b/qmake/generators/win32/msvc_nmake.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:
@@ -60,7 +60,7 @@ NmakeMakefileGenerator::writeMakefile(TQTextStream &t)
 		t << *it << " ";
 	}
 	t << "all clean:" << "\n\t"
-	  << "@echo \"Some of the retquired modules ("
+	  << "@echo \"Some of the required modules ("
 	  << var("QMAKE_FAILED_RETQUIREMENTS") << ") are not available.\"" << "\n\t"
 	  << "@echo \"Skipped.\"" << endl << endl;
 	writeMakeQmake(t);
@@ -744,7 +744,7 @@ NmakeMakefileGenerator::init()
 	// Created files
 	precompObj = var("OBJECTS_DIR") + project->first("TARGET") + "_pch" + Option::obj_ext;
 	precompPch = var("OBJECTS_DIR") + project->first("TARGET") + "_pch.pch";
-	// Add linking of precompObj (retquired for whole precompiled classes)
+	// Add linking of precompObj (required for whole precompiled classes)
 	project->variables()["OBJECTS"]		  += precompObj;
 	// Add pch file to cleanup
 	project->variables()["QMAKE_CLEAN"]	  += precompPch;
diff --git a/qmake/generators/win32/msvc_nmake.h b/qmake/generators/win32/msvc_nmake.h
index 22d3c1aa7..875d04074 100644
--- a/qmake/generators/win32/msvc_nmake.h
+++ b/qmake/generators/win32/msvc_nmake.h
@@ -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:
diff --git a/qmake/generators/win32/msvc_objectmodel.cpp b/qmake/generators/win32/msvc_objectmodel.cpp
index 7b89932e4..e4695962d 100644
--- a/qmake/generators/win32/msvc_objectmodel.cpp
+++ b/qmake/generators/win32/msvc_objectmodel.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:
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h
index 759242345..a84971683 100644
--- a/qmake/generators/win32/msvc_objectmodel.h
+++ b/qmake/generators/win32/msvc_objectmodel.h
@@ -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:
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index f22901b14..a17b32ac7 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.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:
@@ -181,9 +181,9 @@ VcprojGenerator::VcprojGenerator(TQMakeProject *p) : Win32MakefileGenerator(p),
 */
 bool VcprojGenerator::writeMakefile(TQTextStream &t)
 {
-    // Check if all retquirements are fullfilled
+    // Check if all requirements are fullfilled
     if(!project->variables()["QMAKE_FAILED_RETQUIREMENTS"].isEmpty()) {
-	fprintf(stderr, "Project file not generated because all retquirements not met:\n\t%s\n",
+	fprintf(stderr, "Project file not generated because all requirements not met:\n\t%s\n",
 		var("QMAKE_FAILED_RETQUIREMENTS").latin1());
 	return TRUE;
     }
diff --git a/qmake/generators/win32/msvc_vcproj.h b/qmake/generators/win32/msvc_vcproj.h
index c6ec5cb11..9e5488045 100644
--- a/qmake/generators/win32/msvc_vcproj.h
+++ b/qmake/generators/win32/msvc_vcproj.h
@@ -17,7 +17,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:
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp
index 6c92cb747..a4fbbde45 100644
--- a/qmake/generators/win32/winmakefile.cpp
+++ b/qmake/generators/win32/winmakefile.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:
diff --git a/qmake/generators/win32/winmakefile.h b/qmake/generators/win32/winmakefile.h
index 395638025..cde18cea4 100644
--- a/qmake/generators/win32/winmakefile.h
+++ b/qmake/generators/win32/winmakefile.h
@@ -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: