diff --git a/RedPandaIDE/compiler/projectcompiler.cpp b/RedPandaIDE/compiler/projectcompiler.cpp index dc922806..3837dbf5 100644 --- a/RedPandaIDE/compiler/projectcompiler.cpp +++ b/RedPandaIDE/compiler/projectcompiler.cpp @@ -457,6 +457,8 @@ void ProjectCompiler::writeMakeObjFilesRules(QFile &file) } else { sourceEncoding = unit->realEncoding(); } + if (sourceEncoding==ENCODING_SYSTEM_DEFAULT) + sourceEncoding = defaultSystemEncoding; if (sourceEncoding!=targetEncoding) { encodingStr = QString(" -finput-charset=%1 -fexec-charset=%2") diff --git a/RedPandaIDE/settingsdialog/projectgeneralwidget.ui b/RedPandaIDE/settingsdialog/projectgeneralwidget.ui index ae18db5c..7a2d223b 100644 --- a/RedPandaIDE/settingsdialog/projectgeneralwidget.ui +++ b/RedPandaIDE/settingsdialog/projectgeneralwidget.ui @@ -192,7 +192,7 @@ QAbstractItemView::NoEditTriggers - true + false QListView::Fixed