diff options
| -rw-r--r-- | README | 4 | ||||
| -rw-r--r-- | dist/changes-1.1.0 | 2 | ||||
| -rw-r--r-- | examples/datavisualization/audiolevels/audiolevels.cpp | 2 | ||||
| -rw-r--r-- | src/datavisualization/datavisualization.pro | 2 | ||||
| -rw-r--r-- | src/datavisualization/doc/src/qtdatavisualization.qdoc | 4 |
5 files changed, 7 insertions, 7 deletions
@@ -22,7 +22,7 @@ After running qmake, build the project with make: (Linux) make (Windows with MinGw) mingw32-make (Windows with Visual Studio) nmake - (OSX) make + (OS X) make The above generates the default makefiles for your configuration, which is typically the release build if you are using precompiled binary Qt distribution. To build both @@ -42,7 +42,7 @@ For release builds: qmake CONFIG+=debug_and_release make release -For both builds (Windows/Mac only): +For both builds (Windows/OS X only): qmake CONFIG+="debug_and_release build_all" make diff --git a/dist/changes-1.1.0 b/dist/changes-1.1.0 index 7d27438b..d404cf09 100644 --- a/dist/changes-1.1.0 +++ b/dist/changes-1.1.0 @@ -73,4 +73,4 @@ Platform specific changes - Fixed issue with graph not always updating before rotating the graph in iOS. - Fixed shader linking error on some Android versions. -- Fixed memory leaks in Mac and Android builds. +- Fixed memory leaks in OS X and Android builds. diff --git a/examples/datavisualization/audiolevels/audiolevels.cpp b/examples/datavisualization/audiolevels/audiolevels.cpp index 672e4984..c4a6b78c 100644 --- a/examples/datavisualization/audiolevels/audiolevels.cpp +++ b/examples/datavisualization/audiolevels/audiolevels.cpp @@ -74,7 +74,7 @@ AudioLevels::AudioLevels(Q3DBars *graph, QObject *parent) m_audioInput = new QAudioInput(inputDevice, formatAudio, this); #ifdef Q_OS_MAC - // Mac seems to wait for entire buffer to fill before calling writeData, so use smaller buffer + // OS X seems to wait for entire buffer to fill before calling writeData, so use smaller buffer m_audioInput->setBufferSize(256); #else m_audioInput->setBufferSize(1024); 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 |