diff options
| -rw-r--r-- | src/qml/util/qqmlpropertymap.h | 4 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgsimplematerial.h | 4 | ||||
| -rw-r--r-- | src/quick/scenegraph/util/qsgtexturematerial.h | 4 | ||||
| -rw-r--r-- | tests/auto/headersclean/headersclean.pro | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h index cd3516a907..5c79f08926 100644 --- a/src/qml/util/qqmlpropertymap.h +++ b/src/qml/util/qqmlpropertymap.h @@ -83,8 +83,8 @@ protected: virtual QVariant updateValue(const QString &key, const QVariant &input); template<class DerivedType> - QQmlPropertyMap(DerivedType *derived, QObject *parent) - : QObject(*allocatePrivate(), parent) + QQmlPropertyMap(DerivedType *derived, QObject *parentObj) + : QObject(*allocatePrivate(), parentObj) { Q_UNUSED(derived) init(&DerivedType::staticMetaObject); diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h index 25ac93b2c5..877ea1c4b5 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.h +++ b/src/quick/scenegraph/util/qsgsimplematerial.h @@ -142,8 +142,8 @@ class QSGSimpleMaterial : public QSGMaterial { public: #ifndef qdoc - QSGSimpleMaterial(const State &state, PtrShaderCreateFunc func) - : m_state(state) + QSGSimpleMaterial(const State &aState, PtrShaderCreateFunc func) + : m_state(aState) , m_func(func) { } diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h index 7fc06c7927..822084b463 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.h +++ b/src/quick/scenegraph/util/qsgtexturematerial.h @@ -61,10 +61,10 @@ public: void setTexture(QSGTexture *texture); QSGTexture *texture() const { return m_texture; } - void setMipmapFiltering(QSGTexture::Filtering filtering) { m_mipmap_filtering = filtering; } + void setMipmapFiltering(QSGTexture::Filtering filteringType) { m_mipmap_filtering = filteringType; } QSGTexture::Filtering mipmapFiltering() const { return (QSGTexture::Filtering) m_mipmap_filtering; } - void setFiltering(QSGTexture::Filtering filtering) { m_filtering = filtering; } + void setFiltering(QSGTexture::Filtering filteringType) { m_filtering = filteringType; } QSGTexture::Filtering filtering() const { return (QSGTexture::Filtering) m_filtering; } void setHorizontalWrapMode(QSGTexture::WrapMode mode) { m_horizontal_wrap = mode; } diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro index 6d2f74a6bc..4457fe1c38 100644 --- a/tests/auto/headersclean/headersclean.pro +++ b/tests/auto/headersclean/headersclean.pro @@ -1,4 +1,2 @@ QT = qml quick qmltest qmldevtools load(qt_headersclean) -# shadowing problems in scenegraph, allow it for now -*-g++*: QMAKE_CXXFLAGS -= -Wshadow |