diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 14:53:16 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-04-02 14:53:16 +0200 |
| commit | ac24380c3467ab3852b8690a037f50bdf658ac67 (patch) | |
| tree | 8dca0ecf714cef40d91034f8adbaa7e193113f68 /share/qtcreator/qml-type-descriptions | |
| parent | 5ca9ac47772be3e84875f13dde2e45f87956243c (diff) | |
| parent | b767e9895ff2ba46559828d7effb7d8791b7b0f3 (diff) | |
Merge remote-tracking branch 'origin/4.8' into 4.9
Change-Id: I90a3c1d29fccc4290311237d8680eaddb3cb5915
Diffstat (limited to 'share/qtcreator/qml-type-descriptions')
| -rw-r--r-- | share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json b/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json index 844e1075ef..9f797b4a26 100644 --- a/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json +++ b/share/qtcreator/qml-type-descriptions/qt5QtQuick2-bundle.json @@ -50,7 +50,7 @@ "QtCharts 2.3", "QtDataVisualization 1.0", "QtDataVisualization 1.3", - "QtGamePad 1.12", + "QtGamepad 1.12", "QtGraphicalEffects 1.0", "QtMultimedia 5.0", "QtMultimedia 5.2", |