summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/kernel/qbasictimer.cpp25
-rw-r--r--src/corelib/kernel/qbasictimer.h11
2 files changed, 2 insertions, 34 deletions
diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp
index 623ecb9b8b..604b4edba6 100644
--- a/src/corelib/kernel/qbasictimer.cpp
+++ b/src/corelib/kernel/qbasictimer.cpp
@@ -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.
@@ -105,29 +105,6 @@ QT_BEGIN_NAMESPACE
\sa stop(), isActive(), swap()
*/
-#if QT_DEPRECATED_SINCE(5, 14)
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
- \internal
-*/
-QBasicTimer::QBasicTimer(const QBasicTimer &other)
- : id{other.id}
-{
- qWarning("QBasicTimer can't be copied");
-}
-
-/*!
- \internal
-*/
-QBasicTimer &QBasicTimer::operator=(const QBasicTimer &other)
-{
- id = other.id;
- qWarning("QBasicTimer can't be assigned to");
- return *this;
-}
-#endif
-#endif
-
/*!
\fn QBasicTimer::~QBasicTimer()
diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h
index 769898f835..b9bfd636bc 100644
--- a/src/corelib/kernel/qbasictimer.h
+++ b/src/corelib/kernel/qbasictimer.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.
@@ -51,16 +51,7 @@ class QObject;
class Q_CORE_EXPORT QBasicTimer
{
int id;
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
Q_DISABLE_COPY(QBasicTimer)
-#elif QT_DEPRECATED_SINCE(5, 14)
-public:
- // Just here to preserve BC, we can't remove them yet
- QT_DEPRECATED_X("copy-construction is unsupported; use move-construction instead")
- QBasicTimer(const QBasicTimer &);
- QT_DEPRECATED_X("copy-assignment is unsupported; use move-assignment instead")
- QBasicTimer &operator=(const QBasicTimer &);
-#endif
public:
constexpr QBasicTimer() noexcept : id{0} {}