diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-05 08:54:21 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-07-05 08:54:21 +0000 |
| commit | 207253384b69e49db22e9b1cfe472ad0d99a9051 (patch) | |
| tree | d31d1f136509cc1942f308c8bb479f7479131e6e /src/widgets/widgets/qdatetimeedit.h | |
| parent | 4f7507c52390cd19d76e0f36744f21fbc3e14674 (diff) | |
| parent | c2b224a758ce7e6dcf3748444fa8e29ab81904be (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/widgets/qdatetimeedit.h')
| -rw-r--r-- | src/widgets/widgets/qdatetimeedit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h index b54b0e7cf0..30e4a58bb3 100644 --- a/src/widgets/widgets/qdatetimeedit.h +++ b/src/widgets/widgets/qdatetimeedit.h @@ -177,7 +177,7 @@ public Q_SLOTS: protected: void keyPressEvent(QKeyEvent *event) override; -#ifndef QT_NO_WHEELEVENT +#if QT_CONFIG(wheelevent) void wheelEvent(QWheelEvent *event) override; #endif void focusInEvent(QFocusEvent *event) override; |