diff options
Diffstat (limited to 'qmake/doc')
| -rw-r--r-- | qmake/doc/snippets/code/doc_src_qmake-manual.pro | 20 | ||||
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 47 |
2 files changed, 20 insertions, 47 deletions
diff --git a/qmake/doc/snippets/code/doc_src_qmake-manual.pro b/qmake/doc/snippets/code/doc_src_qmake-manual.pro index 335fa6f97e..7609a98111 100644 --- a/qmake/doc/snippets/code/doc_src_qmake-manual.pro +++ b/qmake/doc/snippets/code/doc_src_qmake-manual.pro @@ -186,21 +186,6 @@ DEFINES += USE_MY_STUFF #! [27] -#! [28] -myFiles.files = path\*.png -DEPLOYMENT += myFiles -#! [28] - - -#! [29] -myFiles.files = path\file1.ext1 path2\file2.ext1 path3\* -myFiles.path = \some\path\on\device -someother.files = C:\additional\files\* -someother.path = \myFiles\path2 -DEPLOYMENT += myFiles someother -#! [29] - - #! [30] DESTDIR = ../../lib #! [30] @@ -987,3 +972,8 @@ QMAKE_SONAME_PREFIX = /Library/Frameworks #! [185] VERSION_PE_HEADER = 1.2 #! [185] + +#! [186] +RC_DEFINES += USE_MY_STUFF +#! [186] + diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 56d9dd35ae..6f855ba9ca 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1120,38 +1120,6 @@ Specifies a list of all directories to look in to resolve dependencies. This variable is used when crawling through \c included files. - \target DEPLOYMENT - \section1 DEPLOYMENT - - \note This variable is used only on the Windows CE platform. - - Specifies which additional files will be deployed. Deployment means the - transfer of files from the development system to the target device or - emulator. - - Files can be deployed by either creating a Visual Studio project or using - the \l {Using Qt Test remotely on Windows CE}{cetest} executable. - - For example, the following definition uploads all PNG images in \c path to - the directory where the build target is deployed: - - \snippet code/doc_src_qmake-manual.pro 28 - - The default deployment target path for Windows CE is - \c{%CSIDL_PROGRAM_FILES%\target}, which usually gets expanded to - \c{\Program Files\target}. - - It is also possible to specify multiple \c sources to be deployed on - target \c paths. In addition, different variables can be used for - deployment to different directories. - - For example: - - \snippet code/doc_src_qmake-manual.pro 29 - - \note In Windows CE all linked Qt libraries will be deployed to the path - specified by \c{myFiles.path}. - \target DEPLOYMENT_PLUGIN \section1 DEPLOYMENT_PLUGIN @@ -1276,6 +1244,13 @@ For more information, see \l{Installing Files}. + This variable is also used to specify which additional files will be + deployed to embedded devices. + + For Windows CE, the default deployment target path is + \c{%CSIDL_PROGRAM_FILES%\target}, which usually gets expanded to + \c{\Program Files\target}. + \target LEXIMPLS \section1 LEXIMPLS @@ -2314,6 +2289,14 @@ .rc file. This is only utilized if the \l{VERSION} or \l{RC_ICONS} variable is set and the \l{RC_FILE} and \l{RES_FILE} variables are not set. + \target RC_DEFINES + \section1 RC_DEFINES + + Windows only. qmake adds the values of this variable as RC preprocessor macros + (/d option). If this variable is not set, the \l{DEFINES} variable is used instead. + + \snippet code/doc_src_qmake-manual.pro 186 + \target RC_ICONS \section1 RC_ICONS |