diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:05:42 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-08-14 09:06:31 +0200 |
| commit | 5c23199d4e8ff21661dfa5aacc13149178e78cab (patch) | |
| tree | 322aee61581d7c85f1ccb65e47d1e79eba1ba6c9 /qmake/doc | |
| parent | 252bad7c589e03d3e12df02354b00a84d8e3159a (diff) | |
| parent | c8d9b17367cfdcb034d11f8a168ca4ae3993e7c3 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
configure
mkspecs/macx-xcode/Info.plist.app
mkspecs/macx-xcode/Info.plist.lib
qmake/doc/qmake.qdocconf
src/corelib/global/qglobal.h
tests/auto/other/exceptionsafety/exceptionsafety.pro
tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp
Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
Diffstat (limited to 'qmake/doc')
| -rw-r--r-- | qmake/doc/qmake.qdocconf | 50 | ||||
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 3 |
2 files changed, 52 insertions, 1 deletions
diff --git a/qmake/doc/qmake.qdocconf b/qmake/doc/qmake.qdocconf index ea82e45523..6b52ccc585 100644 --- a/qmake/doc/qmake.qdocconf +++ b/qmake/doc/qmake.qdocconf @@ -26,4 +26,52 @@ imagedirs = images exampledirs = snippets depends += \ - qtwinextras + activeqt \ + qt3d \ + qtassistant \ + qtbluetooth \ + qtconcurrent \ + qtcontacts \ + qtcore \ + qtdbus \ + qtdesigner \ + qtfeedback \ + qtgraphicaleffects \ + qtgui \ + qthelp \ + qtimageformats \ + qtlinguist \ + qtlocation \ + qtmultimedia \ + qtmultimediawidgets \ + qtnetwork \ + qtopengl \ + qtorganizer \ + qtprintsupport \ + qtpublishsubscribe \ + qtqml \ + qtquick \ + qtquickcontrols \ + qtquickcontrolsstyles \ + qtquickdialogs \ + qtquicklayouts \ + qtscript \ + qtscripttools \ + qtsensors \ + qtserialport \ + qtserviceframework \ + qtsql \ + qtsvg \ + qtsysteminfo \ + qttestlib \ + qttools \ + qtuitools \ + qtversit \ + qtwebkit \ + qtwebkitexamples \ + qtwidgets \ + qtwinextras \ + qtx11extras \ + qtxml \ + qtxmlpatterns + diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 1f45e5021e..a00d00d8c1 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -851,6 +851,7 @@ \contentspage {qmake Manual}{Contents} \previouspage Reference \nextpage Replace Functions + \keyword qmake Variable Reference The fundamental behavior of qmake is influenced by variable declarations that define the build process of each project. Some of these declare resources, @@ -2423,6 +2424,7 @@ \contentspage {qmake Manual}{Contents} \previouspage Variables \nextpage Test Functions + \keyword qmake Function Reference - Replace Functions qmake provides functions for processing the contents of variables during the configuration process. These functions are called @@ -2752,6 +2754,7 @@ \title Test Functions \contentspage {qmake Manual}{Contents} \previouspage Replace Functions + \keyword qmake Function Reference - Test Functions Test functions return a boolean value that you can test for in the conditional parts of scopes. Test functions can be divided into |