Index: kernel/kcomponentdata.h
===================================================================
--- kernel/kcomponentdata.h     (revision 681384)
+++ kernel/kcomponentdata.h     (working copy)
@@ -85,12 +85,17 @@
      */
     bool operator!=(const KComponentData &rhs) const { return !operator==(rhs); }

+    enum RegisterAsMainComponent {
+        RegisterAsMainComponent,
+        SkipMainComponentRegistration
+    };
+
     /**
      * Constructor.
      *
      * @param componentName the name of the component.
      */
-    explicit KComponentData(const QByteArray &componentName);
+    explicit KComponentData(const QByteArray &componentName, RegisterAsMainComponent);

     /**
      * Constructor.