3 files changed, 12 insertions, 11 deletions
diff --git a/examples/activeqt/opengl/doc/src/opengl.qdoc b/examples/activeqt/opengl/doc/src/opengl.qdoc
index 8d37853..f33af78 100644
--- a/examples/activeqt/opengl/doc/src/opengl.qdoc
+++ b/examples/activeqt/opengl/doc/src/opengl.qdoc
@@ -71,9 +71,9 @@
     Qt to render an OpenGL scene in an ActiveX. The control exposes a few
     methods to change the scene.
 
-    The application uses the default factory as provided by the
-    QAXFACTORY_DEFAULT macro to expose the \c GLBox widget as an ActiveX
-    control.
+    The application uses QAxFactory through the \c QAXFACTORY_BEGIN(),
+    \c QAXCLASS() and \c QAXFACTORY_END() macros to expose the
+    \c GLBox widget as an ActiveX control.
     \snippet activeqt/opengl/main.cpp 0
     The implementation of \c main initializes the QApplication object,
     and uses \c QAxFactory::isServer() to determine whether or not it is
diff --git a/examples/activeqt/opengl/glbox.h b/examples/activeqt/opengl/glbox.h
index eb68c39..5c09912 100644
--- a/examples/activeqt/opengl/glbox.h
+++ b/examples/activeqt/opengl/glbox.h
@@ -57,7 +57,10 @@ class GLBox : public QGLWidget,
               public QAxBindable
 {
     Q_OBJECT
-//! [0] //! [1]
+    Q_CLASSINFO("ClassID",     "{5fd9c22e-ed45-43fa-ba13-1530bb6b03e0}")
+    Q_CLASSINFO("InterfaceID", "{33b051af-bb25-47cf-a390-5cfd2987d26a}")
+    Q_CLASSINFO("EventsID",    "{8c996c29-eafa-46ac-a6f9-901951e765b5}")
+    //! [0] //! [1]
 
 public:
 
diff --git a/examples/activeqt/opengl/main.cpp b/examples/activeqt/opengl/main.cpp
index 0596b2b..1c8a79b 100644
--- a/examples/activeqt/opengl/main.cpp
+++ b/examples/activeqt/opengl/main.cpp
@@ -54,13 +54,11 @@
 //! [0]
 #include <QAxFactory>
 
-QAXFACTORY_DEFAULT( GLBox,
-                    "{5fd9c22e-ed45-43fa-ba13-1530bb6b03e0}",
-                    "{33b051af-bb25-47cf-a390-5cfd2987d26a}",
-                    "{8c996c29-eafa-46ac-a6f9-901951e765b5}",
-                    "{2c3c183a-eeda-41a4-896e-3d9c12c3577d}",
-                    "{83e16271-6480-45d5-aaf1-3f40b7661ae4}"
-                  )
+QAXFACTORY_BEGIN(
+    "{2c3c183a-eeda-41a4-896e-3d9c12c3577d}", // type library ID
+    "{83e16271-6480-45d5-aaf1-3f40b7661ae4}") // application ID
+    QAXCLASS(GLBox)
+QAXFACTORY_END()
 
 //! [0] //! [1]
 /*