Make QGenericPlugin and QGenericPluginFactory public API

These classes are not specific to QPA.

Discussed in QtCS 2012.

Change-Id: I32bc5fad4f0fa5e7095af86d61966fdf4d9e4ad7
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

14 files changed, 25 insertions, 28 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>
diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp
index a169eee96b..1aaa573be7 100644
--- a/src/plugins/generic/evdevkeyboard/main.cpp
+++ b/src/plugins/generic/evdevkeyboard/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include <QtPlatformSupport/private/qevdevkeyboardmanager_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp
index 6e98cf4a5e..34a75ebbb9 100644
--- a/src/plugins/generic/evdevmouse/main.cpp
+++ b/src/plugins/generic/evdevmouse/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include <QtPlatformSupport/private/qevdevmousemanager_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp
index 9863defad0..fdeecb4bac 100644
--- a/src/plugins/generic/evdevtablet/main.cpp
+++ b/src/plugins/generic/evdevtablet/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include <QtPlatformSupport/private/qevdevtablet_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp
index 33af3eddd8..01ce9e49f9 100644
--- a/src/plugins/generic/evdevtouch/main.cpp
+++ b/src/plugins/generic/evdevtouch/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include <QtPlatformSupport/private/qevdevtouch_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/meego/main.cpp b/src/plugins/generic/meego/main.cpp
index 6a82bd857b..efc2c87057 100644
--- a/src/plugins/generic/meego/main.cpp
+++ b/src/plugins/generic/meego/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include "qmeegointegration.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/generic/tslib/main.cpp b/src/plugins/generic/tslib/main.cpp
index f212626dff..5cf05b27d2 100644
--- a/src/plugins/generic/tslib/main.cpp
+++ b/src/plugins/generic/tslib/main.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
 #include "qtslib.h"
 
 QT_BEGIN_NAMESPACE
diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
index a4c4838717..7ccf14d49f 100644
--- a/src/widgets/kernel/qapplication_qpa.cpp
+++ b/src/widgets/kernel/qapplication_qpa.cpp
@@ -51,7 +51,6 @@
 #include "private/qwidget_p.h"
 #include "private/qevent_p.h"
 
-#include "qgenericpluginfactory_qpa.h"
 #include <qpa/qplatformintegrationfactory_p.h>
 #include <qdesktopwidget.h>
 #include <qpa/qplatformcursor.h>
diff --git a/sync.profile b/sync.profile
index d5c897ac72..7d2d4628f0 100644
--- a/sync.profile
+++ b/sync.profile
@@ -90,7 +90,11 @@
         "QPlatformWindow" => "qpa/qplatformwindow.h",
         "qwindowsysteminterface_qpa.h" => "qpa/qwindowsysteminterface.h",
         "QWindowSystemInterface" => "qpa/qwindowsysteminterface.h",
-        "qwindowsysteminterface_qpa_p.h" => "qpa/qwindowsysteminterface_p.h"
+        "qwindowsysteminterface_qpa_p.h" => "qpa/qwindowsysteminterface_p.h",
+        "qgenericpluginfactory_qpa.h" => "QtGui/qgenericpluginfactory.h",
+        "qgenericplugin_qpa.h" => "QtGui/qgenericplugin.h",
+        "QGenericPlugin" => "QtGui/QGenericPlugin",
+        "QGenericPluginFactory" => "QtGui/QGenericPluginFactory"
     },
     "QtWidgets" => {
         "qplatformmenu_qpa.h" => "qpa/qplatformmenu.h",