3 files changed, 9 insertions, 7 deletions
diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
index d2043539c9..6ff4f57945 100644
--- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
+++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp
@@ -61,7 +61,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(MyClass::Options)
 //! [1]
 
 //! [meta-object flags]
-Q_FLAGS(Options)
+Q_FLAG(Options)
 //! [meta-object flags]
 
 //! [2]
diff --git a/src/corelib/doc/snippets/qdebug/qdebugsnippet.cpp b/src/corelib/doc/snippets/qdebug/qdebugsnippet.cpp
index f71d61ed47..a9ab83f5bf 100644
--- a/src/corelib/doc/snippets/qdebug/qdebugsnippet.cpp
+++ b/src/corelib/doc/snippets/qdebug/qdebugsnippet.cpp
@@ -51,11 +51,12 @@ public:
 };
 
 //! [0]
-QDebug operator<<(QDebug dbg, const Coordinate &c)
+QDebug operator<<(QDebug debug, const Coordinate &c)
 {
-    dbg.nospace() << "(" << c.x() << ", " << c.y() << ")";
+    QDebugStateSaver saver(debug);
+    debug.nospace() << '(' << c.x() << ", " << c.y() << ')';
 
-    return dbg.space();
+    return debug;
 }
 //! [0]
 
diff --git a/src/corelib/doc/snippets/qloggingcategory/main.cpp b/src/corelib/doc/snippets/qloggingcategory/main.cpp
index 6b66424875..8d76c5736e 100644
--- a/src/corelib/doc/snippets/qloggingcategory/main.cpp
+++ b/src/corelib/doc/snippets/qloggingcategory/main.cpp
@@ -59,10 +59,11 @@ struct UsbEntry {
     int classtype;
 };
 
-QDebug operator<<(QDebug &dbg, const UsbEntry &entry)
+QDebug operator<<(QDebug &debug, const UsbEntry &entry)
 {
-    dbg.nospace() << "" << entry.id << " (" << entry.classtype << ")";
-    return dbg.space();
+    QDebugStateSaver saver(debug);
+    debug.nospace() << "" << entry.id << " (" << entry.classtype << ')';
+    return debug;
 }
 
 QList<UsbEntry> usbEntries() {