diff options
Diffstat (limited to 'qmake/book/qmake-commandreference.leaf')
| -rw-r--r-- | qmake/book/qmake-commandreference.leaf | 20 |
1 files changed, 10 insertions, 10 deletions
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: |