5 files changed, 8 insertions, 12 deletions
diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h
index 765363744b..21dddf446e 100644
--- a/src/widgets/util/qcompleter_p.h
+++ b/src/widgets/util/qcompleter_p.h
@@ -194,6 +194,7 @@ private:
                      const QIndexMapper& iv, QMatchData* m);
 };
 
+// ### Qt6: QStyledItemDelegate
 class QCompleterItemDelegate : public QItemDelegate
 {
 public:
diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp
index b59fe0d504..a8b2a00a80 100644
--- a/src/widgets/util/qflickgesture.cpp
+++ b/src/widgets/util/qflickgesture.cpp
@@ -130,8 +130,6 @@ private:
         , mouseEventSource(Qt::MouseEventNotSynthesized)
     { }
 
-    static PressDelayHandler *inst;
-
 public:
     enum {
         UngrabMouseBefore = 1,
diff --git a/src/widgets/util/qflickgesture_p.h b/src/widgets/util/qflickgesture_p.h
index 74a0f2a0f3..d5ace887ae 100644
--- a/src/widgets/util/qflickgesture_p.h
+++ b/src/widgets/util/qflickgesture_p.h
@@ -77,8 +77,6 @@ public:
     friend class QFlickGestureRecognizer;
 };
 
-class PressDelayHandler;
-
 class QFlickGesturePrivate : public QGesturePrivate
 {
     Q_DECLARE_PUBLIC(QFlickGesture)
@@ -89,7 +87,6 @@ public:
     QScroller *receiverScroller;
     Qt::MouseButton button; // NoButton == Touch
     bool macIgnoreWheel;
-    static PressDelayHandler *pressDelayHandler;
 };
 
 class QFlickGestureRecognizer : public QGestureRecognizer
diff --git a/src/widgets/util/qsystemtrayicon.cpp b/src/widgets/util/qsystemtrayicon.cpp
index d15f5e5955..a38a50d3df 100644
--- a/src/widgets/util/qsystemtrayicon.cpp
+++ b/src/widgets/util/qsystemtrayicon.cpp
@@ -574,7 +574,7 @@ QBalloonTip::QBalloonTip(const QIcon &icon, const QString &title,
     layout->addWidget(msgLabel, 1, 0, 1, 3);
 #endif
     layout->setSizeConstraint(QLayout::SetFixedSize);
-    layout->setMargin(3);
+    layout->setContentsMargins(3, 3, 3, 3);
     setLayout(layout);
 
     QPalette pal = palette();
diff --git a/src/widgets/util/qundostack.cpp b/src/widgets/util/qundostack.cpp
index e928b9fe37..8788c42252 100644
--- a/src/widgets/util/qundostack.cpp
+++ b/src/widgets/util/qundostack.cpp
@@ -102,9 +102,9 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs a QUndoCommand object with the given \a parent and \a text.
 
-    If \a parent is not 0, this command is appended to parent's child list.
-    The parent command then owns this command and will delete it in its
-    destructor.
+    If \a parent is not \nullptr, this command is appended to parent's
+    child list. The parent command then owns this command and will delete
+    it in its destructor.
 
     \sa ~QUndoCommand()
 */
@@ -118,9 +118,9 @@ QUndoCommand::QUndoCommand(const QString &text, QUndoCommand *parent)
 /*!
     Constructs a QUndoCommand object with parent \a parent.
 
-    If \a parent is not 0, this command is appended to parent's child list.
-    The parent command then owns this command and will delete it in its
-    destructor.
+    If \a parent is not \nullptr, this command is appended to parent's
+    child list. The parent command then owns this command and will delete
+    it in its destructor.
 
     \sa ~QUndoCommand()
 */