6 files changed, 14 insertions, 20 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri
index f2c5334f8c..9ceb0ee082 100644
--- a/src/gui/kernel/kernel.pri
+++ b/src/gui/kernel/kernel.pri
@@ -6,8 +6,8 @@ PRECOMPILED_HEADER = kernel/qt_gui_pch.h
 
 KERNEL_P= kernel
 HEADERS += \
-        kernel/qgenericpluginfactory_qpa.h \
-        kernel/qgenericplugin_qpa.h \
+        kernel/qgenericpluginfactory.h \
+        kernel/qgenericplugin.h \
         kernel/qwindowsysteminterface.h \
         kernel/qwindowsysteminterface_p.h \
         kernel/qplatformintegration.h \
diff --git a/src/gui/kernel/qgenericplugin.cpp b/src/gui/kernel/qgenericplugin.cpp
index 4cd12d068c..abfae93a0c 100644
--- a/src/gui/kernel/qgenericplugin.cpp
+++ b/src/gui/kernel/qgenericplugin.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qgenericplugin_qpa.h"
+#include "qgenericplugin.h"
 
 #ifndef QT_NO_LIBRARY
 
@@ -48,12 +48,9 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QGenericPlugin
     \ingroup plugins
-    \ingroup qpa
 
     \brief The QGenericPlugin class is an abstract base class for
-    window-system related plugins in Qt QPA.
-
-    Note that this class is only available in Qt QPA.
+    plugins.
 
     A mouse plugin can be created by subclassing
     QGenericPlugin and reimplementing the pure virtual create()
diff --git a/src/gui/kernel/qgenericplugin_qpa.h b/src/gui/kernel/qgenericplugin.h
index 2724a8c9e6..44dad6ec6f 100644
--- a/src/gui/kernel/qgenericplugin_qpa.h
+++ b/src/gui/kernel/qgenericplugin.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGENERICPLUGIN_QPA_H
-#define QGENERICPLUGIN_QPA_H
+#ifndef QGENERICPLUGIN_H
+#define QGENERICPLUGIN_H
 
 #include <QtCore/qplugin.h>
 #include <QtCore/qfactoryinterface.h>
@@ -70,4 +70,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QGENERICPLUGIN_QPA_H
+#endif // QGENERICPLUGIN_H
diff --git a/src/gui/kernel/qgenericpluginfactory.cpp b/src/gui/kernel/qgenericpluginfactory.cpp
index 663b88e10d..48ab5a7af1 100644
--- a/src/gui/kernel/qgenericpluginfactory.cpp
+++ b/src/gui/kernel/qgenericpluginfactory.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qgenericpluginfactory_qpa.h"
+#include "qgenericpluginfactory.h"
 
 #include "qguiapplication.h"
 #include "private/qfactoryloader_p.h"
@@ -60,12 +60,9 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
 
 /*!
     \class QGenericPluginFactory
-    \ingroup qpa
+    \ingroup plugins
 
-    \brief The QGenericPluginFactory class creates window-system
-    related plugin drivers in Qt QPA.
-
-    Note that this class is only available in Qt QPA.
+    \brief The QGenericPluginFactory class creates plugin drivers.
 
     \sa QGenericPlugin
 */
diff --git a/src/gui/kernel/qgenericpluginfactory_qpa.h b/src/gui/kernel/qgenericpluginfactory.h
index a7c227f44a..2704cadbb2 100644
--- a/src/gui/kernel/qgenericpluginfactory_qpa.h
+++ b/src/gui/kernel/qgenericpluginfactory.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGENERICPLUGINFACTORY_QPA_H
-#define QGENERICPLUGINFACTORY_QPA_H
+#ifndef QGENERICPLUGINFACTORY_H
+#define QGENERICPLUGINFACTORY_H
 
 #include <QtCore/qstringlist.h>
 
@@ -63,4 +63,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QGENERICPLUGINFACTORY_QPA_H
+#endif // QGENERICPLUGINFACTORY_H
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 0ec888f625..33dd883472 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -65,8 +65,8 @@
 #include <private/qscreen_p.h>
 #include <private/qdrawhelper_p.h>
 
+#include <QtGui/qgenericpluginfactory.h>
 #include <qpa/qplatformintegration.h>
-#include <QtGui/QGenericPluginFactory>
 #include <QtGui/qstylehints.h>
 #include <QtGui/qinputpanel.h>
 #include <QtGui/qpixmapcache.h>