diff options
author | Marco Benelli <marco.benelli@qt.io> | 2018-01-08 11:14:05 +0100 |
---|---|---|
committer | Marco Benelli <marco.benelli@qt.io> | 2018-01-08 13:15:23 +0000 |
commit | d11e31230cd09a7777af60fb3aa04995fea3bb16 (patch) | |
tree | 667270e94d67648df59de001995b48229e2af482 /share | |
parent | fdf95a2fe7d683f7532ef8d075171f074747e7e1 (diff) |
QmlJs: remove bundles for QtQuick1 type descriptions
QtCreator now assumes that QtQuick2 is used, so the relevant bundle is
loaded unconditionally.
Change-Id: Ib6b7b0c9a949e74edf0e0b7f68b0c774d7bcb451
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Diffstat (limited to 'share')
-rw-r--r-- | share/qtcreator/qml-type-descriptions/qt4QtQuick1-bundle.json | 17 | ||||
-rw-r--r-- | share/qtcreator/qml-type-descriptions/qt5QtQuick1-bundle.json | 16 |
2 files changed, 0 insertions, 33 deletions
diff --git a/share/qtcreator/qml-type-descriptions/qt4QtQuick1-bundle.json b/share/qtcreator/qml-type-descriptions/qt4QtQuick1-bundle.json deleted file mode 100644 index 97066c2af76..00000000000 --- a/share/qtcreator/qml-type-descriptions/qt4QtQuick1-bundle.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "QtQuick1", - "searchPaths": [ - "$(QT_INSTALL_IMPORTS)"], - "installPaths": [ - "$(QT_INSTALL_IMPORTS)"], - "implicitImports": [ - "__javascriptQt4__"], - "supportedImports": [ - "QtQuick 1.0", - "QtQuick 1.1", - "Qt.labs.gestures 1.0", - "Qt.labs.particles 1.0", - "Qt.labs.shaders 1.0", - "Qt.labs.folderlistmodel 1.0", - "QtWebKit 1.0"] -} diff --git a/share/qtcreator/qml-type-descriptions/qt5QtQuick1-bundle.json b/share/qtcreator/qml-type-descriptions/qt5QtQuick1-bundle.json deleted file mode 100644 index cee8a45c302..00000000000 --- a/share/qtcreator/qml-type-descriptions/qt5QtQuick1-bundle.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "name": "QtQuick1", - "searchPaths": [ - "$(QT_INSTALL_IMPORTS)"], - "installPaths": [ - "$(QT_INSTALL_IMPORTS)"], - "implicitImports": [ - "__javascriptQt5__"], - "supportedImports": [ - "QtQuick 1.1", - "Qt.labs.gestures 1.0", - "Qt.labs.particles 1.0", - "Qt.labs.shaders 1.0", - "Qt.labs.folderlistmodel 1.0", - "QtWebKit 1.0"] -} |