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

Merge remote-tracking branch 'origin/4.14'

Browse Source 
Change-Id: I214b8d59e8ff7fe0511cd6116ec7725ddc4376ee
This commit is contained in:
Eike Ziller
2021-02-18 09:26:22 +01:00
parent 1133e26d3a 8d5b4815d3
commit 768d4321f9
11 changed files with 235 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/coreplugin/plugininstallwizard.cpp
View File

@@ -64,7 +64,7 @@ struct Data
{
FilePath sourcePath;
FilePath extractedPath;
bool installIntoApplication;
bool installIntoApplication = false;
};
static QStringList libraryNameFilter()
@@ -354,7 +354,7 @@ public:
vlayout->addSpacing(10);
auto localInstall = new QRadioButton(PluginInstallWizard::tr("User plugins"));
localInstall->setChecked(true);
localInstall->setChecked(!m_data->installIntoApplication);
auto localLabel = new QLabel(
PluginInstallWizard::tr("The plugin will be available to all compatible %1 "
"installations, but only for the current user.")
@@ -368,6 +368,7 @@ public:
auto appInstall = new QRadioButton(
PluginInstallWizard::tr("%1 installation").arg(Constants::IDE_DISPLAY_NAME));
appInstall->setChecked(m_data->installIntoApplication);
auto appLabel = new QLabel(
PluginInstallWizard::tr("The plugin will be available only to this %1 "
"installation, but for all users that can access it.")

5
src/plugins/projectexplorer/projectimporter.cpp
View File

@@ -38,6 +38,7 @@
#include <coreplugin/icore.h>
#include <utils/algorithm.h>
#include <utils/environment.h>
#include <utils/qtcassert.h>
#include <QLoggingCategory>
@@ -411,7 +412,9 @@ ProjectImporter::findOrCreateToolChains(const ToolChainDescription &tcd) const
{
ToolChainData result;
result.tcs = ToolChainManager::toolChains([&tcd](const ToolChain *tc) {
return tc->language() == tcd.language && tc->compilerCommand() == tcd.compilerPath;
return tc->language() == tcd.language &&
Utils::Environment::systemEnvironment().isSameExecutable(
tc->compilerCommand().toString(), tcd.compilerPath.toString());
});
for (const ToolChain *tc : qAsConst(result.tcs)) {
const QByteArray tcId = tc->id();

9
src/plugins/qmldesigner/designercore/model/modelmerger.cpp
View File

@@ -33,6 +33,7 @@
#include "bindingproperty.h"
#include "variantproperty.h"
#include "rewritertransaction.h"
#include "signalhandlerproperty.h"
#include <rewritingexception.h>
#include <QUrl>
@@ -78,6 +79,13 @@ static void syncBindingProperties(ModelNode &outputNode, const ModelNode &inputN
}
}
static void syncSignalHandlerProperties(ModelNode &outputNode, const ModelNode &inputNode, const QHash<QString, QString> &idRenamingHash)
{
foreach (const SignalHandlerProperty &signalProperty, inputNode.signalProperties()) {
outputNode.signalHandlerProperty(signalProperty.name()).setSource(fixExpression(signalProperty.source(), idRenamingHash));
}
}
static void syncId(ModelNode &outputNode, const ModelNode &inputNode, const QHash<QString, QString> &idRenamingHash)
{
if (!inputNode.id().isEmpty())
@@ -152,6 +160,7 @@ static ModelNode createNodeFromNode(const ModelNode &modelNode,const QHash<QStri
propertyList, variantPropertyList, modelNode.nodeSource(), modelNode.nodeSourceType()));
syncAuxiliaryProperties(newNode, modelNode);
syncBindingProperties(newNode, modelNode, idRenamingHash);
syncSignalHandlerProperties(newNode, modelNode, idRenamingHash);
syncId(newNode, modelNode, idRenamingHash);
syncNodeProperties(newNode, modelNode, idRenamingHash, view);
syncNodeListProperties(newNode, modelNode, idRenamingHash, view);