Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed bug where testlib would not respect the -iterations option.
  Improve precision of testlib benchmarking.
  QMetaMethod::invoke: Document that the function does not check the arguments
  add test for QMetaMethod::invoke
  Make QGLBuffer copiable

1 files changed, 7 insertions, 2 deletions

diff --git a/src/opengl/qglbuffer.h b/src/opengl/qglbuffer.h
index 2fe1f1f..a1b45ff 100644
--- a/src/opengl/qglbuffer.h
+++ b/src/opengl/qglbuffer.h
@@ -64,9 +64,13 @@ public:
         PixelUnpackBuffer   = 0x88EC  // GL_PIXEL_UNPACK_BUFFER
     };
 
+    QGLBuffer();
     explicit QGLBuffer(QGLBuffer::Type type);
+    QGLBuffer(const QGLBuffer &other);
     ~QGLBuffer();
 
+    QGLBuffer &operator=(const QGLBuffer &other);
+
     enum UsagePattern
     {
         StreamDraw          = 0x88E0, // GL_STREAM_DRAW
@@ -95,6 +99,8 @@ public:
     bool create();
     bool isCreated() const;
 
+    void destroy();
+
     bool bind() const;
     void release() const;
 
@@ -114,9 +120,8 @@ public:
     bool unmap();
 
 private:
-    QScopedPointer<QGLBufferPrivate> d_ptr;
+    QGLBufferPrivate *d_ptr;
 
-    Q_DISABLE_COPY(QGLBuffer)
     Q_DECLARE_PRIVATE(QGLBuffer)
 };