diff options
| -rw-r--r-- | src/gui/painting/qpathclipper.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qglframebufferobject_p.h | 1 | ||||
| -rw-r--r-- | src/platformsupport/dnd/qsimpledrag.cpp | 2 | ||||
| -rw-r--r-- | src/platformsupport/dnd/qsimpledrag_p.h | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp index 6ad9a7f436..2702b56e73 100644 --- a/src/gui/painting/qpathclipper.cpp +++ b/src/gui/painting/qpathclipper.cpp @@ -713,8 +713,7 @@ class QKdPointFinder { public: QKdPointFinder(int point, const QPathSegments &segments, QKdPointTree &tree) - : m_point(point) - , m_result(-1) + : m_result(-1) , m_segments(&segments) , m_tree(&tree) { @@ -759,7 +758,6 @@ public: } private: - int m_point; qreal pointComponents[2]; int m_result; const QPathSegments *m_segments; diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h index 64b1df5bf5..0f1128e8f6 100644 --- a/src/opengl/qglframebufferobject_p.h +++ b/src/opengl/qglframebufferobject_p.h @@ -120,7 +120,6 @@ public: private: QGLFramebufferObject* fbo; QGLFormat fboFormat; - bool wasBound; bool reqAlpha; }; diff --git a/src/platformsupport/dnd/qsimpledrag.cpp b/src/platformsupport/dnd/qsimpledrag.cpp index fe0146afc3..587e70b0f3 100644 --- a/src/platformsupport/dnd/qsimpledrag.cpp +++ b/src/platformsupport/dnd/qsimpledrag.cpp @@ -95,7 +95,7 @@ static QWindow* topLevelAt(const QPoint &pos) QBasicDrag::QBasicDrag() : m_restoreCursor(false), m_eventLoop(0), m_executed_drop_action(Qt::IgnoreAction), m_can_drop(false), - m_drag(0), m_drag_icon_window(0), m_cursor_drop_action(Qt::IgnoreAction) + m_drag(0), m_drag_icon_window(0) { } diff --git a/src/platformsupport/dnd/qsimpledrag_p.h b/src/platformsupport/dnd/qsimpledrag_p.h index bb9d215083..b2d4191b89 100644 --- a/src/platformsupport/dnd/qsimpledrag_p.h +++ b/src/platformsupport/dnd/qsimpledrag_p.h @@ -97,7 +97,6 @@ private: bool m_can_drop; QDrag *m_drag; QShapedPixmapWindow *m_drag_icon_window; - Qt::DropAction m_cursor_drop_action; }; class QSimpleDrag : public QBasicDrag |