diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-02-12 16:33:12 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-02-14 09:39:49 +0100 |
| commit | dd32cc3b0893d1ccfbc3de397c23a9d5bef9832e (patch) | |
| tree | a8e28f7df023462e60b70c7dbf787cd64b68ad0a /src | |
| parent | 8f240bb5d157f1957cc26a20ed8c3483eed2d6b6 (diff) | |
Remove SigningCertificate from config.xml
The files aren't used any more.
Change-Id: I5b5becea08ebd56609241ab9db16f65b6e0fbf95
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/installer/settings.cpp | 13 | ||||
| -rw-r--r-- | src/libs/installer/settings.h | 1 |
2 files changed, 2 insertions, 12 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; |