diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-30 20:53:29 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-30 22:52:15 +0200 |
commit | 4010cfbf2d91390f8cae1f6c5dbb352c1f5bf1d2 (patch) | |
tree | 52b82cc7111af8769f30f0993d5fc3fc9c586de2 /qmake | |
parent | d71f9d8c05d70053f2ce46dbb2203309addc0f93 (diff) | |
parent | ea9003268556154fdc305aa745890fdea92ac46b (diff) |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'qmake')
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 26fe0d62f1..ad08f729a7 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -321,6 +321,12 @@ \header \li Template \li qmake Output \row \li app (default) \li Makefile to build an application. \row \li lib \li Makefile to build a library. + \row \li aux \li Makefile to build nothing. Use this if no compiler needs to + be invoked to create the target, for instance because your + project is written in an interpreted language. + \note This template type is only available for Makefile-based + generators. In particular, it will not work with the vcxproj and + Xcode generators. \row \li subdirs \li Makefile containing rules for the subdirectories specified using the \l{SUBDIRS} variable. Each subdirectory must contain its own project file. @@ -2324,6 +2330,12 @@ \row \li subdirs \li Creates a Makefile for building targets in subdirectories. The subdirectories are specified using the \l{#SUBDIRS}{SUBDIRS} variable. + \row \li aux \li Creates a Makefile for not building anything. Use this if no compiler + needs to be invoked to create the target, for instance because your + project is written in an interpreted language. + \note This template type is only available for Makefile-based + generators. In particular, it will not work with the vcxproj and + Xcode generators. \row \li vcapp \li Windows only. Creates an application project for Visual Studio. See \l{Creating Visual Studio Project Files} for more information. |