diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-08 07:46:35 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-06-08 07:46:35 +0000 |
| commit | 49c93774212904291bc2df008b265323ec55e62e (patch) | |
| tree | fc777e42097d13618e291a9f35b1cb453b7bd16d /tests/auto/widgets/kernel/qwidget | |
| parent | 92e472302a0ef8390f60fd91cac7f360b199a1e4 (diff) | |
| parent | 096e37910d93f9c52976600e985c615ea36fe291 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/widgets/kernel/qwidget')
| -rw-r--r-- | tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index e1577abc38..44b0b53b79 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -171,7 +171,7 @@ private slots: void enabledPropagation(); void ignoreKeyEventsWhenDisabled_QTBUG27417(); void properTabHandlingWhenDisabled_QTBUG27417(); -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) void acceptDropsPropagation(); #endif void isEnabledTo(); @@ -1047,7 +1047,7 @@ void tst_QWidget::properTabHandlingWhenDisabled_QTBUG27417() } // Drag'n drop disabled in this build. -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) void tst_QWidget::acceptDropsPropagation() { QScopedPointer<QWidget> testWidget(new QWidget); |