3 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h
index 2e0f781822..d5aed60972 100644
--- a/src/corelib/kernel/qcoreevent.h
+++ b/src/corelib/kernel/qcoreevent.h
@@ -325,6 +325,7 @@ private:
     friend class QGraphicsViewPrivate;
     friend class QGraphicsScene;
     friend class QGraphicsScenePrivate;
+    friend class QWidgetWindow;
 #ifndef QT_NO_GESTURES
     friend class QGestureManager;
 #endif
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 3c9cc9ee28..9c61a67962 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -777,6 +777,7 @@ struct VariantData
     const void *data;
     const uint flags;
 private:
+    // copy constructor allowed to be implicit to silence level 4 warning from MSVC
     VariantData &operator=(const VariantData &) Q_DECL_EQ_DELETE;
 };
 
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp
index 407a6a4e02..cde42c4f6e 100644
--- a/src/corelib/kernel/qsharedmemory.cpp
+++ b/src/corelib/kernel/qsharedmemory.cpp
@@ -125,11 +125,9 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key,
   or writing to the shared memory, and remember to release the lock
   with unlock() after you are done.
 
-  Unlike QtSharedMemory, QSharedMemory automatically destroys the
-  shared memory segment when the last instance of QSharedMemory is
-  detached from the segment, and no references to the segment
-  remain. Do not mix using QtSharedMemory and QSharedMemory. Port
-  everything to QSharedMemory.
+  QSharedMemory automatically destroys the shared memory segment when
+  the last instance of QSharedMemory is detached from the segment, and
+  no references to the segment remain.
 
   \warning QSharedMemory changes the key in a Qt-specific way, unless otherwise
   specified. Interoperation with non-Qt applications is achieved by first creating