diff options
| author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-15 15:19:50 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-04 13:34:52 +0000 |
| commit | 2f190e21c82c7b20f6cf1b9e5671316cd831f684 (patch) | |
| tree | 14c7fbd2226842894518b0c964f7e6ce97796ea1 /src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.h | |
| parent | a010f3a8f92a9a364e9d17d12b06074fde6f8a17 (diff) | |
Use QQmlDebugPluginManager for loading connection plugins
Also remove all the hacks that deal with static builds, QT_NO_LIBRARY
and friends. QQmlDebugPluginManager handles those cases.
Change-Id: I62f13b787292108fa25d09fabc775332394989be
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.h')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.h b/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.h index 4d20b8db2f..119f29921b 100644 --- a/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.h +++ b/src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.h @@ -44,8 +44,6 @@ class QLocalClientConnection : public QObject, public QQmlDebugServerConnection Q_OBJECT Q_DECLARE_PRIVATE(QLocalClientConnection) Q_DISABLE_COPY(QLocalClientConnection) - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlDebugServerConnection") - Q_INTERFACES(QQmlDebugServerConnection) public: QLocalClientConnection(); @@ -70,6 +68,15 @@ private: QLocalClientConnectionPrivate *d_ptr; }; +class QLocalClientConnectionFactory : public QQmlDebugServerConnectionFactory +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID QQmlDebugServerConnectionFactory_iid FILE "qlocalclientconnection.json") + Q_INTERFACES(QQmlDebugServerConnectionFactory) +public: + QQmlDebugServerConnection *create(const QString &key); +}; + QT_END_NAMESPACE #endif // QLOCALCLIENTCONNECTION_H |