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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: Ib67c8ecb1865ee31ca6485c9287039ba877c68cd
This commit is contained in:
hjk
2023-08-10 10:03:04 +02:00
parent 0e4710b708 d1deeb2c0d
commit 0be0772fc9
13 changed files with 73 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/app/main.cpp
View File

@@ -280,26 +280,16 @@ static Utils::QtcSettings *createUserSettings()
static void setHighDpiEnvironmentVariable()
{
if (Utils::HostOsInfo::isMacHost())
if (Utils::HostOsInfo::isMacHost() || qEnvironmentVariableIsSet("QT_SCALE_FACTOR_ROUNDING_POLICY"))
return;
std::unique_ptr<QSettings> settings(createUserSettings());
const bool defaultValue = Utils::HostOsInfo::isWindowsHost();
const bool enableHighDpiScaling = settings->value("Core/EnableHighDpiScaling", defaultValue).toBool();
static const char ENV_VAR_QT_DEVICE_PIXEL_RATIO[] = "QT_DEVICE_PIXEL_RATIO";
if (enableHighDpiScaling
&& !qEnvironmentVariableIsSet(ENV_VAR_QT_DEVICE_PIXEL_RATIO) // legacy in 5.6, but still functional
&& !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR")
&& !qEnvironmentVariableIsSet("QT_SCALE_FACTOR")
&& !qEnvironmentVariableIsSet("QT_SCREEN_SCALE_FACTORS")) {
return;
}
if (!qEnvironmentVariableIsSet("QT_SCALE_FACTOR_ROUNDING_POLICY"))
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
Qt::HighDpiScaleFactorRoundingPolicy::Floor);
const auto policy = enableHighDpiScaling ? Qt::HighDpiScaleFactorRoundingPolicy::PassThrough
: Qt::HighDpiScaleFactorRoundingPolicy::Floor;
QGuiApplication::setHighDpiScaleFactorRoundingPolicy(policy);
}
void setPixmapCacheLimit()

11
src/libs/utils/filepath.cpp
View File

@@ -1307,7 +1307,16 @@ FilePath FilePath::fromSettings(const QVariant &variant)
const QUrl url = variant.toUrl();
return FilePath::fromParts(url.scheme(), url.host(), url.path());
}
return FilePath::fromUserInput(variant.toString());
// The installer sometimes fails and adds "docker:/..." instead of "docker://...
// So we fix these paths here in those cases.
QString data = variant.toString();
if (data.length() > 8 && data.startsWith("docker:/") && data[8] != '/') {
qWarning() << "Broken path in settings:" << data << ", applying workaround.";
data.insert(8, '/');
}
return FilePath::fromUserInput(data);
}
QVariant FilePath::toSettings() const

3
src/libs/utils/fileutils.cpp
View File

@@ -722,8 +722,7 @@ bool FileUtils::copyRecursively(
bool FileUtils::copyIfDifferent(const FilePath &srcFilePath, const FilePath &tgtFilePath)
{
QTC_ASSERT(srcFilePath.exists(), return false);
QTC_ASSERT(srcFilePath.scheme() == tgtFilePath.scheme(), return false);
QTC_ASSERT(srcFilePath.host() == tgtFilePath.host(), return false);
QTC_ASSERT(srcFilePath.isSameDevice(tgtFilePath), return false);
if (tgtFilePath.exists()) {
const QDateTime srcModified = srcFilePath.lastModified();

2
src/libs/utils/process.cpp
View File

@@ -1204,7 +1204,7 @@ FilePath Process::workingDirectory() const
void Process::setWorkingDirectory(const FilePath &dir)
{
if (dir.needsDevice() && d->m_setup.m_commandLine.executable().needsDevice()) {
QTC_CHECK(dir.host() == d->m_setup.m_commandLine.executable().host());
QTC_CHECK(dir.isSameDevice(d->m_setup.m_commandLine.executable()));
}
d->m_setup.m_workingDirectory = dir;
}

22
src/plugins/cmakeprojectmanager/cmakebuildsystem.cpp
View File

@@ -661,15 +661,29 @@ FilePaths CMakeBuildSystem::filesGeneratedFrom(const FilePath &sourceFile) const
FilePath generatedFilePath = buildConfiguration()->buildDirectory().resolvePath(relativePath);
if (sourceFile.suffix() == "ui") {
const QString generatedFileSuffix = "ui_" + sourceFile.completeBaseName() + ".h";
const QString generatedFileName = "ui_" + sourceFile.completeBaseName() + ".h";
auto targetNode = this->project()->nodeForFilePath(sourceFile);
while (!dynamic_cast<const CMakeTargetNode *>(targetNode))
targetNode = targetNode->parentFolderNode();
FilePaths generatedFilePaths;
if (targetNode) {
const QString autogenSignature = targetNode->buildKey() + "_autogen/include";
// If AUTOUIC reports the generated header file name, use that path
FilePaths generatedFilePaths = this->project()->files([generatedFileSuffix](const Node *n) {
return Project::GeneratedFiles(n) && n->filePath().endsWith(generatedFileSuffix);
generatedFilePaths = this->project()->files(
[autogenSignature, generatedFileName](const Node *n) {
const FilePath filePath = n->filePath();
if (!filePath.contains(autogenSignature))
return false;
return Project::GeneratedFiles(n) && filePath.endsWith(generatedFileName);
});
}
if (generatedFilePaths.empty())
generatedFilePaths = {generatedFilePath.pathAppended(generatedFileSuffix)};
generatedFilePaths = {generatedFilePath.pathAppended(generatedFileName)};
return generatedFilePaths;
}

2
src/plugins/cmakeprojectmanager/cmakeprocess.cpp
View File

@@ -85,7 +85,7 @@ void CMakeProcess::run(const BuildDirParameters &parameters, const QStringList &
}
if (buildDirectory.needsDevice()) {
if (cmake->cmakeExecutable().host() != buildDirectory.host()) {
if (!cmake->cmakeExecutable().isSameDevice(buildDirectory)) {
const QString msg = ::CMakeProjectManager::Tr::tr(
"CMake executable \"%1\" and build directory \"%2\" must be on the same device.")
.arg(cmake->cmakeExecutable().toUserOutput(), buildDirectory.toUserOutput());

9
src/plugins/copilot/authwidget.cpp
View File

@@ -107,14 +107,19 @@ void AuthWidget::updateClient(const FilePath &nodeJs, const FilePath &agent)
m_client = nullptr;
setState(Tr::tr("Sign In"), false);
m_button->setEnabled(false);
if (!nodeJs.isExecutableFile() || !agent.exists()) {
if (!nodeJs.isExecutableFile() || !agent.exists())
return;
}
setState(Tr::tr("Sign In"), true);
m_client = new CopilotClient(nodeJs, agent);
connect(m_client, &Client::initialized, this, &AuthWidget::checkStatus);
connect(m_client, &QObject::destroyed, this, [destroyedClient = m_client, this]() {
if (destroyedClient != m_client)
return;
m_client = nullptr;
m_progressIndicator->hide();
});
}
void AuthWidget::signIn()

13
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -471,7 +471,9 @@ QWidget *QMakeStep::createConfigWidget()
connect(abisListWidget, &QListWidget::itemChanged, this, [this] {
if (m_ignoreChanges.isLocked())
return;
handleAbiWidgetChange();
updateAbiWidgets();
if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration())
BuildManager::buildLists({bc->cleanSteps()});
});
connect(widget, &QObject::destroyed, this, [this] {
@@ -663,7 +665,7 @@ void QMakeStep::updateAbiWidgets()
item->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled | Qt::ItemIsSelectable);
item->setCheckState(selectedAbis.contains(param) ? Qt::Checked : Qt::Unchecked);
}
handleAbiWidgetChange();
abisChanged();
}
}
@@ -672,13 +674,6 @@ void QMakeStep::updateEffectiveQMakeCall()
effectiveCall.setValue(effectiveQMakeCall());
}
void QMakeStep::handleAbiWidgetChange()
{
abisChanged();
if (QmakeBuildConfiguration *bc = qmakeBuildConfiguration())
BuildManager::buildLists({bc->cleanSteps()});
}
void QMakeStep::recompileMessageBoxFinished(int button)
{
if (button == QMessageBox::Yes) {

1
src/plugins/qmakeprojectmanager/qmakestep.h
View File

@@ -152,7 +152,6 @@ private:
void updateAbiWidgets();
void updateEffectiveQMakeCall();
void handleAbiWidgetChange();
Utils::CommandLine m_qmakeCommand;
Utils::CommandLine m_makeCommand;

11
src/tools/sdktool/addqtoperation.cpp
View File

@@ -252,6 +252,15 @@ void AddQtOperation::unittest()
QCOMPARE(version1.value(QLatin1String(QMAKE)).toString(), QLatin1String("/tmp/test/qmake2"));
QVERIFY(version1.contains(QLatin1String("extraData")));
QCOMPARE(version1.value(QLatin1String("extraData")).toString(), QLatin1String("extraValue"));
// Docker paths
qtData.m_id = "testId3";
qtData.m_qmake = "docker://image///path/to//some/qmake";
map = qtData.addQt(map);
QVariantMap version2 = map.value(QLatin1String("QtVersion.2")).toMap();
QVERIFY(version2.contains(QLatin1String(QMAKE)));
QCOMPARE(version2.value(QLatin1String(QMAKE)).toString(), QLatin1String("docker://image/path/to/some/qmake"));
}
#endif
@@ -279,7 +288,7 @@ QVariantMap AddQtData::addQt(const QVariantMap &map) const
const QString qt = QString::fromLatin1(PREFIX) + QString::number(versionCount);
// Sanitize qmake path:
QString saneQmake = QDir::cleanPath(m_qmake);
const QString saneQmake = cleanPath(m_qmake);
// insert data:
KeyValuePairList data;

11
src/tools/sdktool/operation.cpp
View File

@@ -84,7 +84,7 @@ bool Operation::save(const QVariantMap &map, const QString &file) const
return false;
}
QString dirName = QDir::cleanPath(path + "/..");
QString dirName = cleanPath(path + "/..");
QDir dir(dirName);
if (!dir.exists() && !dir.mkpath(QLatin1String("."))) {
std::cerr << "Error: Could not create directory " << qPrintable(dirName)
@@ -108,3 +108,12 @@ bool Operation::save(const QVariantMap &map, const QString &file) const
}
return true;
}
QString cleanPath(const QString &orig)
{
// QDir::cleanPath() destroys "//", one of which might be needed.
const int pos = orig.indexOf("://");
if (pos == -1)
return QDir::cleanPath(orig);
return orig.left(pos) + "://" + QDir::cleanPath(orig.mid(pos + 3));
}

2
src/tools/sdktool/operation.h
View File

@@ -22,6 +22,8 @@ using KeyValuePairList = QList<KeyValuePair>;
QVariant valueFromString(const QString &v);
QString cleanPath(const QString &orig);
class Operation
{
public:

4
src/tools/sdktool/sdkpersistentsettings.cpp
View File

@@ -3,6 +3,8 @@
#include "sdkpersistentsettings.h"
#include "operation.h" // for cleanPath()
#include <QCoreApplication>
#include <QDataStream>
#include <QDateTime>
@@ -826,7 +828,7 @@ void SdkPersistentSettingsWriter::setContents(const QVariantMap &data)
bool SdkPersistentSettingsWriter::write(const QVariantMap &data, QString *errorString) const
{
const QString parentDir = QDir::cleanPath(m_fileName + "/..");
const QString parentDir = cleanPath(m_fileName + "/..");
const QFileInfo fi(parentDir);
if (!(fi.exists() && fi.isDir() && fi.isWritable())) {