diff options
| author | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-25 10:44:32 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@digia.com> | 2013-10-25 10:44:32 +0300 |
| commit | 730e5832070f8552388e337f2268471fb8a5833a (patch) | |
| tree | 78536324914c1e11b7158580a42147df736c08f0 | |
| parent | 7e719bbe7132d89550b80db2efa930b135fdfa71 (diff) | |
| parent | 201a1119a5662329b9a628b7356290730b7c6b1e (diff) | |
Merge remote-tracking branch 'origin/develop'
Change-Id: I5c89421d3dd3ba3dbf21c8455ab4d9db5ee0f3b9
| -rw-r--r-- | README | 6 | ||||
| -rw-r--r-- | examples/audiolevels/doc/images/audiolevels-example.png | bin | 168074 -> 70631 bytes | |||
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization.qdoc | 6 |
3 files changed, 6 insertions, 6 deletions
@@ -36,13 +36,13 @@ For release builds: or qmake CONFIG+=debug_and_release; make release -For both builds +For both builds: qmake CONFIG+="debug_and_release build_all"; make -If you want to install the module to your Qt directory use: +After building, install the module to your Qt directory: make install -If you want to uninstall the module +If you want to uninstall the module: make uninstall Building as a statically linked library diff --git a/examples/audiolevels/doc/images/audiolevels-example.png b/examples/audiolevels/doc/images/audiolevels-example.png Binary files differindex 68d9121e..58566545 100644 --- a/examples/audiolevels/doc/images/audiolevels-example.png +++ b/examples/audiolevels/doc/images/audiolevels-example.png diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index 393bd6f9..5ec60061 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -100,17 +100,17 @@ qmake CONFIG+=debug_and_release; make release \endcode - For both builds + For both builds: \code qmake CONFIG+="debug_and_release build_all"; make \endcode - If you want to install the module to your Qt directory use: + After building, install the module to your Qt directory: \code make install \endcode - If you want to uninstall the module + If you want to uninstall the module: \code make uninstall \endcode |
