Merge integration refs/builds/qtci/dev/1617264361

src/corelib/animation/qpauseanimation.cpp

@@ -130,6 +130,7 @@ void QPauseAnimation::setDuration(int msecs)
     }
     Q_D(QPauseAnimation);
     d->duration.setValue(msecs);
+    d->duration.notify();
 }
 
 QBindable<int> QPauseAnimation::bindableDuration()

src/corelib/kernel/qproperty.h

@@ -844,7 +844,7 @@ class Q_CORE_EXPORT QBindingStorage
     mutable QBindingStorageData *d = nullptr;
     QBindingStatus *bindingStatus = nullptr;
 
-    template<typename Class, typename T, auto Offset, auto Setter>
+    template<typename Class, typename T, auto Offset, auto Setter, auto Signal>
     friend class QObjectCompatProperty;
 public:
     QBindingStorage();

src/corelib/kernel/qproperty_p.h

@@ -385,10 +385,11 @@ inline QPropertyObserverPointer QPropertyBindingDataPointer::firstObserver() con
     return { reinterpret_cast<QPropertyObserver *>(ptr->d_ptr) };
 }
 
-template<typename Class, typename T, auto Offset, auto Setter>
+template<typename Class, typename T, auto Offset, auto Setter, auto Signal=nullptr>
 class QObjectCompatProperty : public QPropertyData<T>
 {
-    using ThisType = QObjectCompatProperty<Class, T, Offset, Setter>;
+    using ThisType = QObjectCompatProperty<Class, T, Offset, Setter, Signal>;
+    using SignalTakesValue = std::is_invocable<decltype(Signal), Class, T>;
     Class *owner()
     {
         char *that = reinterpret_cast<char *>(this);
@@ -467,12 +468,13 @@ public:
         const bool inWrapper = inBindingWrapper(storage);
         if (bd && !inWrapper)
             bd->removeBinding();
-        if constexpr (QTypeTraits::has_operator_equal_v<T>)
-            if (this->val == t)
-                return;
         this->val = t;
-        if (!inWrapper)
+    }
-            notify(bd);
+
+    QObjectCompatProperty &operator=(parameter_type newValue)
+    {
+        setValue(newValue);
+        return *this;
     }
 
     QPropertyBinding<T> setBinding(const QPropertyBinding<T> &newBinding)
@@ -528,6 +530,21 @@ public:
             bd->removeBinding();
     }
 
+    void notify()
+    {
+        QBindingStorage *storage = qGetBindingStorage(owner());
+        auto bd = storage->bindingData(this, false);
+        const bool inWrapper = inBindingWrapper(storage);
+        if (bd && !inWrapper)
+            notify(bd);
+        if constexpr (Signal != nullptr) {
+            if constexpr (SignalTakesValue::value)
+                (owner()->*Signal)(value());
+            else
+                (owner()->*Signal)();
+        }
+    }
+
     QPropertyBinding<T> binding() const
     {
         auto *bd = qGetBindingStorage(owner())->bindingData(this);
@@ -567,24 +584,45 @@ private:
     }
 };
 
-#define Q_OBJECT_COMPAT_PROPERTY(Class, Type, name,  setter) \
+#define Q_OBJECT_COMPAT_PROPERTY4(Class, Type, name,  setter) \
     static constexpr size_t _qt_property_##name##_offset() { \
-        QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF \
         return offsetof(Class, name); \
-        QT_WARNING_POP \
     } \
     QObjectCompatProperty<Class, Type, Class::_qt_property_##name##_offset, setter> name;
 
-#define Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS(Class, Type, name, setter, value)                       \
+#define Q_OBJECT_COMPAT_PROPERTY5(Class, Type, name,  setter, signal) \
-    static constexpr size_t _qt_property_##name##_offset()                                         \
+    static constexpr size_t _qt_property_##name##_offset() { \
-    {                                                                                              \
+        return offsetof(Class, name); \
-        QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF return offsetof(Class, name);          \
+    } \
-        QT_WARNING_POP                                                                             \
+    QObjectCompatProperty<Class, Type, Class::_qt_property_##name##_offset, setter, signal> name;
-    }                                                                                              \
+
+#define Q_OBJECT_COMPAT_PROPERTY(...) \
+    QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF \
+    QT_OVERLOADED_MACRO(Q_OBJECT_COMPAT_PROPERTY, __VA_ARGS__) \
+    QT_WARNING_POP
+
+#define Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS5(Class, Type, name,  setter, value) \
+    static constexpr size_t _qt_property_##name##_offset() { \
+        return offsetof(Class, name); \
+    } \
     QObjectCompatProperty<Class, Type, Class::_qt_property_##name##_offset, setter> name =         \
             QObjectCompatProperty<Class, Type, Class::_qt_property_##name##_offset, setter>(       \
                     value);
 
+#define Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS6(Class, Type, name,  setter, signal, value) \
+    static constexpr size_t _qt_property_##name##_offset() { \
+        return offsetof(Class, name); \
+    } \
+    QObjectCompatProperty<Class, Type, Class::_qt_property_##name##_offset, setter> name =         \
+            QObjectCompatProperty<Class, Type, Class::_qt_property_##name##_offset, setter>(       \
+                    value);
+
+#define Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS(...) \
+    QT_WARNING_PUSH QT_WARNING_DISABLE_INVALID_OFFSETOF \
+    QT_OVERLOADED_MACRO(Q_OBJECT_COMPAT_PROPERTY_WITH_ARGS, __VA_ARGS__) \
+    QT_WARNING_POP
+
+
 namespace QtPrivate {
 Q_CORE_EXPORT BindingEvaluationState *suspendCurrentBindingStatus();
 Q_CORE_EXPORT void restoreBindingStatus(BindingEvaluationState *status);

src/corelib/kernel/qtimer.cpp

@@ -257,10 +257,9 @@ void QTimer::start()
 void QTimer::start(int msec)
 {
     Q_D(QTimer);
-    d->inter.removeBindingUnlessInWrapper();
+    d->inter.setValue(msec);
-    d->inter.setValueBypassingBindings(msec);
     start();
-    d->inter.markDirty();
+    d->inter.notify();
 }
 
 
@@ -754,9 +753,7 @@ QBindable<bool> QTimer::bindableSingleShot()
 void QTimer::setInterval(int msec)
 {
     Q_D(QTimer);
-    d->inter.removeBindingUnlessInWrapper();
+    d->inter.setValue(msec);
-
-    d->inter.setValueBypassingBindings(msec);
     if (d->id != INV_TIMER) {                        // create new timer
         QObject::killTimer(d->id);                        // restart timer
         d->id = QObject::startTimer(msec, d->type);

src/gui/image/qmovie.cpp

@@ -930,6 +930,7 @@ void QMovie::setSpeed(int percentSpeed)
     if (!d->speed && d->movieState == Running)
         d->nextImageTimer.start(nextFrameDelay());
     d->speed.setValue(percentSpeed);
+    d->speed.notify();
 }
 
 int QMovie::speed() const

tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp

@@ -469,12 +469,12 @@ class BindingLoopTester : public QObject
     BindingLoopTester() {}
 
     int eagerProp() {return eagerData.value();}
-    void setEagerProp(int i) { eagerData.setValue(i); }
+    void setEagerProp(int i) { eagerData.setValue(i); eagerData.notify(); }
     QBindable<int> bindableEagerProp() {return QBindable<int>(&eagerData);}
     Q_OBJECT_COMPAT_PROPERTY(BindingLoopTester, int, eagerData, &BindingLoopTester::setEagerProp)
 
     int eagerProp2() {return eagerData2.value();}
-    void setEagerProp2(int i) { eagerData2.setValue(i); }
+    void setEagerProp2(int i) { eagerData2.setValue(i); eagerData2.notify(); }
     QBindable<int> bindableEagerProp2() {return QBindable<int>(&eagerData2);}
     Q_OBJECT_COMPAT_PROPERTY(BindingLoopTester, int, eagerData2, &BindingLoopTester::setEagerProp2)
 };
@@ -536,7 +536,7 @@ public:
 
 #define GEN(N) \
     int prop##N() {return propData##N.value();} \
-    void setProp##N(int i) { propData##N.setValue(i); } \
+    void setProp##N(int i) { if (i == propData##N) return; propData##N.setValue(i); propData##N.notify(); } \
     QBindable<int> bindableProp##N() {return QBindable<int>(&propData##N);} \
     Q_OBJECT_COMPAT_PROPERTY(ReallocTester, int, propData##N, &ReallocTester::setProp##N)
     GEN(1)
@@ -1064,6 +1064,7 @@ public:
         if (i < 0)
             i = 0;
         compatData.setValue(i);
+        compatData.notify();
         emit compatChanged();
     }
 
@@ -1390,7 +1391,7 @@ class CompatPropertyTester : public QObject
     CompatPropertyTester(QObject *parent = nullptr) : QObject(parent) { }
 
     int prop1() {return prop1Data.value();}
-    void setProp1(int i) { prop1Data.setValue(i); }
+    void setProp1(int i) { if (i == prop1Data) return; prop1Data.setValue(i); prop1Data.notify(); }
     QBindable<int> bindableProp1() {return QBindable<int>(&prop1Data);}
     Q_OBJECT_COMPAT_PROPERTY(CompatPropertyTester, int, prop1Data, &CompatPropertyTester::setProp1)
 
@@ -1421,9 +1422,9 @@ signals:
     void prop3Changed();
 
 public:
-    void setProp1(int val) { prop1Data.setValue(val); emit prop1Changed();}
+    void setProp1(int val) { prop1Data.setValue(val); prop1Data.notify();}
-    void setProp2(int val) { prop2Data.setValue(val); emit prop2Changed();}
+    void setProp2(int val) { prop2Data.setValue(val); prop2Data.notify();}
-    void setProp3(int val) { prop3Data.setValue(val); emit prop3Changed();}
+    void setProp3(int val) { prop3Data.setValue(val); prop3Data.notify();}
 
     int prop1() { return prop1Data; }
     int prop2() { return prop2Data; }
@@ -1434,9 +1435,9 @@ public:
     QBindable<int> bindableProp3() { return QBindable<int>(&prop3Data); }
 
 private:
-    Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop1Data, &FakeDependencyCreator::setProp1);
+    Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop1Data, &FakeDependencyCreator::setProp1, &FakeDependencyCreator::prop1Changed);
-    Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop2Data, &FakeDependencyCreator::setProp2);
+    Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop2Data, &FakeDependencyCreator::setProp2, &FakeDependencyCreator::prop2Changed);
-    Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop3Data, &FakeDependencyCreator::setProp3);
+    Q_OBJECT_COMPAT_PROPERTY(FakeDependencyCreator, int, prop3Data, &FakeDependencyCreator::setProp3, &FakeDependencyCreator::prop3Changed);
 };
 
 void tst_QProperty::noFakeDependencies()