diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:46:20 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-02-16 21:51:11 +0100 |
| commit | c577f6edafef7c40a5f78092ec4fcd78bb820b2c (patch) | |
| tree | 9ca3819e5cca9b7e61f305a874b682e5a2085e83 /qmake | |
| parent | 99ce1d3d97c0423c3ee63ccf58deed964db0770e (diff) | |
| parent | de225ccdf95efb57866d62bc80872c1a2ab99703 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
src/corelib/plugin/qlibrary_unix.cpp
src/plugins/platforms/xcb/qxcbconnection.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
Change-Id: I632c400d909f8c204f55743aadc7886af2f15dfb
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index a8ccd199b4..50733836f8 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1230,10 +1230,6 @@ 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 @@ -2354,16 +2350,6 @@ qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. - \target SIGNATURE_FILE - \section1 SIGNATURE_FILE - - \note This variable is only used on Windows CE. - - Specifies which signature file should be used to sign the project target. - - \note This variable will overwrite the setting you have specified in configure, - with the \c -signature option. - \target SOURCES \section1 SOURCES @@ -4483,8 +4469,8 @@ include the precompiled header file in \c HEADERS, as qmake will do this if the configuration supports precompiled headers. - The MSVC and g++ specs targeting Windows (and Windows CE) enable - \c precompile_header by default. + The MSVC and g++ specs targeting Windows enable \c precompile_header + by default. Using this option, you may trigger conditional blocks in your project file to add settings when using |