Fix muparserX compilation on minGW (UNICODE disabled)

This commit is contained in:
Jan Käberich 2020-12-18 19:41:11 +01:00
parent 9614c9d850
commit b7ad595628
2 changed files with 3 additions and 1 deletions

View File

@ -256,3 +256,5 @@ CONFIG += c++14
REVISION = $$system(git rev-parse HEAD) REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\" DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=0 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\" DEFINES += FW_MAJOR=0 FW_MINOR=1 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\"
DEFINES -= _UNICODE UNICODE

View File

@ -238,7 +238,7 @@ void AppWindow::ConnectToDevice(QString serial)
break; break;
} }
} }
} catch (const runtime_error e) { } catch (const runtime_error &e) {
qWarning() << "Failed to connect:" << e.what(); qWarning() << "Failed to connect:" << e.what();
DisconnectDevice(); DisconnectDevice();
UpdateDeviceList(); UpdateDeviceList();