diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-09-30 12:57:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-09-30 14:43:02 +0200 |
| commit | 99cdd5fc67386fb3361299b9ec493e081043097d (patch) | |
| tree | 2c1d41d3d71f671f104e93b87bf11bdd169ba746 /qmake/doc/src/qmake-manual.qdoc | |
| parent | 86876744f07cbaa01daca6869b896741878c39a3 (diff) | |
| parent | 46201f0e82a7b1629adad196dfa8f7ff1cf4dffd (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/corelib/global/qrandom.cpp
src/corelib/io/qfileinfo.cpp
src/corelib/kernel/qeventdispatcher_win.cpp
src/corelib/kernel/qeventdispatcher_win_p.h
src/gui/text/qfontdatabase.cpp
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
src/plugins/platforms/windows/qwindowsglcontext.cpp
src/testlib/qtestcase.cpp
Done-With: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Done-With: Edward Welbourne <edward.welbourne@qt.io>
Change-Id: I4893212471aa24be804c989a581810e2f714545c
Diffstat (limited to 'qmake/doc/src/qmake-manual.qdoc')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 5e54278dd1..da3aa6b248 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -992,6 +992,22 @@ \row \li embed_translations \li Embed the generated translations from \c lrelease in the executable, under \l{QM_FILES_RESOURCE_PREFIX}. Requires \c lrelease to be set, too. Not set by default. + \row \li create_libtool \li Create a libtool .la file for the currently + built library. + \row \li create_pc \li Create a pkg-config .pc file for the currently built + library. + \row \li no_batch \li NMake only: Turn off generation of NMake batch rules + or inference rules. + \row \li skip_target_version_ext \li Suppress the automatic version number + appended to the DLL file name on Windows. + \row \li suppress_vcproj_warnings \li Suppress warnings of the VS project + generator. + \row \li windeployqt \li Automatically invoke windeployqt after linking, + and add the output as deployment items. + \row \li dont_recurse \li Suppress qmake recursion for the current + subproject. + \row \li no_include_pwd \li Do not add the current directory to + INCLUDEPATHS. \endtable When you use the \c debug_and_release option (which is the default under @@ -1039,6 +1055,8 @@ qmake will process all libraries linked to by the application and find their meta-information (see \l{LibDepend}{Library Dependencies} for more info). + \row \li no_install_prl \li This option disables the generation of + installation rules for generated .prl files. \endtable \note The \c create_prl option is required when \e {building} a |