diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-25 14:02:04 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-25 14:02:04 +0200 |
| commit | a1ad9a74ebb3c556c5f70f7e03be68b09598ac53 (patch) | |
| tree | 615a96db418219a57a745a5899e39a9ac90744ec /qmake/doc | |
| parent | 6d78b7a0c46ea04f4bb771d960e2f7dff1362341 (diff) | |
| parent | 462f355e4fb16cc7a1838fa2dda0f763eee58c84 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/corelib/io/io.pri
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/network/socket/qabstractsocket.cpp
src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.cpp
src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h
src/widgets/styles/qgtkstyle.cpp
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro
tests/auto/dbus/qdbusconnection/qdbusconnection.pro
tests/auto/dbus/qdbuspendingcall/tst_qdbuspendingcall.cpp
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
Change-Id: I347549a024eb5bfa986699e0a11f96cc55c797a7
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 91f9040383..bc2b4a57e9 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 |