From b7ad595628b6443e411cabfdd8c0aaa898625476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20K=C3=A4berich?= Date: Fri, 18 Dec 2020 19:41:11 +0100 Subject: [PATCH] Fix muparserX compilation on minGW (UNICODE disabled) --- Software/PC_Application/Application.pro | 2 ++ Software/PC_Application/appwindow.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Software/PC_Application/Application.pro b/Software/PC_Application/Application.pro index 91e78d3..f5c08e9 100644 --- a/Software/PC_Application/Application.pro +++ b/Software/PC_Application/Application.pro @@ -256,3 +256,5 @@ CONFIG += c++14 REVISION = $$system(git rev-parse HEAD) DEFINES += GITHASH=\\"\"$$REVISION\\"\" DEFINES += FW_MAJOR=0 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\" +DEFINES -= _UNICODE UNICODE + diff --git a/Software/PC_Application/appwindow.cpp b/Software/PC_Application/appwindow.cpp index e6d0a0d..3dc0dfa 100644 --- a/Software/PC_Application/appwindow.cpp +++ b/Software/PC_Application/appwindow.cpp @@ -238,7 +238,7 @@ void AppWindow::ConnectToDevice(QString serial) break; } } - } catch (const runtime_error e) { + } catch (const runtime_error &e) { qWarning() << "Failed to connect:" << e.what(); DisconnectDevice(); UpdateDeviceList();