diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-26 20:06:57 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-08-26 20:06:57 +0200 |
| commit | afab1546a7665bac2a8d7a6452e6aea46bfd2127 (patch) | |
| tree | d616a7559c54a40e35a12b464f606774c9b0475b /qmake/doc | |
| parent | 06b457c693f207e392d3021d77a0ab18cd78da92 (diff) | |
| parent | 53ecaade10319ecc1d8115521ae6d8eba1ee55c1 (diff) | |
Merge remote-tracking branch 'origin/5.5' into 5.6
Conflicts:
qmake/doc/snippets/code/doc_src_qmake-manual.pro
qmake/doc/src/qmake-manual.qdoc
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/tools/qbytearray.cpp
src/widgets/kernel/qwidgetwindow.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/mimetypes/qmimedatabase/tst_qmimedatabase.cpp
tests/auto/network/access/qnetworkreply/BLACKLIST
Change-Id: I9efcd7e1cce1c394eed425c43aa6fce7d2edf31c
Diffstat (limited to 'qmake/doc')
| -rw-r--r-- | qmake/doc/snippets/code/doc_src_qmake-manual.pro | 6 | ||||
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 19 |
2 files changed, 25 insertions, 0 deletions
diff --git a/qmake/doc/snippets/code/doc_src_qmake-manual.pro b/qmake/doc/snippets/code/doc_src_qmake-manual.pro index 7609a98111..6fa3ca085d 100644 --- a/qmake/doc/snippets/code/doc_src_qmake-manual.pro +++ b/qmake/doc/snippets/code/doc_src_qmake-manual.pro @@ -977,3 +977,9 @@ VERSION_PE_HEADER = 1.2 RC_DEFINES += USE_MY_STUFF #! [186] +#! [187] +win32-g++:contains(QMAKE_HOST.arch, x86_64):{ + message("Host is 64bit") + ... +} +#! [187] diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 14697425c0..d54dc9569a 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1714,6 +1714,25 @@ See \l{Creating Frameworks} for more information about creating frameworks. + \target QMAKE_HOST + \section1 QMAKE_HOST + + Provides information about the host machine running qmake. + For example, you can retrieve the host machine architecture from + \c{QMAKE_HOST.arch}. + + \table + \header \li Keys \li Values + \row \li .arch \li Host architecture + \row \li .os \li Host OS + \row \li .cpu_count \li Number of available cpus + \row \li .name \li Host computer name + \row \li .version \li Host OS version number + \row \li .version_string \li Host OS version string + \endtable + + \snippet code/doc_src_qmake-manual.pro 187 + \target QMAKE_INCDIR \section1 QMAKE_INCDIR |