diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:07:34 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-07 13:08:18 +0200 |
| commit | d1ea4813458b383e66ce4df69d1833b8b6a279c4 (patch) | |
| tree | 3bdc16da993e5de56b669e6774fb0748075ddd90 /src/corelib/kernel/qtimer.cpp | |
| parent | 1c87d4e1a1d0e1972f6dc85e55ea9be8a42797ba (diff) | |
| parent | 0b1ec78c2d4871afcc89d5b046926b88f0819a7c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/network/access/qnetworkreply.cpp
tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp
Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad
Diffstat (limited to 'src/corelib/kernel/qtimer.cpp')
| -rw-r--r-- | src/corelib/kernel/qtimer.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index 4a5738a6dc9..55f75ab17e1 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -148,6 +148,7 @@ static const int INV_TIMER = -1; // invalid timer id QTimer::QTimer(QObject *parent) : QObject(parent), id(INV_TIMER), inter(0), del(0), single(0), nulltimer(0), type(Qt::CoarseTimer) { + Q_UNUSED(del); // ### Qt 6: remove field } @@ -669,3 +670,4 @@ int QTimer::remainingTime() const QT_END_NAMESPACE #include "qtimer.moc" +#include "moc_qtimer.cpp" |