QQmlIncubator: remove deprecated code

Change-Id: I2aecdf789775c2363fb7990153951b45e2c42408
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

3 files changed, 1 insertions, 35 deletions

diff --git a/src/qml/qml/qqmlincubator.cpp b/src/qml/qml/qqmlincubator.cpp
index 1f41934c3c..6a0210c153 100644
--- a/src/qml/qml/qqmlincubator.cpp
+++ b/src/qml/qml/qqmlincubator.cpp
@@ -409,26 +409,6 @@ void QQmlIncubationController::incubateFor(int msecs)
     } while (d && d->incubatorCount != 0 && !i.shouldInterrupt());
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
-\obsolete
-
-\warning Do not use this function.
-Use the overload taking a \c{std::atomic<bool>} instead.
-*/
-void QQmlIncubationController::incubateWhile(volatile bool *flag, int msecs)
-{
-    if (!d || !d->incubatorCount)
-        return;
-
-    QQmlInstantiationInterrupt i(flag, msecs * Q_INT64_C(1000000));
-    i.reset();
-    do {
-        static_cast<QQmlIncubatorPrivate*>(d->incubatorList.first())->incubate(i);
-    } while (d && d->incubatorCount != 0 && !i.shouldInterrupt());
-}
-#endif
-
 /*!
 \since 5.15
 
diff --git a/src/qml/qml/qqmlincubator.h b/src/qml/qml/qqmlincubator.h
index 6e47ca2173..594f60a0d8 100644
--- a/src/qml/qml/qqmlincubator.h
+++ b/src/qml/qml/qqmlincubator.h
@@ -113,10 +113,6 @@ public:
     int incubatingObjectCount() const;
 
     void incubateFor(int msecs);
-#if QT_DEPRECATED_SINCE(5, 15)
-    QT_DEPRECATED_VERSION_X(5, 15, "Use the overload that takes a std::atomic<bool>")
-    void incubateWhile(volatile bool *flag, int msecs=0);
-#endif
     void incubateWhile(std::atomic<bool> *flag, int msecs = 0);
 
 protected:
diff --git a/src/qml/qml/qqmlvme_p.h b/src/qml/qml/qqmlvme_p.h
index 784df5d7ef..5131a476ab 100644
--- a/src/qml/qml/qqmlvme_p.h
+++ b/src/qml/qml/qqmlvme_p.h
@@ -99,19 +99,16 @@ class QTypeInfo<QQmlVMETypes::State> : public QTypeInfoMerger<QQmlVMETypes::Stat
 class QQmlInstantiationInterrupt {
 public:
     inline QQmlInstantiationInterrupt();
-    // ### Qt 6: remove
-    inline QQmlInstantiationInterrupt(volatile bool *runWhile, qint64 nsecs=0);
     inline QQmlInstantiationInterrupt(std::atomic<bool> *runWhile, qint64 nsecs = 0);
     inline QQmlInstantiationInterrupt(qint64 nsecs);
 
     inline void reset();
     inline bool shouldInterrupt() const;
 private:
-    enum Mode { None, Time, LegacyFlag, Flag }; // ### Qt 6: remove LegacyFlag
+    enum Mode { None, Time, Flag };
     Mode mode;
     QElapsedTimer timer;
     qint64 nsecs = 0;
-    volatile bool *runWhileLegacy = nullptr; // ### Qt 6: remove
     std::atomic<bool> *runWhile = nullptr;
 };
 
@@ -156,11 +153,6 @@ QQmlInstantiationInterrupt::QQmlInstantiationInterrupt()
 {
 }
 
-QQmlInstantiationInterrupt::QQmlInstantiationInterrupt(volatile bool *runWhile, qint64 nsecs)
-    : mode(LegacyFlag), nsecs(nsecs), runWhileLegacy(runWhile)
-{
-}
-
 QQmlInstantiationInterrupt::QQmlInstantiationInterrupt(std::atomic<bool> *runWhile, qint64 nsecs)
     : mode(Flag), nsecs(nsecs), runWhile(runWhile)
 {
@@ -184,8 +176,6 @@ bool QQmlInstantiationInterrupt::shouldInterrupt() const
         return false;
     case Time:
         return timer.nsecsElapsed() > nsecs;
-    case LegacyFlag:
-        return !*runWhileLegacy || (nsecs && timer.nsecsElapsed() > nsecs);
     case Flag:
         return !runWhile->load(std::memory_order_acquire) || (nsecs && timer.nsecsElapsed() > nsecs);
     }