2 files changed, 8 insertions, 9 deletions
diff --git a/src/gui/opengl/qopengldebug.h b/src/gui/opengl/qopengldebug.h
index 425ab78d7a..d24940cb3c 100644
--- a/src/gui/opengl/qopengldebug.h
+++ b/src/gui/opengl/qopengldebug.h
@@ -97,14 +97,14 @@ public:
 
     QOpenGLDebugMessage();
     QOpenGLDebugMessage(const QOpenGLDebugMessage &debugMessage);
-    ~QOpenGLDebugMessage();
 
     QOpenGLDebugMessage &operator=(const QOpenGLDebugMessage &debugMessage);
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QOpenGLDebugMessage &operator=(QOpenGLDebugMessage &&debugMessage)
-    { d.swap(debugMessage.d); return *this; }
+    QOpenGLDebugMessage &operator=(QOpenGLDebugMessage &&other) Q_DECL_NOTHROW { swap(other); return *this; }
 #endif
-    inline void swap(QOpenGLDebugMessage &debugMessage) { d.swap(debugMessage.d); }
+    ~QOpenGLDebugMessage();
+
+    void swap(QOpenGLDebugMessage &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
 
     Source source() const;
     Type type() const;
diff --git a/src/gui/opengl/qopenglpixeltransferoptions.h b/src/gui/opengl/qopenglpixeltransferoptions.h
index bf726813bd..cb4697ec7c 100644
--- a/src/gui/opengl/qopenglpixeltransferoptions.h
+++ b/src/gui/opengl/qopenglpixeltransferoptions.h
@@ -49,15 +49,14 @@ class Q_GUI_EXPORT QOpenGLPixelTransferOptions
 public:
     QOpenGLPixelTransferOptions();
     QOpenGLPixelTransferOptions(const QOpenGLPixelTransferOptions &);
-    QOpenGLPixelTransferOptions &operator=(const QOpenGLPixelTransferOptions &);
-    ~QOpenGLPixelTransferOptions();
-
 #ifdef Q_COMPILER_RVALUE_REFS
-    QOpenGLPixelTransferOptions &operator=(QOpenGLPixelTransferOptions &&other)
+    QOpenGLPixelTransferOptions &operator=(QOpenGLPixelTransferOptions &&other) Q_DECL_NOTHROW
     { swap(other); return *this; }
 #endif
+    QOpenGLPixelTransferOptions &operator=(const QOpenGLPixelTransferOptions &);
+    ~QOpenGLPixelTransferOptions();
 
-    void swap(QOpenGLPixelTransferOptions &other)
+    void swap(QOpenGLPixelTransferOptions &other) Q_DECL_NOTHROW
     { data.swap(other.data); }
 
     void setAlignment(int alignment);