mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-07-07 20:14:12 +02:00
Sync with upstream master and resolve conflict in qet_de.qm
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user