diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
| commit | ea9003268556154fdc305aa745890fdea92ac46b (patch) | |
| tree | a3ed6fc20fe4be0d7d07f752942cd5b7e2e3c7de /qmake | |
| parent | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (diff) | |
| parent | 7e74f8f398deb8ed84f6c4613de6dab2066dc9de (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/network/ssl/qsslsocket_openssl_symbols.cpp
Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
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. |