diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h
index e181566fdb..b907caa9b6 100644
--- a/src/corelib/global/qflags.h
+++ b/src/corelib/global/qflags.h
@@ -145,6 +145,11 @@ public:
     Q_DECL_CONSTEXPR inline bool operator!() const Q_DECL_NOTHROW { return !i; }
 
     Q_DECL_CONSTEXPR inline bool testFlag(Enum f) const Q_DECL_NOTHROW { return (i & Int(f)) == Int(f) && (Int(f) != 0 || i == Int(f) ); }
+    Q_DECL_RELAXED_CONSTEXPR inline QFlags &setFlag(Enum f, bool on = true) Q_DECL_NOTHROW
+    {
+        return on ? (*this |= f) : (*this &= ~f);
+    }
+
 private:
 #ifdef Q_COMPILER_INITIALIZER_LISTS
     Q_DECL_CONSTEXPR static inline Int initializer_list_helper(typename std::initializer_list<Enum>::const_iterator it,
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index 1227445f1e..a7ed29d859 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -425,6 +425,14 @@ Q_STATIC_ASSERT_X(QT_POINTER_SIZE == sizeof(void *), "QT_POINTER_SIZE defined in
     Returns \c true if the \a flag is set, otherwise \c false.
 */
 
+/*!
+    \fn QFlags QFlags::setFlag(Enum flag, bool on) const
+    \since 5.7
+
+    Sets the indicated \a flag if \a on is \c true or unsets it if
+    it if \a on is \c false. Returns a reference to this object.
+*/
+
 /*!
   \macro Q_DISABLE_COPY(Class)
   \relates QObject
diff --git a/tests/auto/corelib/global/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp
index 3e1b60419d..10902b6f55 100644
--- a/tests/auto/corelib/global/qflags/tst_qflags.cpp
+++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp
@@ -38,6 +38,7 @@ private slots:
     void signedness();
     void classEnum();
     void initializerLists();
+    void testSetFlags();
 };
 
 void tst_QFlags::testFlag() const
@@ -278,6 +279,19 @@ void tst_QFlags::initializerLists()
 #endif // Q_COMPILER_INITIALIZER_LISTS
 }
 
+void tst_QFlags::testSetFlags()
+{
+    Qt::MouseButtons btn = Qt::NoButton;
+
+    btn.setFlag(Qt::LeftButton);
+    QVERIFY(btn.testFlag(Qt::LeftButton));
+    QVERIFY(!btn.testFlag(Qt::MidButton));
+
+    btn.setFlag(Qt::LeftButton, false);
+    QVERIFY(!btn.testFlag(Qt::LeftButton));
+    QVERIFY(!btn.testFlag(Qt::MidButton));
+}
+
 // (statically) check QTypeInfo for QFlags instantiations:
 enum MyEnum { Zero, One, Two, Four=4 };
 Q_DECLARE_FLAGS( MyFlags, MyEnum )