diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-10-06 11:10:14 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-10-06 11:42:27 +0300 |
| commit | e42580773cb4124ff02669b8a87ff550057d3793 (patch) | |
| tree | 42231f4b30dc91c21d1d95e2062667954543d807 /src/datavisualization | |
| parent | 90ac955006749ecf6ea021bc7cf736a6c21095af (diff) | |
Fix mac -> OS X
Change-Id: If0409af049a55dae152139fdb55a2eb58e5fbb51
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src/datavisualization')
| -rw-r--r-- | src/datavisualization/datavisualization.pro | 2 | ||||
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/datavisualization/datavisualization.pro b/src/datavisualization/datavisualization.pro index 692965b1..f0e56073 100644 --- a/src/datavisualization/datavisualization.pro +++ b/src/datavisualization/datavisualization.pro @@ -1,5 +1,5 @@ # Target can't start with 'Qt' as it gets major version number inserted into it in that case, -# which we don't want. Exception is mac bundles, where the target name must match the module name +# which we don't want. Exception is OS X bundles, where the target name must match the module name mac:CONFIG(shared, static|shared):contains(QT_CONFIG, qt_framework) { TARGET = QtDataVisualization } else { diff --git a/src/datavisualization/doc/src/qtdatavisualization.qdoc b/src/datavisualization/doc/src/qtdatavisualization.qdoc index d3fb4856..ad53ded3 100644 --- a/src/datavisualization/doc/src/qtdatavisualization.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization.qdoc @@ -98,7 +98,7 @@ \row \li Windows (MSVC) \li nmake \row - \li OSX \li make + \li OS X \li make \endtable The above generates the default makefiles for your configuration, which is typically @@ -127,7 +127,7 @@ make release \endcode - For both builds (Windows/Mac only): + For both builds (Windows/OS X only): \code qmake CONFIG+="debug_and_release build_all" make |