diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-06-25 09:28:57 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-06-25 09:28:57 +0200 |
commit | 7c329e1902db6f07b501df8de21ef32b2cd43487 (patch) | |
tree | 793d3b5069ad177b0accd12d4c5176b04072260c /src/plugins | |
parent | 03838decb9c104b8b8327ac90510472c830e0e91 (diff) | |
parent | 96c1b4119e7053981a3109b658a656430c4abaaf (diff) |
Merge remote-tracking branch 'origin/4.12'
Change-Id: I4935b6afdb13627f32e850a4c8b536de0269bc4b
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/mcusupport/mcusupportsdk.cpp | 13 | ||||
-rw-r--r-- | src/plugins/qmljseditor/qmljscompletionassist.cpp | 12 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index 67fd09e26d..7ea24c2548 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -59,7 +59,8 @@ static QString findInProgramFiles(const QString &folder) McuPackage *createQtForMCUsPackage() { auto result = new McuPackage( - McuPackage::tr("Qt for MCUs SDK"), + McuPackage::tr("Qt for MCUs %1 SDK").arg( + McuSupportOptions::supportedQulVersion().toString()), QDir::homePath(), Utils::HostOsInfo::withExecutableSuffix("bin/qmltocpp"), Constants::SETTINGS_KEY_PACKAGE_QT_FOR_MCUS_SDK); @@ -344,17 +345,17 @@ void targetsAndPackages(const Utils::FilePath &dir, QVector<McuPackage *> *packa const McuTargetDescription desc = parseDescriptionJson(file.readAll()); if (!McuSupportOptions::supportedQulVersion() .isPrefixOf(QVersionNumber::fromString(desc.qulVersion))) - continue; + return; // Invalid version means invalid SDK installation. descriptions.append(desc); } - if (!descriptions.isEmpty()) { - // Workaround for missing JSON file for Desktop target: + // Workaround for missing JSON file for Desktop target: + if (dir.pathAppended("/lib/QulQuickUltralite_QT_32bpp_Windows_Release.lib").exists()) { descriptions.prepend({McuSupportOptions::supportedQulVersion().toString(), {"Qt"}, {"Qt"}, {32}, {"desktop"}, {}, {}}); - - mcuTargets->append(targetsFromDescriptions(descriptions, packages)); } + + mcuTargets->append(targetsFromDescriptions(descriptions, packages)); } } // namespace Sdk diff --git a/src/plugins/qmljseditor/qmljscompletionassist.cpp b/src/plugins/qmljseditor/qmljscompletionassist.cpp index 839e3fd19f..5cfa28c609 100644 --- a/src/plugins/qmljseditor/qmljscompletionassist.cpp +++ b/src/plugins/qmljseditor/qmljscompletionassist.cpp @@ -187,7 +187,7 @@ class ProcessProperties: private MemberProcessor QSet<const ObjectValue *> _processed; bool _globalCompletion = false; bool _enumerateGeneratedSlots = false; - bool _enumerateSlots = true; + bool _enumerateMethods = true; const ScopeChain *_scopeChain; const ObjectValue *_currentObject = nullptr; PropertyProcessor *_propertyProcessor = nullptr; @@ -208,9 +208,9 @@ public: _enumerateGeneratedSlots = enumerate; } - void setEnumerateSlots(bool enumerate) + void setEnumerateMethods(bool enumerate) { - _enumerateSlots = enumerate; + _enumerateMethods = enumerate; } void operator ()(const Value *value, PropertyProcessor *processor) @@ -251,14 +251,14 @@ private: bool processSignal(const QString &name, const Value *value) override { - if (_globalCompletion) + if (_globalCompletion || _enumerateMethods) process(name, value); return true; } bool processSlot(const QString &name, const Value *value) override { - if (_enumerateSlots) + if (_enumerateMethods) process(name, value); return true; } @@ -771,7 +771,7 @@ IAssistProposal *QmlJSCompletionAssistProcessor::perform(const AssistInterface * ProcessProperties processProperties(&scopeChain); processProperties.setGlobalCompletion(true); processProperties.setEnumerateGeneratedSlots(true); - processProperties.setEnumerateSlots(false); + processProperties.setEnumerateMethods(false); // id: is special AssistProposalItem *idProposalItem = new QmlJSAssistProposalItem; |