Merge remote-tracking branch 'origin/5.5' into 5.6.0

Conflicts:
	.qmake.conf

Change-Id: Id54f50aa7e6e6ad3c69254a37cff17354092348b

8 files changed, 14 insertions, 13 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 3ff75fd7..263197b6 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 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, {declarative/text/textselection}{Text Selection example}
diff --git a/src/declarative/qml/qbitfield_p.h b/src/declarative/qml/qbitfield_p.h
index 5a11de38..20f474ad 100644
--- a/src/declarative/qml/qbitfield_p.h
+++ b/src/declarative/qml/qbitfield_p.h
@@ -128,15 +128,16 @@ QBitField QBitField::united(const QBitField &o)
         rv.bits = max;
         rv.ownData = new quint32[length + 1];
         *(rv.ownData) = 1;
-        rv.data = rv.ownData + 1;
+        quint32 *rvdata;
+        rv.data = rvdata = rv.ownData + 1;
         if (bits > o.bits) {
-            ::memcpy((quint32 *)rv.data, data, length * sizeof(quint32));
+            ::memcpy(rvdata, data, length * sizeof(quint32));
             for (quint32 ii = 0; ii < (o.bits + quint32(31)) / 32; ++ii)
-                ((quint32 *)rv.data)[ii] |= o.data[ii];
+                rvdata[ii] |= o.data[ii];
         } else {
-            ::memcpy((quint32 *)rv.data, o.data, length * sizeof(quint32));
+            ::memcpy(rvdata, o.data, length * sizeof(quint32));
             for (quint32 ii = 0; ii < (bits + quint32(31)) / 32; ++ii)
-                ((quint32 *)rv.data)[ii] |= data[ii];
+                rvdata[ii] |= data[ii];
         }
         return rv;
     }
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index 9404834a..9df5dc4a 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 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/doc/src/declarative/examples.qdoc b/src/doc/src/declarative/examples.qdoc
index 65599568..8743a6f1 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 Mac OS X, you can run the included "QMLViewer" application from the
+On OS X, 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 a759a655..98894fb5 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 Mac OS X, you can launch the "QMLViewer" application instead.)
+(On OS X, 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/qmlviewer.qdoc b/src/doc/src/declarative/qmlviewer.qdoc
index 0eafb89a..4df4af8a 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 Mac OS X, the QML Viewer application is named "QMLViewer" instead. You
+On OS X, 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 25b03838..a7deedf7 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, Mac OS X, Linux, Symbian, and
+mobile platforms, such as Microsoft Windows, OS X, 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
diff --git a/src/imports/shaders/scenegraph/qsggeometry.h b/src/imports/shaders/scenegraph/qsggeometry.h
index f61489c9..53c61674 100644
--- a/src/imports/shaders/scenegraph/qsggeometry.h
+++ b/src/imports/shaders/scenegraph/qsggeometry.h
@@ -136,13 +136,13 @@ inline quint16 *QSGGeometry::indexDataAsUShort()
 inline const uint *QSGGeometry::indexDataAsUInt() const
 {
     Q_ASSERT(m_index_type == GL_UNSIGNED_INT);
-    return (uint *) indexData();
+    return (const uint *) indexData();
 }
 
 inline const quint16 *QSGGeometry::indexDataAsUShort() const
 {
     Q_ASSERT(m_index_type == GL_UNSIGNED_SHORT);
-    return (quint16 *) indexData();
+    return (const quint16 *) indexData();
 }
 
 inline QSGGeometry::Point2D *QSGGeometry::vertexDataAsPoint2D()