1 files changed, 1 insertions, 31 deletions
diff --git a/installerbuilder/libinstaller/settings.cpp b/installerbuilder/libinstaller/settings.cpp
index fbb78f528..1699b462b 100644
--- a/installerbuilder/libinstaller/settings.cpp
+++ b/installerbuilder/libinstaller/settings.cpp
@@ -49,8 +49,6 @@ static const QLatin1String scPages("Pages");
 static const QLatin1String scPrefix("Prefix");
 static const QLatin1String scLogoSmall("LogoSmall");
 static const QLatin1String scWatermark("Watermark");
-static const QLatin1String scPublicKey("PublicKey");
-static const QLatin1String scPrivateKey("PrivateKey");
 static const QLatin1String scProductUrl("ProductUrl");
 static const QLatin1String scBackground("Background");
 static const QLatin1String scAdminTargetDir("AdminTargetDir");
@@ -74,21 +72,6 @@ static QSet<T> variantListToSet(const QVariantList &list)
     return set;
 }
 
-static QString splitTrimmed(const QString &string)
-{
-    if (string.isEmpty())
-        return QString();
-
-    const QStringList input = string.split(QRegExp(QLatin1String("\n|\r\n")));
-
-    QStringList result;
-    foreach (const QString &line, input)
-        result.append(line.trimmed());
-    result.append(QString());
-
-    return result.join(QLatin1String("\n"));
-}
-
 static QSet<Repository> readRepositories(QXmlStreamReader &reader, bool isDefault)
 {
     QSet<Repository> set;
@@ -208,16 +191,13 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix)
     }
 
     QStringList blackList;
-    blackList << scPrivateKey << scPublicKey << scRemoteRepositories << scSigningCertificate << scPages;
+    blackList << scRemoteRepositories << scSigningCertificate << scPages;
 
     Settings s;
     s.d->m_data.insert(scPrefix, prefix);
     while (reader.readNextStartElement()) {
         const QString name = reader.name().toString();
         if (blackList.contains(name)) {
-            if (name == scPrivateKey || name == scPublicKey)
-                s.d->m_data.insert(name, splitTrimmed(reader.readElementText()));
-
             if (name == scSigningCertificate)
                 s.d->m_data.insertMulti(name, s.d->makeAbsolutePath(reader.readElementText()));
 
@@ -371,16 +351,6 @@ bool Settings::allowNoneAsciiCharacters() const
     return d->m_data.value(scAllowNonAsciiCharacters).toBool();
 }
 
-QByteArray Settings::privateKey() const
-{
-    return d->m_data.value(scPrivateKey).toByteArray();
-}
-
-QByteArray Settings::publicKey() const
-{
-    return d->m_data.value(scPublicKey).toByteArray();
-}
-
 bool Settings::hasReplacementRepos() const
 {
     return d->m_replacementRepos;