summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2013-11-04 09:33:07 +0200
committerTomi Korpipää <tomi.korpipaa@digia.com>2013-11-04 09:36:29 +0200
commitada069dfe29a555a4ad999583411791ce98970c8 (patch)
treeff0d498db83fceeefd43fde96ce6edfa8f3f657f
parent3622990c3d7d1d6b99b2c48303a11a8f8895b2c6 (diff)
Fix build instructions
Change-Id: I246b2f413494e8abd0b1c26d424592ac86047592 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
-rw-r--r--README23
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization.qdoc17
2 files changed, 25 insertions, 15 deletions
diff --git a/README b/README
index f4cbd3d5..4573323a 100644
--- a/README
+++ b/README
@@ -27,17 +27,22 @@ the release build if you are using precompiled binary Qt distribution. To build
debug and release, or one specifically, use one of the following qmake lines instead.
For debug builds:
- qmake CONFIG+=debug; make
- or
- qmake CONFIG+=debug_and_release; make debug
+ qmake CONFIG+=debug
+ make
+ or
+ qmake CONFIG+=debug_and_release
+ make debug
For release builds:
- qmake CONFIG+=release; make
- or
- qmake CONFIG+=debug_and_release; make release
-
-For both builds:
- qmake CONFIG+="debug_and_release build_all"; make
+ qmake CONFIG+=release
+ make
+ or
+ qmake CONFIG+=debug_and_release
+ make release
+
+For both builds (Windows/Mac only):
+ qmake CONFIG+="debug_and_release build_all"
+ make
After building, install the module to your Qt directory:
make install
diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc
index 86cc2a69..add1c252 100644
--- a/src/datavisualization/doc/src/qtdatavisualization.qdoc
+++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc
@@ -84,25 +84,30 @@
For debug builds:
\code
- qmake CONFIG+=debug; make
+ qmake CONFIG+=debug
+ make
\endcode
or
\code
- qmake CONFIG+=debug_and_release; make debug
+ qmake CONFIG+=debug_and_release
+ make debug
\endcode
For release builds:
\code
- qmake CONFIG+=release; make
+ qmake CONFIG+=release
+ make
\endcode
or
\code
- qmake CONFIG+=debug_and_release; make release
+ qmake CONFIG+=debug_and_release
+ make release
\endcode
- For both builds:
+ For both builds (Windows/Mac only):
\code
- qmake CONFIG+="debug_and_release build_all"; make
+ qmake CONFIG+="debug_and_release build_all"
+ make
\endcode
After building, install the module to your Qt directory: