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>
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 \
**
****************************************************************************/
-#include "qgenericplugin_qpa.h"
+#include "qgenericplugin.h"
#ifndef QT_NO_LIBRARY
/*!
\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()
**
****************************************************************************/
-#ifndef QGENERICPLUGIN_QPA_H
-#define QGENERICPLUGIN_QPA_H
+#ifndef QGENERICPLUGIN_H
+#define QGENERICPLUGIN_H
#include <QtCore/qplugin.h>
#include <QtCore/qfactoryinterface.h>
QT_END_HEADER
-#endif // QGENERICPLUGIN_QPA_H
+#endif // QGENERICPLUGIN_H
**
****************************************************************************/
-#include "qgenericpluginfactory_qpa.h"
+#include "qgenericpluginfactory.h"
#include "qguiapplication.h"
#include "private/qfactoryloader_p.h"
/*!
\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
*/
**
****************************************************************************/
-#ifndef QGENERICPLUGINFACTORY_QPA_H
-#define QGENERICPLUGINFACTORY_QPA_H
+#ifndef QGENERICPLUGINFACTORY_H
+#define QGENERICPLUGINFACTORY_H
#include <QtCore/qstringlist.h>
QT_END_HEADER
-#endif // QGENERICPLUGINFACTORY_QPA_H
+#endif // QGENERICPLUGINFACTORY_H
#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>
**
****************************************************************************/
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
#include <QtPlatformSupport/private/qevdevkeyboardmanager_p.h>
QT_BEGIN_NAMESPACE
**
****************************************************************************/
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
#include <QtPlatformSupport/private/qevdevmousemanager_p.h>
QT_BEGIN_NAMESPACE
**
****************************************************************************/
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
#include <QtPlatformSupport/private/qevdevtablet_p.h>
QT_BEGIN_NAMESPACE
**
****************************************************************************/
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
#include <QtPlatformSupport/private/qevdevtouch_p.h>
QT_BEGIN_NAMESPACE
**
****************************************************************************/
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
#include "qmeegointegration.h"
QT_BEGIN_NAMESPACE
**
****************************************************************************/
-#include <qgenericplugin_qpa.h>
+#include <QtGui/qgenericplugin.h>
#include "qtslib.h"
QT_BEGIN_NAMESPACE
#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>
"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",