diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:41:21 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 09:41:21 +0100 |
| commit | 96c3b606056d05f621bec1d9b7c3751a4a217b8d (patch) | |
| tree | 8230e92ed6820451391620b2f6ad42b80e93dbbc | |
| parent | bada2f466aff5faeae6239038cba227ea9636d1f (diff) | |
| parent | 2c55174f267fccdd6bf74171b0da312f895c5a62 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
Change-Id: If73672bc96e3be4220b3f3af81ab9dc159cdd584
| -rw-r--r-- | src/gamepad/doc/qtgamepad.qdocconf | 1 | ||||
| -rw-r--r-- | src/imports/gamepad/qtgamepad.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gamepad/doc/qtgamepad.qdocconf b/src/gamepad/doc/qtgamepad.qdocconf index 22fa763..bb90843 100644 --- a/src/gamepad/doc/qtgamepad.qdocconf +++ b/src/gamepad/doc/qtgamepad.qdocconf @@ -49,6 +49,7 @@ Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY navigation.landingpage = "Qt Gamepad" navigation.qmltypespage = "Qt Gamepad QML Types" navigation.cppclassespage = "Qt Gamepad C++ Classes" +navigation.homepage = "Qt Documentation (Technology Preview)" manifestmeta.thumbnail.names = "QtGamepad/Qt Gamepad Mouse Item Example" \ "QtGamepad/Qt Gamepad Simple Example" diff --git a/src/imports/gamepad/qtgamepad.cpp b/src/imports/gamepad/qtgamepad.cpp index 8196f47..7ecee2d 100644 --- a/src/imports/gamepad/qtgamepad.cpp +++ b/src/imports/gamepad/qtgamepad.cpp @@ -55,7 +55,7 @@ static QObject *gamepadmanager_singletontype_provider(QQmlEngine * /* engine */, class QGamepadModule : public QQmlExtensionPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid) public: void registerTypes(const char *uri) { |