Merge remote-tracking branch 'origin/5.7' into dev

Change-Id: I4de2529ce5a4ce8227c7f320cbee9610e5ac7594

8 files changed, 29 insertions, 29 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 05b47d40..24a91f73 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
     and setting \l echoMode to an appropriate value enables TextInput to be used for
     a password input field.
 
-    On OS X, the Up/Down key bindings for Home/End are explicitly disabled.
+    On \macos, 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, {declarative/text/textselection}{Text Selection example}
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index 9df5dc4a..0da608bc 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -840,7 +840,7 @@ QString QDeclarativeImportDatabase::resolvePlugin(const QDir &qmldirPath, const
   \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 OS X    \li \c .dylib, \c .bundle, \c .so
+  \row \li \macos    \li \c .dylib, \c .bundle, \c .so
   \endtable
 
   Version number on unix are ignored.
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 33ebc4d4..44b5938f 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -2595,33 +2595,33 @@ QPointF QDeclarativeParentAnimationPrivate::computeTransformOrigin(QDeclarativeI
     }
 }
 
+struct QDeclarativeParentAnimationData : public QAbstractAnimationAction
+{
+    QDeclarativeParentAnimationData() {}
+    ~QDeclarativeParentAnimationData() { qDeleteAll(pc); }
+
+    QDeclarativeStateActions actions;
+    //### reverse should probably apply on a per-action basis
+    bool reverse;
+    QList<QDeclarativeParentChange *> pc;
+    virtual void doAction()
+    {
+        for (int ii = 0; ii < actions.count(); ++ii) {
+            const QDeclarativeAction &action = actions.at(ii);
+            if (reverse)
+                action.event->reverse();
+            else
+                action.event->execute();
+        }
+    }
+};
+
 void QDeclarativeParentAnimation::transition(QDeclarativeStateActions &actions,
                         QDeclarativeProperties &modified,
                         TransitionDirection direction)
 {
     Q_D(QDeclarativeParentAnimation);
 
-    struct QDeclarativeParentAnimationData : public QAbstractAnimationAction
-    {
-        QDeclarativeParentAnimationData() {}
-        ~QDeclarativeParentAnimationData() { qDeleteAll(pc); }
-
-        QDeclarativeStateActions actions;
-        //### reverse should probably apply on a per-action basis
-        bool reverse;
-        QList<QDeclarativeParentChange *> pc;
-        virtual void doAction()
-        {
-            for (int ii = 0; ii < actions.count(); ++ii) {
-                const QDeclarativeAction &action = actions.at(ii);
-                if (reverse)
-                    action.event->reverse();
-                else
-                    action.event->execute();
-            }
-        }
-    };
-
     QDeclarativeParentAnimationData *data = new QDeclarativeParentAnimationData;
     QDeclarativeParentAnimationData *viaData = new QDeclarativeParentAnimationData;
 
diff --git a/src/doc/src/declarative/examples.qdoc b/src/doc/src/declarative/examples.qdoc
index 8743a6f1..a04cb0eb 100644
--- a/src/doc/src/declarative/examples.qdoc
+++ b/src/doc/src/declarative/examples.qdoc
@@ -43,7 +43,7 @@ To run the examples and demos, open them in Qt Creator or use the included
     qmlviewer $QTDIR/demos/declarative/samegame/samegame.qml
 \endcode
 
-On OS X, you can run the included "QMLViewer" application from the
+On \macos, you can run the included "QMLViewer" application from the
 Finder, or use the command line:
 
 \code
diff --git a/src/doc/src/declarative/extending-tutorial.qdoc b/src/doc/src/declarative/extending-tutorial.qdoc
index 98894fb5..7c69d76e 100644
--- a/src/doc/src/declarative/extending-tutorial.qdoc
+++ b/src/doc/src/declarative/extending-tutorial.qdoc
@@ -443,7 +443,7 @@ the project and then load the QML file in the \l {QML Viewer}:
     qmlviewer app.qml
 \endcode
 
-(On OS X, you can launch the "QMLViewer" application instead.)
+(On \macos, you can launch the "QMLViewer" application instead.)
 
 Notice the "import Charts 1.0" statement has disappeared from \c app.qml. This is
 because the \c qmldir file is in the same directory as \c app.qml: this is equivalent to
diff --git a/src/doc/src/declarative/qdeclarativeperformance.qdoc b/src/doc/src/declarative/qdeclarativeperformance.qdoc
index 1aea60d2..eb8b922b 100644
--- a/src/doc/src/declarative/qdeclarativeperformance.qdoc
+++ b/src/doc/src/declarative/qdeclarativeperformance.qdoc
@@ -132,9 +132,9 @@ performance for all use-cases, it typically has \b{consistently good} performanc
 all use-cases. In contrast, only using the raster paint engine may result in very good
 performance for parts of your application and very poor performance elsewhere.
 
-The QML Viewer uses the raster graphics system by default for X11 and OS X. It also
+The QML Viewer uses the raster graphics system by default for X11 and \macos. It also
 includes a \c -opengl command line option which sets a QGLWidget as the viewport of the
-view. On OS X, a QGLWidget is always used.
+view. On \macos, a QGLWidget is always used.
 
 You can also prevent QDeclarativeView from painting its window background if
 you will provide the background of your application using QML, e.g.
diff --git a/src/doc/src/declarative/qmlviewer.qdoc b/src/doc/src/declarative/qmlviewer.qdoc
index 4df4af8a..96b4d83a 100644
--- a/src/doc/src/declarative/qmlviewer.qdoc
+++ b/src/doc/src/declarative/qmlviewer.qdoc
@@ -50,7 +50,7 @@ file path on the command line:
     qmlviewer myqmlfile.qml
 \endcode
 
-On OS X, the QML Viewer application is named "QMLViewer" instead. You
+On \macos, the QML Viewer application is named "QMLViewer" instead. You
 can launch the viewer by opening the QMLViewer application from the Finder, or
 from the command line:
 
diff --git a/src/doc/src/declarative/qtquick-intro.qdoc b/src/doc/src/declarative/qtquick-intro.qdoc
index a7deedf7..cedb870b 100644
--- a/src/doc/src/declarative/qtquick-intro.qdoc
+++ b/src/doc/src/declarative/qtquick-intro.qdoc
@@ -93,7 +93,7 @@ to export the design to Qt Quick Designer.
 features for completing code snippets, refactoring code, and viewing the element
 hierarchy of QML files.
 \li Build and deploy Qt Quick applications that target multiple desktop and
-mobile platforms, such as Microsoft Windows, OS X, Linux, Symbian, and
+mobile platforms, such as Microsoft Windows, \macos, Linux, Symbian, and
 Maemo.
 \li Debug JavaScript functions and execute JavaScript expressions in the current
 context, and inspect QML at runtime to explore the object structure, debug