From 4b9ec075f8f6f1b38a91c43a66fae157415dfae1 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 31 Aug 2020 12:11:07 +0200 Subject: Remove spurious const from QVariant::convert()'s first parameter As per ### Qt6 comment. Task-number: QTBUG-85700 Change-Id: I24292d9f2b8f7781032aa8df2a7a0c58ad4fb6c9 Reviewed-by: Lars Knoll --- src/corelib/kernel/qvariant.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/corelib/kernel/qvariant.h') diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 7d01911333..47103725f8 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -489,7 +489,7 @@ protected: Private d; void create(int type, const void *copy); bool equals(const QVariant &other) const; - bool convert(const int t, void *ptr) const; // ### Qt6: drop const + bool convert(int t, void *ptr) const; private: // force compile error, prevent QVariant(bool) to be called -- cgit v1.2.3