From 919dc86c37ceac9808a1997ab8c5db153dba5e3b Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 20 Aug 2020 11:25:35 +0200 Subject: [PATCH] RemoteLinux: Compile fix with Qt6 QMap::unite() is gone, the replacement insert() came late, so ask the preprocessor for help. Task-number: QTCREATORBUG-24098 Change-Id: I2f596f9a998fa795fe0df378a39c4f1267f4e6e7 Reviewed-by: Christian Kandeler --- src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp | 6 ++++++ src/plugins/remotelinux/tarpackagecreationstep.cpp | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp index 424ec99bdc7..ba6c827d87a 100644 --- a/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp +++ b/src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp @@ -83,7 +83,13 @@ 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 0216bedfd7b..5c2c0c53c54 100644 --- a/src/plugins/remotelinux/tarpackagecreationstep.cpp +++ b/src/plugins/remotelinux/tarpackagecreationstep.cpp @@ -376,7 +376,11 @@ bool TarPackageCreationStep::fromMap(const QVariantMap &map) QVariantMap TarPackageCreationStep::toMap() const { QVariantMap map = AbstractPackagingStep::toMap(); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + map.insert(m_deployTimes.exportDeployTimes()); +#else map.unite(m_deployTimes.exportDeployTimes()); +#endif return map; }