feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJS: Improve QtQuick Controls completion

Browse Source 
Fixes: QTCREATORBUG-28648
Change-Id: I14c402c8a486d5afa7ee500b2d8a06951540e1bd
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Christian Stenger
2023-04-19 13:53:58 +02:00
parent 977689b4a9
commit 55d51e8b5e
5 changed files with 54 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/qmljstools/qmljsbundleprovider.cpp
View File

@@ -45,9 +45,16 @@ QmlBundle BasicBundleProvider::defaultBundle(const QString &bundleInfoName)
return res;
}
QmlBundle BasicBundleProvider::defaultQt5QtQuick2Bundle()
QmlBundle BasicBundleProvider::defaultQt5QtQuick2Bundle(bool enhance)
{
return defaultBundle(QLatin1String("qt5QtQuick2-bundle.json"));
QmlBundle result = defaultBundle(QLatin1String("qt5QtQuick2-bundle.json"));
if (!enhance)
return result;
if (Utils::HostOsInfo::isMacHost())
result.merge(defaultBundle(QLatin1String("qt5QtQuick2ext-macos-bundle.json")));
if (Utils::HostOsInfo::isWindowsHost())
result.merge(defaultBundle(QLatin1String("qt5QtQuick2ext-win-bundle.json")));
return result;
}
QmlBundle BasicBundleProvider::defaultQbsBundle()
@@ -77,7 +84,7 @@ void BasicBundleProvider::mergeBundlesForKit(ProjectExplorer::Kit *kit
QtSupport::QtVersion *qtVersion = QtSupport::QtKitAspect::qtVersion(kit);
if (!qtVersion) {
QmlBundle b2(defaultQt5QtQuick2Bundle());
QmlBundle b2(defaultQt5QtQuick2Bundle(false));
bundles.mergeBundleForLanguage(Dialect::Qml, b2);
bundles.mergeBundleForLanguage(Dialect::QmlQtQuick2, b2);
bundles.mergeBundleForLanguage(Dialect::QmlQtQuick2Ui, b2);
@@ -100,7 +107,7 @@ void BasicBundleProvider::mergeBundlesForKit(ProjectExplorer::Kit *kit
}
if (!qtQuick2Bundle.supportedImports().contains(QLatin1String("QtQuick 2."),
PersistentTrie::Partial)) {
qtQuick2Bundle.merge(defaultQt5QtQuick2Bundle());
qtQuick2Bundle.merge(defaultQt5QtQuick2Bundle(qtVersion->qtVersion().majorVersion() >= 6));
}
qtQuick2Bundle.replaceVars(myReplacements);
bundles.mergeBundleForLanguage(Dialect::Qml, qtQuick2Bundle);

2
src/plugins/qmljstools/qmljsbundleprovider.h
View File

@@ -44,7 +44,7 @@ public:
const QHash<QString,QString> &replacements) override;
static QmlJS::QmlBundle defaultBundle(const QString &bundleInfoName);
static QmlJS::QmlBundle defaultQt5QtQuick2Bundle();
static QmlJS::QmlBundle defaultQt5QtQuick2Bundle(bool enhance);
static QmlJS::QmlBundle defaultQbsBundle();
static QmlJS::QmlBundle defaultQmltypesBundle();
static QmlJS::QmlBundle defaultQmlprojectBundle();