From 40b0feba8d25811861140ab11029e29e79dca8f3 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 22 Jul 2022 21:33:05 +0200 Subject: [PATCH] Drop Qt5: RemoteLinux: Remove code below Qt 6.0.0 Change-Id: Ibf455d7bfc6d788d779a6065593a4384425e7778 Reviewed-by: Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp | 4 ---- src/plugins/remotelinux/tarpackagecreationstep.cpp | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp index facd43aad26..4c1c2f342c6 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp @@ -83,13 +83,9 @@ bool AbstractRemoteLinuxDeployStep::fromMap(const QVariantMap &map) QVariantMap AbstractRemoteLinuxDeployStep::toMap() const { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) QVariantMap map = BuildStep::toMap(); map.insert(d->deployService->exportDeployTimes()); return map; -#else - return BuildStep::toMap().unite(d->deployService->exportDeployTimes()); -#endif } bool AbstractRemoteLinuxDeployStep::init() diff --git a/src/plugins/remotelinux/tarpackagecreationstep.cpp b/src/plugins/remotelinux/tarpackagecreationstep.cpp index c8e6b35a932..5435d36551f 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -157,11 +157,7 @@ bool TarPackageCreationStep::fromMap(const QVariantMap &map) QVariantMap TarPackageCreationStep::toMap() const { QVariantMap map = BuildStep::toMap(); -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) map.insert(d->m_deployTimes.exportDeployTimes()); -#else - map.unite(d->m_deployTimes.exportDeployTimes()); -#endif return map; }