Sync with latest script

41 files changed, 81 insertions, 81 deletions

diff --git a/qmake/CHANGES b/qmake/CHANGES
index 76bd6bdba..ca786eea8 100644
--- a/qmake/CHANGES
+++ b/qmake/CHANGES
@@ -8,7 +8,7 @@
    support for reading pkgconfig (.pkg) files
 
    PWD added as an automatic variable to mean the directory
-   the file being parsed is in (this change retquired that the
+   the file being parsed is in (this change required that the
    directory be set to the file being parsed as well, function
    tests that query relative paths will need to be relative the
    file being parsed).
diff --git a/qmake/book/qmake-advanced.leaf b/qmake/book/qmake-advanced.leaf
index 21c58242d..d1b8c4b1f 100644
--- a/qmake/book/qmake-advanced.leaf
+++ b/qmake/book/qmake-advanced.leaf
@@ -204,7 +204,7 @@ The second notation allows you to adjoin the variable expansion to another
 value without separating by space. \e qmake will allow a variable to
 contain anything (including $(VALUE), which will be placed directly into
 the Makefile, and allow it to expand as appropriate, usually an environment
-variable). However, if you retquire an environment variable to be replaced
+variable). However, if you require an environment variable to be replaced
 immediately then you may use the $$() notation. For example:
 
 \code
@@ -220,7 +220,7 @@ Test Functions as enumerated in the next section) are listed below:
 
 This will join the value of \e variablename with glue. If this value is
 non-empty it will prefix the value with \e before and suffix it with \e
-after. \e variablename is the only retquired field, the others will default
+after. \e variablename is the only required field, the others will default
 to empty strings. If you need to encode spaces in \e glue, \e before, or \e
 after you must quote them.
 
@@ -232,7 +232,7 @@ This will display \e question, and read from stdin as a return value.
 
 This will place the value in \e variablename in position \e position of the
 list. If the value of \e variablename is not long this will return an empty
-string. \e variablename is the only retquired field, if not specified
+string. \e variablename is the only required field, if not specified
 position will default to the first value in the list (0).
 
 \section2 find( variablename, substr )
diff --git a/qmake/book/qmake-commandreference.leaf b/qmake/book/qmake-commandreference.leaf
index 1e499ab7a..f89559db9 100644
--- a/qmake/book/qmake-commandreference.leaf
+++ b/qmake/book/qmake-commandreference.leaf
@@ -199,10 +199,10 @@ These \c CONFIG values control compilation flags:
 These options define the application/library type:
 
 \list
-\i qt - The target is a Qt application/library and retquires the Qt header
+\i qt - The target is a Qt application/library and requires the Qt header
      files/library.  The proper include and library paths for the Qt
      library will automatically be added to the project.
-\i opengl - The target retquires the OpenGL (or Mesa)
+\i opengl - The target requires the OpenGL (or Mesa)
     headers/libraries. The proper include and library paths for
     these libraries will automatically be added to the project.
 \i thread - The target is a multi-threaded application or library.  The
@@ -303,7 +303,7 @@ Defines the header files for the project.
 \e qmake will generate dependency information (unless -nodepend
 is specified on the \link #Commands command line \endlink) for the
 specified headers.  \e qmake will also automatically detect if
-\e moc is retquired by the classes in these headers, and add the
+\e moc is required by the classes in these headers, and add the
 appropriate dependencies and files to the project for generating and
 linking the moc files. 
 
@@ -337,7 +337,7 @@ For example:
 
 This variable specifies the .ui files (see \link
 designer-manual.book Qt Designer \endlink) to be processed through \e uic
-before compiling.  All dependencies, headers and source files retquired
+before compiling.  All dependencies, headers and source files required
 to build these .ui files will automatically be added to the project.
 
 For example:
@@ -693,7 +693,7 @@ UNIX - gcc 3.3 and up).
 On other platforms, this variable has different meaning, as noted
 below.
 
-This variable contains a list of header files that retquire some
+This variable contains a list of header files that require some
 sort of pre-compilation step (such as with moc). The value of this
 variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink and rarely needs to be
 modified.  
@@ -1008,7 +1008,7 @@ and rarely needs to be modified.
 \target QMAKE_FAILED_REQUIREMENTS
 \section3 QMAKE_FAILED_REQUIREMENTS
 
-This variable contains the list of retquirements that were failed to be met when
+This variable contains the list of requirements that were failed to be met when
 \e qmake was used.  For example, the sql module is needed and wasn't compiled into Qt.  The 
 value of this variable is typically handled by \e qmake or \link #QMAKESPEC qmake.conf \endlink 
 and rarely needs to be modified.
@@ -1934,7 +1934,7 @@ QMAKE_VERS = $$[QMAKE_VERSION]
 \target QMAKESPEC
 \section2 QMAKESPEC
 
-\e qmake retquires a platform and compiler description file which
+\e qmake requires a platform and compiler description file which
 contains many default values used to generate appropriate makefiles.
 The standard Qt distribution comes with many of these files, located
 in the 'mkspecs' subdirectory of the Qt installation.
@@ -1972,7 +1972,7 @@ directory. Once this is done you may insert it in the install list:
 \endcode
 
 Now \e qmake will take over making sure the correct things are copied
-to the specified places. If however you retquire greater control you
+to the specified places. If however you require greater control you
 may use the 'extra' member of the object:
 
 \code
@@ -2014,9 +2014,9 @@ sufficent. For example when statically linking a library there are no
 libraries linked against, and therefore no dependencies to those
 libraries are created - however an application that later links
 against this library will need to know where to find the symbols that
-the linked in library will retquire. To help with this situation \e
+the linked in library will require. To help with this situation \e
 qmake will follow a library's dependencies when it feels appropriate,
-however this behaviour must be enabled in \e qmake. To enable retquires
+however this behaviour must be enabled in \e qmake. To enable requires
 two steps. First, you must enable it in the library - to do this you
 must tell \e qmake to save information about this library:
 
diff --git a/qmake/book/qmake-concepts.leaf b/qmake/book/qmake-concepts.leaf
index 09dadad3a..8275a235d 100644
--- a/qmake/book/qmake-concepts.leaf
+++ b/qmake/book/qmake-concepts.leaf
@@ -11,7 +11,7 @@ also contains additional features to support Qt development.
 
 \e qmake generates a makefile based on the information in a project
 file.  Project files are created by the developer. Project files are
-usually simple, but can be quite sophisticated if retquired.
+usually simple, but can be quite sophisticated if required.
 \e qmake can also generate projects for Microsoft Visual studio
 without having to change the project file.  
 
diff --git a/qmake/book/qmake-preface.leaf b/qmake/book/qmake-preface.leaf
index 6f1e34910..50880f5a3 100644
--- a/qmake/book/qmake-preface.leaf
+++ b/qmake/book/qmake-preface.leaf
@@ -6,7 +6,7 @@
 different compilers and platforms.
 
 Writing makefiles by hand can be difficult and error prone, especially
-if several makefiles are retquired for different compiler and platform
+if several makefiles are required for different compiler and platform
 combinations. With \e qmake, developers create a simple single
 'project' file and run \e qmake to generate the appropriate
 makefiles. \e qmake takes care of all the compiler and platform
@@ -14,5 +14,5 @@ dependencies, freeing developers to focus on their code. Trolltech
 uses \e qmake as the primary build tool for the Qt library, and for
 the tools supplied with Qt.
 
-\e qmake also takes care of Qt's special retquirements, automatically
+\e qmake also takes care of Qt's special requirements, automatically
 including build rules for \link moc.html moc\endlink and \e uic.
diff --git a/qmake/book/qmake-quick.leaf b/qmake/book/qmake-quick.leaf
index a202bcb13..135e9fa60 100644
--- a/qmake/book/qmake-quick.leaf
+++ b/qmake/book/qmake-quick.leaf
@@ -24,7 +24,7 @@ until later on in the manual.
 \endcode
 
 This line specifies the source files that implement the application. In this
-case there is just one file, \e hello.cpp. Most applications retquire
+case there is just one file, \e hello.cpp. Most applications require
 multiple files; this situation is dealt with by listing all the files
 on the same line space separated, like this:
 \code
diff --git a/qmake/book/qmake-tutorial.leaf b/qmake/book/qmake-tutorial.leaf
index 5e1645fc0..b300f0597 100644
--- a/qmake/book/qmake-tutorial.leaf
+++ b/qmake/book/qmake-tutorial.leaf
@@ -199,7 +199,7 @@ you build your application with the console setting, you won't see the
 output.  We can easily put \e console on the CONFIG line so that on
 Windows the makefile will have this setting.  But let's say that we
 only want to add the CONFIG line if we are running on Windows \e and when
-\e debug is already on the CONFIG line.  This retquires using two
+\e debug is already on the CONFIG line.  This requires using two
 nested scopes; just create one scope, then create the other inside
 that one.  Put the settings to be processed inside the last scope,
 like this:
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:
diff --git a/qmake/main.cpp b/qmake/main.cpp
index e352a5880..9ff668cb6 100644
--- a/qmake/main.cpp
+++ b/qmake/main.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/meta.cpp b/qmake/meta.cpp
index faf414d16..326fcfabf 100644
--- a/qmake/meta.cpp
+++ b/qmake/meta.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/meta.h b/qmake/meta.h
index 8322ab588..b2b831d17 100644
--- a/qmake/meta.h
+++ b/qmake/meta.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/option.cpp b/qmake/option.cpp
index 52c732445..123856e6e 100644
--- a/qmake/option.cpp
+++ b/qmake/option.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/option.h b/qmake/option.h
index 631328cbf..7eee7548d 100644
--- a/qmake/option.h
+++ b/qmake/option.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/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",
diff --git a/qmake/project.h b/qmake/project.h
index af4ae2938..c65de1e5f 100644
--- a/qmake/project.h
+++ b/qmake/project.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/property.cpp b/qmake/property.cpp
index f58ddaf13..7450688f7 100644
--- a/qmake/property.cpp
+++ b/qmake/property.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/property.h b/qmake/property.h
index 9a2219427..3cc100fd8 100644
--- a/qmake/property.h
+++ b/qmake/property.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: