From 4b4a2545cf8ad3e063a2ae922d193479366a9fa0 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sat, 7 Mar 2015 16:21:19 -0800 Subject: QtDeclarative: fix const correctness in old-style casts Found by GCC's -Wcast-qual. Change-Id: Ia0aac2f09e9245339951ffff13c95df89028fe1c Reviewed-by: Alan Alpert --- src/declarative/qml/qbitfield_p.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/declarative') 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; } -- cgit v1.2.3 From a670a0a8ae4e649de90c5e5c39276d683c11f7e0 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Wed, 15 Jul 2015 15:51:09 +0200 Subject: Doc: Replace Mac OS X with OS X Task-number: QTBUG-40759 Change-Id: I1c05a2d07f38da1129bc127fd17c15f843b16bda Reviewed-by: Venugopal Shivashankar --- src/declarative/graphicsitems/qdeclarativetextinput.cpp | 2 +- src/declarative/qml/qdeclarativeimport.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/declarative') 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/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. -- cgit v1.2.3