From f6b2cf10ba684629aaa7d6e444674e948f866df2 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 13 Jun 2019 09:29:40 +0200 Subject: [PATCH] Boot2Qt: Fix compile for gcc5.3 Change-Id: Ib104ca611d962e41352e95cef35c450307ffa029 Reviewed-by: hjk --- src/plugins/boot2qt/qdbdevice.cpp | 2 +- src/shared/qbs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/boot2qt/qdbdevice.cpp b/src/plugins/boot2qt/qdbdevice.cpp index 3bcdb2fac74..ca5eef12475 100644 --- a/src/plugins/boot2qt/qdbdevice.cpp +++ b/src/plugins/boot2qt/qdbdevice.cpp @@ -152,7 +152,7 @@ void DeviceApplicationObserver::handleFinished(bool success) QdbDevice::QdbDevice() { addDeviceAction({tr("Reboot Device"), [](const IDevice::Ptr &device, QWidget *) { - Command cmd{"reboot", {}}; + Command cmd{QStringLiteral("reboot"), {}}; (new DeviceApplicationObserver)->start(device, cmd); }}); diff --git a/src/shared/qbs b/src/shared/qbs index 79695499bbd..cba28b26cdf 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 79695499bbdd0eb804dd7e15d571481ae47d6f25 +Subproject commit cba28b26cdf93a74b52e1ec1635bee7107cb4995