diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:05:35 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2016-03-17 16:08:28 +0100 |
| commit | bf4efac4ed2f3b1ff11fd1361506dec3c2a8726c (patch) | |
| tree | f6267744ec62ad67a80607dd51fb6cf45632bdda /src/declarative/qml | |
| parent | e960ecdeb9a2dec5917ffba6bf607f124713ae53 (diff) | |
| parent | dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Change-Id: Icf88d0a2abb226cf067ba13d3d7b3d4bf8075a8c
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qbitfield_p.h | 11 | ||||
| -rw-r--r-- | src/declarative/qml/qdeclarativeimport.cpp | 2 |
2 files changed, 7 insertions, 6 deletions
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. |