diff options
Diffstat (limited to 'src/platformsupport/inputcontext')
-rw-r--r-- | src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp | 2 | ||||
-rw-r--r-- | src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp index 3e261ae765..595c3cc1f0 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp +++ b/src/platformsupport/inputcontext/qplatforminputcontextfactory_qpa.cpp @@ -70,7 +70,7 @@ QPlatformInputContext *QPlatformInputContextFactory::create(const QString& key) const QString platform = paramList.takeFirst().toLower(); #if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS) - if (QPlatformInputContext *ret = qLoadPlugin1<QPlatformInputContext, QPlatformInputContextFactoryInterface>(loader(), platform, paramList)) + if (QPlatformInputContext *ret = qLoadPlugin1<QPlatformInputContext, QPlatformInputContextPlugin>(loader(), platform, paramList)) return ret; #endif return 0; diff --git a/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h b/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h index e9e419546b..e7b173ee94 100644 --- a/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h +++ b/src/platformsupport/inputcontext/qplatforminputcontextplugin_p.h @@ -63,24 +63,15 @@ QT_BEGIN_NAMESPACE class QPlatformInputContext; - struct QPlatformInputContextFactoryInterface : public QFactoryInterface -{ - virtual QPlatformInputContext *create(const QString &key, const QStringList ¶mList) = 0; -}; - #define QPlatformInputContextFactoryInterface_iid "org.qt-project.Qt.QPlatformInputContextFactoryInterface" -Q_DECLARE_INTERFACE(QPlatformInputContextFactoryInterface, QPlatformInputContextFactoryInterface_iid) - -class Q_PLATFORMSUPPORT_EXPORT QPlatformInputContextPlugin : public QObject, public QPlatformInputContextFactoryInterface +class Q_PLATFORMSUPPORT_EXPORT QPlatformInputContextPlugin : public QObject { Q_OBJECT - Q_INTERFACES(QPlatformInputContextFactoryInterface:QFactoryInterface) public: explicit QPlatformInputContextPlugin(QObject *parent = 0); ~QPlatformInputContextPlugin(); - virtual QStringList keys() const = 0; virtual QPlatformInputContext *create(const QString &key, const QStringList ¶mList) = 0; }; |