Sync with upstream master and resolve conflict in qet_de.qm

This commit is contained in:
Kellermorph
2026-06-17 22:07:41 +02:00
6 changed files with 46 additions and 41 deletions
-1
View File
@@ -2489,7 +2489,6 @@ void QETDiagramEditor::generateTerminalBlock()
exeList << (QETApp::dataDir() + "/binary/qet_tb_generator.exe")
<< (QDir::currentPath() + "/qet_tb_generator.exe")
<< QStandardPaths::findExecutable("qet_tb_generator.exe")
<< (QDir::homePath() + "/Application Data/qet/qet_tb_generator.exe")
<< "qet_tb_generator.exe"
<< "qet_tb_generator"; // from original code: missing ".exe" ???
#elif defined(Q_OS_MACOS)