feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Drop Qt5: RemoteLinux: Remove code below Qt 6.0.0

Browse Source 
Change-Id: Ibf455d7bfc6d788d779a6065593a4384425e7778
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Jarek Kobus
2022-07-22 21:33:05 +02:00
parent 3b1ead69d0
commit 40b0feba8d
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/remotelinux/abstractremotelinuxdeploystep.cpp
View File

@@ -83,13 +83,9 @@ bool AbstractRemoteLinuxDeployStep::fromMap(const QVariantMap &map)
QVariantMap AbstractRemoteLinuxDeployStep::toMap() const QVariantMap AbstractRemoteLinuxDeployStep::toMap() const
{ {
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QVariantMap map = BuildStep::toMap(); QVariantMap map = BuildStep::toMap();
map.insert(d->deployService->exportDeployTimes()); map.insert(d->deployService->exportDeployTimes());
return map; return map;
#else
return BuildStep::toMap().unite(d->deployService->exportDeployTimes());
#endif
} }
bool AbstractRemoteLinuxDeployStep::init() bool AbstractRemoteLinuxDeployStep::init()

4
src/plugins/remotelinux/tarpackagecreationstep.cpp
View File

@@ -157,11 +157,7 @@ bool TarPackageCreationStep::fromMap(const QVariantMap &map)
QVariantMap TarPackageCreationStep::toMap() const QVariantMap TarPackageCreationStep::toMap() const
{ {
QVariantMap map = BuildStep::toMap(); QVariantMap map = BuildStep::toMap();
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
map.insert(d->m_deployTimes.exportDeployTimes()); map.insert(d->m_deployTimes.exportDeployTimes());
#else
map.unite(d->m_deployTimes.exportDeployTimes());
#endif
return map; return map;
} }