AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QProperty: Apply coding style and avoid warnings

Browse Source 
Change-Id: I14efdb293a4be39b3849b34bd8013fdab016ce7e
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
This commit is contained in:
Ulf Hermann 2020-05-25 12:53:53 +02:00
parent 3768a915bc
commit 36bd34dbdc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qproperty.cpp
View File

@ -319,7 +319,7 @@ void QPropertyObserverPointer::setBindingToMarkDirty(QPropertyBindingPrivate *bi
void QPropertyObserverPointer::notify(QPropertyBindingPrivate *triggeringBinding, void *propertyDataPtr) void QPropertyObserverPointer::notify(QPropertyBindingPrivate *triggeringBinding, void *propertyDataPtr)
{ {
bool knownIfPropertyChanged = false; bool knownIfPropertyChanged = false;
bool propertyChanged =true; bool propertyChanged = true;
auto observer = const_cast<QPropertyObserver*>(ptr); auto observer = const_cast<QPropertyObserver*>(ptr);
while (observer) { while (observer) {

4
tests/auto/corelib/kernel/qproperty/tst_qproperty.cpp
View File

@ -222,11 +222,11 @@ void tst_QProperty::avoidDependencyAllocationAfterFirstEval()
QCOMPARE(propWithBinding.value(), int(11)); QCOMPARE(propWithBinding.value(), int(11));
QVERIFY(QPropertyBasePointer::get(propWithBinding).bindingPtr()); QVERIFY(QPropertyBasePointer::get(propWithBinding).bindingPtr());
QCOMPARE(QPropertyBasePointer::get(propWithBinding).bindingPtr()->dependencyObserverCount, 2); QCOMPARE(QPropertyBasePointer::get(propWithBinding).bindingPtr()->dependencyObserverCount, 2u);
firstDependency = 100; firstDependency = 100;
QCOMPARE(propWithBinding.value(), int(110)); QCOMPARE(propWithBinding.value(), int(110));
QCOMPARE(QPropertyBasePointer::get(propWithBinding).bindingPtr()->dependencyObserverCount, 2); QCOMPARE(QPropertyBasePointer::get(propWithBinding).bindingPtr()->dependencyObserverCount, 2u);
} }
void tst_QProperty::propertyArrays() void tst_QProperty::propertyArrays()