diff options
| author | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-06 13:57:26 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@trolltech.com> | 2009-05-06 13:57:26 (GMT) |
| commit | 91ffeeb342ce85dbd24f49c45adce5cb21a973a4 (patch) | |
| tree | c479fb021e2613c32f1de9e6f7abbc5887dc5425 /doc/src | |
| parent | 1560af4bca4a7ea2dd6b73ddef60cd012c4897b0 (diff) | |
| parent | f2123c9bbbe6468eaa6ab2b578ae0352094aa708 (diff) | |
| download | Qt-91ffeeb342ce85dbd24f49c45adce5cb21a973a4.zip Qt-91ffeeb342ce85dbd24f49c45adce5cb21a973a4.tar.gz Qt-91ffeeb342ce85dbd24f49c45adce5cb21a973a4.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/qmake-manual.qdoc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/src/qmake-manual.qdoc b/doc/src/qmake-manual.qdoc index 39581a2..172bc60 100644 --- a/doc/src/qmake-manual.qdoc +++ b/doc/src/qmake-manual.qdoc @@ -932,6 +932,7 @@ \o \l{qmake Variable Reference#QT}{QT} \o \l{qmake Variable Reference#RCC_DIR}{RCC_DIR} \o \l{qmake Variable Reference#REQUIRES}{REQUIRES} + \o \l{qmake Variable Reference#RESOURCES}{RESOURCES} \o \l{qmake Variable Reference#SOURCES}{SOURCES} \o \l{qmake Variable Reference#SUBDIRS}{SUBDIRS} \o \l{qmake Variable Reference#TARGET}{TARGET} @@ -2420,6 +2421,12 @@ This is mainly used in Qt's build system for building the examples. + \section1 RESOURCES + + This variable contains the name of the resource collection file (qrc) + for the application. Further information about the resource collection + file can be found at \l{The Qt Resource System}. + \section1 RES_FILE This variable contains the name of the resource file for the application. |