diff --git a/RedPandaIDE/parser/cppparser.cpp b/RedPandaIDE/parser/cppparser.cpp index ef96dba7..3a66c23d 100644 --- a/RedPandaIDE/parser/cppparser.cpp +++ b/RedPandaIDE/parser/cppparser.cpp @@ -6438,7 +6438,12 @@ void CppParser::setLanguage(ParserLanguage newLanguage) mCppTypeKeywords = CppTypeKeywords; #ifdef ENABLE_SDCC if (mLanguage == ParserLanguage::SDCC) { +#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0) mCppKeywords.insert(SDCCKeywords); +#else + for (auto &k : SDCCKeywords.keys()) + mCppKeywords[k] = SDCCKeywords[k]; +#endif mCppTypeKeywords.unite(SDCCTypeKeywords); } #endif diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp index 3177e82e..857fdb91 100644 --- a/RedPandaIDE/settings.cpp +++ b/RedPandaIDE/settings.cpp @@ -2406,7 +2406,7 @@ QStringList Settings::CompilerSet::defines(bool isCpp) { trimmedLine = trimmedLine.mid(2); if (trimmedLine.contains("=")) { QList items=trimmedLine.split('='); - result.append(QString("#define %1 %2").arg(items[0],items[1])); + result.append(QString("#define %1 %2").arg(QString(items[0]),QString(items[1]))); } else { result.append("#define "+trimmedLine); } diff --git a/RedPandaIDE/systemconsts.h b/RedPandaIDE/systemconsts.h index c2267554..153f70e5 100644 --- a/RedPandaIDE/systemconsts.h +++ b/RedPandaIDE/systemconsts.h @@ -60,6 +60,8 @@ #define LLDB_MI_PROGRAM "lldb-mi" #define LLDB_SERVER_PROGRAM "lldb-server" #define SDCC_PROGRAM "sdcc" +#define PACKIHX_PROGRAM "packihx" +#define MAKEBIN_PROGRAM "makebin" #elif defined(Q_OS_MACOS) #define CONSOLE_PAUSER "consolepauser" #define ASSEMBLER "nasm"