diff options
Diffstat (limited to 'qmake/book')
| -rw-r--r-- | qmake/book/qmake-advanced.leaf | 6 | ||||
| -rw-r--r-- | qmake/book/qmake-commandreference.leaf | 20 | ||||
| -rw-r--r-- | qmake/book/qmake-concepts.leaf | 2 | ||||
| -rw-r--r-- | qmake/book/qmake-preface.leaf | 4 | ||||
| -rw-r--r-- | qmake/book/qmake-quick.leaf | 2 | ||||
| -rw-r--r-- | qmake/book/qmake-tutorial.leaf | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/qmake/book/qmake-advanced.leaf b/qmake/book/qmake-advanced.leaf index 21c58242..d1b8c4b1 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 1e499ab7..f89559db 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 09dadad3..8275a235 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 6f1e3491..50880f5a 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 a202bcb1..135e9fa6 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 5e1645fc..b300f059 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: |