diff options
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qdeadlinetimer.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/kernel/qdeadlinetimer.cpp b/src/corelib/kernel/qdeadlinetimer.cpp index 4fba30050d..66d0dce7e8 100644 --- a/src/corelib/kernel/qdeadlinetimer.cpp +++ b/src/corelib/kernel/qdeadlinetimer.cpp @@ -223,7 +223,7 @@ QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) Q_DECL_NOTHROW Constructs a QDeadlineTimer object with a deadline at \a deadline time point, converting from the clock source \c{Clock} to Qt's internal clock - source (see QElapsedTimer::clcokType()). + source (see QElapsedTimer::clockType()). If \a deadline is in the past, this QDeadlineTimer object is set to expired, whereas if \a deadline is equal to \c{Duration::max()}, then this @@ -266,7 +266,7 @@ QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) Q_DECL_NOTHROW Sets this QDeadlineTimer to the deadline marked by \a deadline time point, converting from the clock source \c{Clock} to Qt's internal clock - source (see QElapsedTimer::clcokType()). + source (see QElapsedTimer::clockType()). If \a deadline is in the past, this QDeadlineTimer object is set to expired, whereas if \a deadline is equal to \c{Duration::max()}, then this diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 974711e065..698ac256ff 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -3903,7 +3903,8 @@ bool QObject::setProperty(const char *name, const QVariant &value) d->extraData->propertyNames.append(name); d->extraData->propertyValues.append(value); } else { - if (value == d->extraData->propertyValues.at(idx)) + if (value.userType() == d->extraData->propertyValues.at(idx).userType() + && value == d->extraData->propertyValues.at(idx)) return false; d->extraData->propertyValues[idx] = value; } |