summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/effects/qpixmapfilter.cpp1
-rw-r--r--src/widgets/styles/qstylehelper.cpp1
-rw-r--r--src/widgets/widgets/qwidgetresizehandler.cpp4
3 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/effects/qpixmapfilter.cpp b/src/widgets/effects/qpixmapfilter.cpp
index 9d70825b0e..211c09ee71 100644
--- a/src/widgets/effects/qpixmapfilter.cpp
+++ b/src/widgets/effects/qpixmapfilter.cpp
@@ -925,7 +925,6 @@ void QPixmapBlurFilter::draw(QPainter *painter, const QPointF &p, const QPixmap
scaledRadius /= scale;
QImage srcImage;
- QImage destImage;
if (srcRect == src.rect()) {
srcImage = src.toImage();
diff --git a/src/widgets/styles/qstylehelper.cpp b/src/widgets/styles/qstylehelper.cpp
index e560e713fb..4f498efac0 100644
--- a/src/widgets/styles/qstylehelper.cpp
+++ b/src/widgets/styles/qstylehelper.cpp
@@ -278,7 +278,6 @@ void drawDial(const QStyleOptionSlider *option, QPainter *painter)
buttonColor.setHsv(buttonColor .hue(),
qMin(140, buttonColor .saturation()),
qMax(180, buttonColor.value()));
- QColor shadowColor(0, 0, 0, 20);
if (enabled) {
// Drop shadow
diff --git a/src/widgets/widgets/qwidgetresizehandler.cpp b/src/widgets/widgets/qwidgetresizehandler.cpp
index 3612a04e99..d4f14ad1d4 100644
--- a/src/widgets/widgets/qwidgetresizehandler.cpp
+++ b/src/widgets/widgets/qwidgetresizehandler.cpp
@@ -119,7 +119,9 @@ bool QWidgetResizeHandler::eventFilter(QObject *o, QEvent *ee)
QMouseEvent *e = static_cast<QMouseEvent *>(ee);
if (w->isMaximized())
break;
- if (!widget->rect().contains(widget->mapFromGlobal(e->globalPos())))
+ const QRect widgetRect = widget->rect().marginsAdded(QMargins(range, range, range, range));
+ const QPoint cursorPoint = widget->mapFromGlobal(e->globalPos());
+ if (!widgetRect.contains(cursorPoint) || mode == Center || mode == Nowhere)
return false;
if (e->button() == Qt::LeftButton) {
#if 0 // Used to be included in Qt4 for Q_WS_X11