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

Merge remote-tracking branch 'origin/13.0' into qds/dev

Browse Source 
Change-Id: I242c01e82fc1b0db1f5e88c35d526f91dd022337
This commit is contained in:
Tim Jenssen
2024-02-13 13:55:47 +01:00
parent ea03bfea10 e8ad29d3af
commit adcac7cb6b
2530 changed files with 84766 additions and 55874 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/effectcomposer/effectcomposermodel.cpp
View File

@@ -1529,8 +1529,9 @@ void EffectComposerModel::bakeShaders()
args << "-o" << outPaths[i] << srcPaths[i];
auto qsbProcess = new Utils::Process(this);
connect(qsbProcess, &Utils::Process::done, this, [=] {
handleQsbProcessExit(qsbProcess, srcPaths[i], preview);
connect(qsbProcess, &Utils::Process::done, this,
[this, qsbProcess, path = srcPaths[i], preview] {
handleQsbProcessExit(qsbProcess, path, preview);
});
qsbProcess->setWorkingDirectory(workDir.absolutePath());
qsbProcess->setCommand({qsbPath, args});

5
src/plugins/effectcomposer/effectcomposerwidget.cpp
View File

@@ -110,15 +110,14 @@ EffectComposerWidget::EffectComposerWidget(EffectComposerView *view)
});
connect(m_effectComposerModel.data(), &EffectComposerModel::hasUnsavedChangesChanged,
this, [this]() {
this, [this] {
if (m_effectComposerModel->hasUnsavedChanges() && !m_effectComposerModel->currentComposition().isEmpty()) {
if (auto doc = QmlDesigner::QmlDesignerPlugin::instance()->documentManager().currentDesignDocument())
doc->setModified();
}
});
connect(Core::EditorManager::instance(), &Core::EditorManager::aboutToSave,
this, [this](Core::IDocument *document) {
connect(Core::EditorManager::instance(), &Core::EditorManager::aboutToSave, this, [this] {
if (m_effectComposerModel->hasUnsavedChanges()) {
QString compName = m_effectComposerModel->currentComposition();
if (!compName.isEmpty())