From dd32cc3b0893d1ccfbc3de397c23a9d5bef9832e Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 12 Feb 2013 16:33:12 +0100 Subject: Remove SigningCertificate from config.xml The files aren't used any more. Change-Id: I5b5becea08ebd56609241ab9db16f65b6e0fbf95 Reviewed-by: Karsten Heimrich Reviewed-by: Niels Weber --- src/libs/installer/settings.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/libs/installer/settings.cpp') 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(); -- cgit v1.2.3