Doc: replace Mac OS X with OS X

Task-number: QTBUG-40759
Change-Id: If21b4551eb95af3370cc21edd7a6721fc06e1346
Reviewed-by: Martin Smith <martin.smith@digia.com>

diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index c0e1b4e42286da85eb3e3b97a70c3e87cfb6cb40..7df3299325f02b3a9af3fbf040745bae1ae12762 100644 (file)
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -1271,7 +1271,7 @@ void QQuickImageParticle::finishBuildParticleNodes(QSGNode** node)
 #endif
 
 #ifdef Q_OS_MAC
-    // Mac OS X 10.8.3 introduced a bug in the AMD drivers, for at least the 2011 macbook pros,
+    // OS X 10.8.3 introduced a bug in the AMD drivers, for at least the 2011 macbook pros,
     // causing point sprites who read gl_PointCoord in the frag shader to come out as
     // green-red blobs.
     if (perfLevel < Deformable && strstr((char *) glGetString(GL_VENDOR), "ATI")) {

diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
index 5a54609e12cd45bb5c9e2a68f7ce773840b1accb..ff48a10d95c40a14c818a6c83391051fe5162898 100644 (file)
--- a/src/qml/qml/qqmlimport.cpp
+++ b/src/qml/qml/qqmlimport.cpp
@@ -1641,7 +1641,7 @@ QString QQmlImportDatabase::resolvePlugin(QQmlTypeLoader *typeLoader,
   \row \li Unix/Linux  \li \c .so
   \row \li AIX  \li \c .a
   \row \li HP-UX       \li \c .sl, \c .so (HP-UXi)
-  \row \li Mac OS X    \li \c .dylib, \c .bundle, \c .so
+  \row \li OS X    \li \c .dylib, \c .bundle, \c .so
   \endtable
 
   Version number on unix are ignored.

diff --git a/src/quick/items/qquickevents.cpp b/src/quick/items/qquickevents.cpp
index 3ce4a8cb49682ffe89d8cf7affbfc143068c6fef..13804527185b6ddcd01eae307ea356766162f2d0 100644 (file)
--- a/src/quick/items/qquickevents.cpp
+++ b/src/quick/items/qquickevents.cpp
@@ -323,7 +323,7 @@ Item {
     \qmlproperty point QtQuick::WheelEvent::pixelDelta
 
     This property holds the delta in screen pixels and is available in plataforms that
-    have high-resolution trackpads, such as Mac OS X.
+    have high-resolution trackpads, such as OS X.
     The x and y cordinate of this property holds the delta in horizontal and
     vertical orientation. The value should be used directly to scroll content on screen.
 

diff --git a/src/quick/items/qquicktextcontrol.cpp b/src/quick/items/qquicktextcontrol.cpp
index 95d2e7c99546926d45f401d3cb014cd733467b67..6929bb44a286f998eaba77f12903217889ea90ad 100644 (file)
--- a/src/quick/items/qquicktextcontrol.cpp
+++ b/src/quick/items/qquicktextcontrol.cpp
@@ -225,7 +225,7 @@ bool QQuickTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e)
         return false;
     }
 
-// Except for pageup and pagedown, Mac OS X has very different behavior, we don't do it all, but
+// Except for pageup and pagedown, OS X has very different behavior, we don't do it all, but
 // here's the breakdown:
 // Shift still works as an anchor, but only one of the other keys can be down Ctrl (Command),
 // Alt (Option), or Meta (Control).

diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index a4c61209f2abc35c634815a9e82d1187e5a95e3f..5c67d914a51835917ae01cdf2eb2820d5cea80c9 100644 (file)
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -78,7 +78,7 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDisableDistanceField, QML_DISABLE_DISTANCEFIELD)
     and setting \l echoMode to an appropriate value enables TextInput to be used for
     a password input field.
 
-    On Mac OS X, the Up/Down key bindings for Home/End are explicitly disabled.
+    On OS X, the Up/Down key bindings for Home/End are explicitly disabled.
     If you want such bindings (on any platform), you will need to construct them in QML.
 
     \sa TextEdit, Text

diff --git a/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml b/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml
index 87cba880afcbe180dc9b5c51090255e93eb572ed..cd0f95bc7a97c877db808ee8dac8dcef546e85ca 100644 (file)
--- a/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml
+++ b/tests/auto/quick/qquickanimationcontroller/data/tst_parallelanimation.qml
@@ -24,7 +24,7 @@ Rectangle {
     name:"AnimationController"
     when:windowShown
     function test_parallelAnimation_data() {
-       //FIXME:the commented lines fail on MAC OS X
+       //FIXME:the commented lines fail on OS X
        return [
               {tag:"0.1",progress:0.1, x:5, y:10, color:"#e50019", width:14, height:14},
               //{tag:"0.2",progress:0.2, x:10, y:20, color:"#cb0033", width:18, height:18},

diff --git a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
index 88cac92864713b4b345b361fa39aedbf30b7225c..d87054ac9e42e90a5e025cde05a716d29fa6c34f 100644 (file)
--- a/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
+++ b/tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp
@@ -2417,7 +2417,7 @@ void tst_qquicktextinput::navigation()
     simulateKey(&window, Qt::Key_Left);
     QVERIFY(input->hasActiveFocus() == true);
 
-    // Up and Down should NOT do Home/End, even on Mac OS X (QTBUG-10438).
+    // Up and Down should NOT do Home/End, even on OS X (QTBUG-10438).
     input->setCursorPosition(2);
     QCOMPARE(input->cursorPosition(),2);
     simulateKey(&window, Qt::Key_Up);