QSystemLocale(): disable copy and move
Axivion (SV546) points out (based on a clazy "rule of three" that might be rule of five by now) the lack of move and copy assignment and construction. We don't want those anyway, so tell the compiler not to create them. Pick-to: 6.5 Task-number: QTBUG-122619 Change-Id: Ie951a2c3d60d76ad3448310d3f9bbda22190015b Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> (cherry picked from commit 21ef6d930ad3eb2fb435cd601692cb5cc1726bd8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
parent
4c25cb76eb
commit
a07c718c17
@ -105,6 +105,7 @@ struct QLocaleData;
|
||||
// Subclassed by Android platform plugin:
|
||||
class Q_CORE_EXPORT QSystemLocale
|
||||
{
|
||||
Q_DISABLE_COPY_MOVE(QSystemLocale)
|
||||
QSystemLocale *next = nullptr; // Maintains a stack.
|
||||
|
||||
public:
|
||||
|
@ -11,6 +11,7 @@ QT_BEGIN_NAMESPACE
|
||||
|
||||
class QAndroidSystemLocale : public QSystemLocale
|
||||
{
|
||||
Q_DISABLE_COPY_MOVE(QAndroidSystemLocale)
|
||||
public:
|
||||
QAndroidSystemLocale();
|
||||
|
||||
|
@ -3966,6 +3966,7 @@ void tst_QLocale::bcp47Name()
|
||||
# ifdef QT_BUILD_INTERNAL
|
||||
class MySystemLocale : public QSystemLocale
|
||||
{
|
||||
Q_DISABLE_COPY_MOVE(MySystemLocale)
|
||||
public:
|
||||
MySystemLocale(const QString &locale)
|
||||
: m_name(locale), m_id(QLocaleId::fromName(locale)), m_locale(locale)
|
||||
|
Loading…
x
Reference in New Issue
Block a user