6 files changed, 8 insertions, 9 deletions

diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp
index 090bfa501..8a4ec36c2 100644
--- a/src/libs/installer/component.cpp
+++ b/src/libs/installer/component.cpp
@@ -291,7 +291,7 @@ void Component::loadDataFromPackage(const Package &package)
     setValue(scAutoDependOn, package.data(scAutoDependOn).toString());
     setValue(scCompressedSize, package.data(scCompressedSize).toString());
     setValue(scUncompressedSize, package.data(scUncompressedSize).toString());
-    setValue(scRemoteVersion, package.data(scRemoteVersion).toString());
+    setValue(scVersion, package.data(scVersion).toString());
     setValue(scInheritVersion, package.data(scInheritVersion).toString());
     setValue(scDependencies, package.data(scDependencies).toString());
     setValue(scDownloadableArchives, package.data(scDownloadableArchives).toString());
@@ -829,7 +829,7 @@ void Component::addDownloadableArchive(const QString &path)
     Q_ASSERT(isFromOnlineRepository());
 
     qDebug() << "addDownloadable" << path;
-    d->m_downloadableArchives.append(d->m_vars.value(scRemoteVersion) + path);
+    d->m_downloadableArchives.append(d->m_vars.value(scVersion) + path);
 }
 
 /*!
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h
index 60511ea13..950cfcdd9 100644
--- a/src/libs/installer/constants.h
+++ b/src/libs/installer/constants.h
@@ -47,7 +47,6 @@ static const QLatin1String scScript("script");
 static const QLatin1String scName("Name");
 static const QLatin1String scVersion("Version");
 static const QLatin1String scDefault("Default");
-static const QLatin1String scRemoteVersion("Version");
 static const QLatin1String scDisplayVersion("DisplayVersion");
 static const QLatin1String scRemoteDisplayVersion("RemoteDisplayVersion");
 static const QLatin1String scInheritVersion("inheritVersionFrom");
diff --git a/src/libs/installer/metadatajob.cpp b/src/libs/installer/metadatajob.cpp
index 41c0265bc..e215e99f6 100644
--- a/src/libs/installer/metadatajob.cpp
+++ b/src/libs/installer/metadatajob.cpp
@@ -344,7 +344,7 @@ MetadataJob::Status MetadataJob::parseUpdatesXml(const QList<FileTaskResult> &re
                 for (int j = 0; j < c2.count(); ++j) {
                     if (c2.at(j).toElement().tagName() == scName)
                         packageName = c2.at(j).toElement().text();
-                    else if (c2.at(j).toElement().tagName() == scRemoteVersion)
+                    else if (c2.at(j).toElement().tagName() == scVersion)
                         packageVersion = (online ? c2.at(j).toElement().text() : QString());
                     else if ((c2.at(j).toElement().tagName() == QLatin1String("SHA1")) && testCheckSum)
                         packageHash = c2.at(j).toElement().text();
diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp
index 7ab12d855..d84e29967 100644
--- a/src/libs/installer/packagemanagercore.cpp
+++ b/src/libs/installer/packagemanagercore.cpp
@@ -963,7 +963,7 @@ bool PackageManagerCore::fetchRemotePackagesTree()
                     }
 
                     const LocalPackage localPackage = installedPackages.value(name);
-                    const QString updateVersion = update->data(scRemoteVersion).toString();
+                    const QString updateVersion = update->data(scVersion).toString();
                     if (KDUpdater::compareVersion(updateVersion, localPackage.version) <= 0)
                         break;  // remote version equals or is less than the installed maintenance tool
 
@@ -2355,7 +2355,7 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const
                 continue;   // Update for not installed package found, skip it.
 
             const LocalPackage &localPackage = locals.value(name);
-            const QString updateVersion = update->data(scRemoteVersion).toString();
+            const QString updateVersion = update->data(scVersion).toString();
             if (KDUpdater::compareVersion(updateVersion, localPackage.version) <= 0)
                 continue;
 
@@ -2476,7 +2476,7 @@ void PackageManagerCore::updateDisplayVersions(const QString &displayKey)
         }
         visited.clear();
         const QString displayVersionRemote = findDisplayVersion(key, componentsHash,
-            scRemoteVersion, visited);
+            scVersion, visited);
         if (displayVersionRemote.isEmpty())
             componentsHash.value(key)->setValue(displayKey, tr("invalid"));
         else
diff --git a/src/sdk/updatechecker.cpp b/src/sdk/updatechecker.cpp
index 0ecf94ea7..35e2dda88 100644
--- a/src/sdk/updatechecker.cpp
+++ b/src/sdk/updatechecker.cpp
@@ -108,7 +108,7 @@ int UpdateChecker::check()
     foreach (QInstaller::Component *component, components) {
         QDomElement update = doc.createElement(QLatin1String("update"));
         update.setAttribute(QLatin1String("name"), component->value(QInstaller::scDisplayName));
-        update.setAttribute(QLatin1String("version"), component->value(QInstaller::scRemoteVersion));
+        update.setAttribute(QLatin1String("version"), component->value(QInstaller::scVersion));
         update.setAttribute(QLatin1String("size"), component->value(QInstaller::scUncompressedSize));
         root.appendChild(update);
     }
diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp
index cdd3f779a..23629ac91 100644
--- a/tools/repogen/repogen.cpp
+++ b/tools/repogen/repogen.cpp
@@ -222,7 +222,7 @@ int main(int argc, char** argv)
                         for (int j = 0; j < c2.count(); ++j) {
                             if (c2.at(j).toElement().tagName() == scName)
                                 info.name = c2.at(j).toElement().text();
-                            else if (c2.at(j).toElement().tagName() == scRemoteVersion)
+                            else if (c2.at(j).toElement().tagName() == scVersion)
                                 info.version = c2.at(j).toElement().text();
                         }
                         hash.insert(info.name, info);