1 files changed, 7 insertions, 13 deletions

diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h
index 6e61ca10cb..e6db586aa0 100644
--- a/src/corelib/kernel/qtimer.h
+++ b/src/corelib/kernel/qtimer.h
@@ -63,7 +63,7 @@ class Q_CORE_EXPORT QTimer : public QObject
     Q_PROPERTY(Qt::TimerType timerType READ timerType WRITE setTimerType)
     Q_PROPERTY(bool active READ isActive)
 public:
-    explicit QTimer(QObject *parent = Q_NULLPTR);
+    explicit QTimer(QObject *parent = nullptr);
     ~QTimer();
 
     inline bool isActive() const { return id >= 0; }
@@ -83,7 +83,7 @@ public:
     static void singleShot(int msec, const QObject *receiver, const char *member);
     static void singleShot(int msec, Qt::TimerType timerType, const QObject *receiver, const char *member);
 
-#ifdef Q_QDOC
+#ifdef Q_CLANG_QDOC
     template<typename PointerToMemberFunction>
     static void singleShot(int msec, const QObject *receiver, PointerToMemberFunction method);
     template<typename PointerToMemberFunction>
@@ -122,14 +122,14 @@ public:
                                           !std::is_same<const char*, Func1>::value, void>::type
             singleShot(Duration interval, Func1 slot)
     {
-        singleShot(interval, defaultTypeFor(interval), nullptr, slot);
+        singleShot(interval, defaultTypeFor(interval), nullptr, std::move(slot));
     }
     template <typename Duration, typename Func1>
     static inline typename std::enable_if<!QtPrivate::FunctionPointer<Func1>::IsPointerToMemberFunction &&
                                           !std::is_same<const char*, Func1>::value, void>::type
             singleShot(Duration interval, Qt::TimerType timerType, Func1 slot)
     {
-        singleShot(interval, timerType, nullptr, slot);
+        singleShot(interval, timerType, nullptr, std::move(slot));
     }
     // singleShot to a functor or function pointer (with context)
     template <typename Duration, typename Func1>
@@ -137,7 +137,7 @@ public:
                                           !std::is_same<const char*, Func1>::value, void>::type
             singleShot(Duration interval, QObject *context, Func1 slot)
     {
-        singleShot(interval, defaultTypeFor(interval), context, slot);
+        singleShot(interval, defaultTypeFor(interval), context, std::move(slot));
     }
     template <typename Duration, typename Func1>
     static inline typename std::enable_if<!QtPrivate::FunctionPointer<Func1>::IsPointerToMemberFunction &&
@@ -150,7 +150,7 @@ public:
 
         singleShotImpl(interval, timerType, context,
                        new QtPrivate::QFunctorSlotObject<Func1, 0,
-                            typename QtPrivate::List_Left<void, 0>::Value, void>(slot));
+                            typename QtPrivate::List_Left<void, 0>::Value, void>(std::move(slot)));
     }
 #endif
 
@@ -165,37 +165,31 @@ Q_SIGNALS:
 
 public:
 #if QT_HAS_INCLUDE(<chrono>) || defined(Q_QDOC)
-    Q_ALWAYS_INLINE
     void setInterval(std::chrono::milliseconds value)
     {
         setInterval(int(value.count()));
     }
 
-    Q_ALWAYS_INLINE
     std::chrono::milliseconds intervalAsDuration() const
     {
         return std::chrono::milliseconds(interval());
     }
 
-    Q_ALWAYS_INLINE
     std::chrono::milliseconds remainingTimeAsDuration() const
     {
         return std::chrono::milliseconds(remainingTime());
     }
 
-    Q_ALWAYS_INLINE
     static void singleShot(std::chrono::milliseconds value, const QObject *receiver, const char *member)
     {
         singleShot(int(value.count()), receiver, member);
     }
 
-    Q_ALWAYS_INLINE
     static void singleShot(std::chrono::milliseconds value, Qt::TimerType timerType, const QObject *receiver, const char *member)
     {
         singleShot(int(value.count()), timerType, receiver, member);
     }
 
-    Q_ALWAYS_INLINE
     void start(std::chrono::milliseconds value)
     {
         start(int(value.count()));
@@ -203,7 +197,7 @@ public:
 #endif
 
 protected:
-    void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
+    void timerEvent(QTimerEvent *) override;
 
 private:
     Q_DISABLE_COPY(QTimer)