summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/libs/installer/settings.cpp13
-rw-r--r--src/libs/installer/settings.h1
-rw-r--r--tests/auto/installer/settings/data/full_config.xml3
-rw-r--r--tests/auto/installer/settings/tst_settings.cpp1
4 files changed, 2 insertions, 16 deletions
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 3bf979bee..7dcb57e68 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -65,7 +65,6 @@ static const QLatin1String scUserRepositories("UserRepositories");
static const QLatin1String scTmpRepositories("TemporaryRepositories");
static const QLatin1String scUninstallerIniFile("UninstallerIniFile");
static const QLatin1String scRemoteRepositories("RemoteRepositories");
-static const QLatin1String scSigningCertificate("SigningCertificate");
static const QLatin1String scDependsOnLocalInstallerBinary("DependsOnLocalInstallerBinary");
static const QLatin1String scFtpProxy("FtpProxy");
@@ -220,13 +219,13 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix)
<< scIcon << scLogo << scLogoSmall << scWatermark << scBackground
<< scStartMenuDir << scUninstallerName << scUninstallerIniFile << scRemoveTargetDir
<< scRunProgram << scRunProgramDescription
- << scSigningCertificate << scDependsOnLocalInstallerBinary
+ << scDependsOnLocalInstallerBinary
<< scAllowSpaceInPath << scAllowNonAsciiCharacters
<< scRepositorySettingsPageVisible << scTargetConfigurationFile
<< scRemoteRepositories << scPages;
QStringList blackList;
- blackList << scRemoteRepositories << scSigningCertificate << scPages;
+ blackList << scRemoteRepositories << scPages;
Settings s;
s.d->m_data.insert(scPrefix, prefix);
@@ -240,9 +239,6 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix)
reader.raiseError(QString::fromLatin1("Unexpected attribute for element '%1'.").arg(name));
if (blackList.contains(name)) {
- if (name == scSigningCertificate)
- s.d->m_data.insertMulti(name, s.d->makeAbsolutePath(reader.readElementText()));
-
if (name == scRemoteRepositories)
s.addDefaultRepositories(readRepositories(reader, true));
@@ -394,11 +390,6 @@ bool Settings::allowSpaceInPath() const
return d->m_data.value(scAllowSpaceInPath, false).toBool();
}
-QStringList Settings::certificateFiles() const
-{
- return d->m_data.value(scSigningCertificate).toStringList();
-}
-
bool Settings::allowNonAsciiCharacters() const
{
return d->m_data.value(scAllowNonAsciiCharacters, false).toBool();
diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h
index 3158468db..51355d038 100644
--- a/src/libs/installer/settings.h
+++ b/src/libs/installer/settings.h
@@ -124,7 +124,6 @@ public:
void addUserRepositories(const QSet<Repository> &repositories);
bool allowSpaceInPath() const;
- QStringList certificateFiles() const;
bool allowNonAsciiCharacters() const;
bool containsValue(const QString &key) const;
diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml
index 2b11c0166..9f06703b0 100644
--- a/tests/auto/installer/settings/data/full_config.xml
+++ b/tests/auto/installer/settings/data/full_config.xml
@@ -29,9 +29,6 @@ File should contain all elements we allow in a config.xml
<RunProgram>myapp</RunProgram>
<RunProgramDescription>Launch MyApp</RunProgramDescription>
- <SigningCertificate>certificate1</SigningCertificate>
- <SigningCertificate>certificate2</SigningCertificate>
-
<DependsOnLocalInstallerBinary>true</DependsOnLocalInstallerBinary>
<AllowSpaceInPath>true</AllowSpaceInPath>
<AllowNonAsciiCharacters>true</AllowNonAsciiCharacters>
diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp
index 9fbbd8292..492974a5a 100644
--- a/tests/auto/installer/settings/tst_settings.cpp
+++ b/tests/auto/installer/settings/tst_settings.cpp
@@ -51,7 +51,6 @@ void tst_Settings::loadTutorialConfig()
QCOMPARE(settings.repositorySettingsPageVisible(), true);
QCOMPARE(settings.hasReplacementRepos(), false);
QCOMPARE(settings.allowSpaceInPath(), false);
- QCOMPARE(settings.certificateFiles(), QStringList());
QCOMPARE(settings.allowNonAsciiCharacters(), false);
QCOMPARE(settings.hasReplacementRepos(), false);