From 3ad1b623ac4af0f19db3580e4ef6b0d923260ba0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 5 Dec 2011 22:07:55 -0600 Subject: Sync again --- doc/html/qmake-manual-8.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/html/qmake-manual-8.html') diff --git a/doc/html/qmake-manual-8.html b/doc/html/qmake-manual-8.html index 5eded6cb6..b239495c5 100644 --- a/doc/html/qmake-manual-8.html +++ b/doc/html/qmake-manual-8.html @@ -212,8 +212,8 @@ win32:UI_HEADERS_DIR = c:\myproject\ui\include unix:UI_SOURCES_DIR = ../myproject/ui/src win32:UI_SOURCES_DIR = c:\myproject\ui\src -
RETQUIRES
-

This is a special variable processed by qmake. If the contents of this variable do not appear in CONFIG by the time this variable is assigned, then a minimal makefile will be generated that states what dependencies (the values assigned to RETQUIRES) are missing.

+
REQUIRES
+

This is a special variable processed by qmake. If the contents of this variable do not appear in CONFIG by the time this variable is assigned, then a minimal makefile will be generated that states what dependencies (the values assigned to REQUIRES) are missing.

This is mainly used in TQt's build system for building the examples.

SOURCES

This variable contains the name of all source files in the project.

@@ -369,7 +369,7 @@ app {

This variable contains C++ compiler flags for generating compiler warnings. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

QMAKE_EXTENSION_SHLIB

This variable contains the extention for shared libraries. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

-
QMAKE_FAILED_RETQUIREMENTS
+
QMAKE_FAILED_REQUIREMENTS

This variable contains the list of requirements that were failed to be met when qmake was used. For example, the sql module is needed and wasn't compiled into TQt. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

QMAKE_FILETAGS

This variable contains the file tags needed to be entered into the makefile, such as SOURCES and HEADERS. The value of this variable is typically handled by qmake or qmake.conf and rarely needs to be modified.

-- cgit v1.2.1