diff options
Diffstat (limited to 'src/quicktemplates2/qquickoverlay.cpp')
| -rw-r--r-- | src/quicktemplates2/qquickoverlay.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/quicktemplates2/qquickoverlay.cpp b/src/quicktemplates2/qquickoverlay.cpp index 12ecd284..e3910509 100644 --- a/src/quicktemplates2/qquickoverlay.cpp +++ b/src/quicktemplates2/qquickoverlay.cpp @@ -36,6 +36,7 @@ #include "qquickoverlay_p.h" #include "qquickoverlay_p_p.h" +#include "qquickpopupitem_p_p.h" #include "qquickpopup_p_p.h" #include "qquickdrawer_p_p.h" #include "qquickapplicationwindow_p.h" @@ -96,10 +97,12 @@ static QQuickItem *createDimmer(QQmlComponent *component, QQuickPopup *popup, QQ item->setZ(popup->z()); if (popup->isModal()) { item->setAcceptedMouseButtons(Qt::AllButtons); +#if QT_CONFIG(quicktemplates2_hover) // TODO: switch to QStyleHints::useHoverEffects in Qt 5.8 item->setAcceptHoverEvents(true); // item->setAcceptHoverEvents(QGuiApplication::styleHints()->useHoverEffects()); // connect(QGuiApplication::styleHints(), &QStyleHints::useHoverEffectsChanged, item, &QQuickItem::setAcceptHoverEvents); +#endif } if (component) component->completeCreate(); @@ -169,9 +172,9 @@ void QQuickOverlayPrivate::itemGeometryChanged(QQuickItem *item, QQuickGeometryC q->setSize(QSizeF(item->width(), item->height())); } -QQuickOverlayPrivate::QQuickOverlayPrivate() : - modal(nullptr), - modeless(nullptr) +QQuickOverlayPrivate::QQuickOverlayPrivate() + : modal(nullptr), + modeless(nullptr) { } @@ -376,6 +379,7 @@ void QQuickOverlay::mouseReleaseEvent(QMouseEvent *event) } } +#if QT_CONFIG(wheelevent) void QQuickOverlay::wheelEvent(QWheelEvent *event) { Q_D(QQuickOverlay); @@ -391,6 +395,7 @@ void QQuickOverlay::wheelEvent(QWheelEvent *event) } event->ignore(); } +#endif bool QQuickOverlay::childMouseEventFilter(QQuickItem *item, QEvent *event) { |