diff options
author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-06-09 13:59:07 +0200 |
commit | 0963be63ce741ef6c7585358c3f3b1cb806b66e8 (patch) | |
tree | 6f4964c196b8a52cb15e9efc0388b6a549574460 /src/plugins/generic | |
parent | 9e6a1351823b3ee3d7e380248f6ef42ff383b014 (diff) | |
parent | eacfbbf64ef90dad8c5cb6b2c812ad64c1100779 (diff) |
Merge remote-tracking branch 'qt/dev' into dev-highdpi
Conflicts:
src/gui/kernel/qsimpledrag.cpp
src/gui/kernel/qwindowsysteminterface.cpp
src/gui/kernel/qwindowsysteminterface_p.h
src/plugins/platforms/xcb/qxcbwindow.cpp
Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf
Diffstat (limited to 'src/plugins/generic')
-rw-r--r-- | src/plugins/generic/evdevkeyboard/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/evdevmouse/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/evdevtablet/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/evdevtouch/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/libinput/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/tslib/main.cpp | 2 | ||||
-rw-r--r-- | src/plugins/generic/tuiotouch/main.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp index ceb8f4f792..444c9f1559 100644 --- a/src/plugins/generic/evdevkeyboard/main.cpp +++ b/src/plugins/generic/evdevkeyboard/main.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QEvdevKeyboardPlugin : public QGenericPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevkeyboard.json") + Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "evdevkeyboard.json") public: QEvdevKeyboardPlugin(); diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp index 7e9932ceb9..f39f92cfd2 100644 --- a/src/plugins/generic/evdevmouse/main.cpp +++ b/src/plugins/generic/evdevmouse/main.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QEvdevMousePlugin : public QGenericPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevmouse.json") + Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "evdevmouse.json") public: QEvdevMousePlugin(); diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp index 7d62e1a2bc..62524e8f33 100644 --- a/src/plugins/generic/evdevtablet/main.cpp +++ b/src/plugins/generic/evdevtablet/main.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QEvdevTabletPlugin : public QGenericPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevtablet.json") + Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "evdevtablet.json") public: QEvdevTabletPlugin(); diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp index ef6774b0a0..bb78dd6e84 100644 --- a/src/plugins/generic/evdevtouch/main.cpp +++ b/src/plugins/generic/evdevtouch/main.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QEvdevTouchScreenPlugin : public QGenericPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "evdevtouch.json") + Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "evdevtouch.json") public: QEvdevTouchScreenPlugin(); diff --git a/src/plugins/generic/libinput/main.cpp b/src/plugins/generic/libinput/main.cpp index 2adc0c747b..9459ca3621 100644 --- a/src/plugins/generic/libinput/main.cpp +++ b/src/plugins/generic/libinput/main.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QLibInputPlugin : public QGenericPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "libinput.json") + Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "libinput.json") public: QObject *create(const QString &key, const QString &specification); diff --git a/src/plugins/generic/tslib/main.cpp b/src/plugins/generic/tslib/main.cpp index 36f1ac7c3c..9459e85544 100644 --- a/src/plugins/generic/tslib/main.cpp +++ b/src/plugins/generic/tslib/main.cpp @@ -39,7 +39,7 @@ QT_BEGIN_NAMESPACE class QTsLibPlugin : public QGenericPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "tslib.json") + Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "tslib.json") public: QObject* create(const QString &key, const QString &specification); diff --git a/src/plugins/generic/tuiotouch/main.cpp b/src/plugins/generic/tuiotouch/main.cpp index e1d08f0e26..35e74e32bd 100644 --- a/src/plugins/generic/tuiotouch/main.cpp +++ b/src/plugins/generic/tuiotouch/main.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE class QTuioTouchPlugin : public QGenericPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QGenericPluginFactoryInterface" FILE "tuiotouch.json") + Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "tuiotouch.json") public: QTuioTouchPlugin(); |