From 58a3e72abe186b34735ea29edad4114079a81133 Mon Sep 17 00:00:00 2001 From: joshua Date: Mon, 1 Nov 2021 12:41:43 +0100 Subject: [PATCH] Fix FTBFS for ubuntu Bionic Beaver --- sources/TerminalStrip/terminalstrip.cpp | 7 ++++++- sources/TerminalStrip/terminalstripdata.cpp | 7 +++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/sources/TerminalStrip/terminalstrip.cpp b/sources/TerminalStrip/terminalstrip.cpp index 3b9d3f05c..09c530740 100644 --- a/sources/TerminalStrip/terminalstrip.cpp +++ b/sources/TerminalStrip/terminalstrip.cpp @@ -161,7 +161,12 @@ class RealTerminal auto is_draw = xml_element.attribute(QStringLiteral("is_draw")) == QLatin1String("true") ? true : false; - auto uuid_ = QUuid::fromString(xml_element.attribute(QStringLiteral("uuid"))); + +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + auto uuid_ = QUuid::fromString(xml_element.attribute(QLatin1String("uuid"))); +#else + auto uuid_ = QUuid(xml_element.attribute(QStringLiteral("uuid"))); +#endif if (is_draw) { for (auto terminal : terminal_vector) { diff --git a/sources/TerminalStrip/terminalstripdata.cpp b/sources/TerminalStrip/terminalstripdata.cpp index 8497c497d..1a44f2065 100644 --- a/sources/TerminalStrip/terminalstripdata.cpp +++ b/sources/TerminalStrip/terminalstripdata.cpp @@ -60,8 +60,11 @@ bool TerminalStripData::fromXml(const QDomElement &xml_element) "due to wrong tag name. Expected " << this->xmlTagName() << " used " << xml_element.tagName(); return false; } - - m_uuid = QUuid::fromString(xml_element.attribute("uuid")); +#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) + m_uuid = QUuid::fromString(xml_element.attribute(QLatin1String("uuid"))); +#else + m_uuid = QUuid(xml_element.attribute(QStringLiteral("uuid"))); +#endif for (auto &xml_info : QETXML::findInDomElement(xml_element.firstChildElement("informations"),