QuasarApp/installer-framework
4
0
Fork 0
mirror of https://github.com/QuasarApp/installer-framework.git synced 2025-05-14 05:49:35 +00:00
Code Issues Projects Releases Wiki Activity

Remove SigningCertificate from config.xml

Browse Source 
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>
This commit is contained in:
Kai Koehne 2013-02-12 16:33:12 +01:00
parent 8f240bb5d1
commit dd32cc3b08
4 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libs/installer/settings.cpp
View File

@ -65,7 +65,6 @@ static const QLatin1String scUserRepositories("UserRepositories");
static const QLatin1String scTmpRepositories("TemporaryRepositories"); static const QLatin1String scTmpRepositories("TemporaryRepositories");
static const QLatin1String scUninstallerIniFile("UninstallerIniFile"); static const QLatin1String scUninstallerIniFile("UninstallerIniFile");
static const QLatin1String scRemoteRepositories("RemoteRepositories"); static const QLatin1String scRemoteRepositories("RemoteRepositories");
static const QLatin1String scSigningCertificate("SigningCertificate");
static const QLatin1String scDependsOnLocalInstallerBinary("DependsOnLocalInstallerBinary"); static const QLatin1String scDependsOnLocalInstallerBinary("DependsOnLocalInstallerBinary");
static const QLatin1String scFtpProxy("FtpProxy"); static const QLatin1String scFtpProxy("FtpProxy");
@ -220,13 +219,13 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix)
<< scIcon << scLogo << scLogoSmall << scWatermark << scBackground << scIcon << scLogo << scLogoSmall << scWatermark << scBackground
<< scStartMenuDir << scUninstallerName << scUninstallerIniFile << scRemoveTargetDir << scStartMenuDir << scUninstallerName << scUninstallerIniFile << scRemoveTargetDir
<< scRunProgram << scRunProgramDescription << scRunProgram << scRunProgramDescription
<< scSigningCertificate << scDependsOnLocalInstallerBinary << scDependsOnLocalInstallerBinary
<< scAllowSpaceInPath << scAllowNonAsciiCharacters << scAllowSpaceInPath << scAllowNonAsciiCharacters
<< scRepositorySettingsPageVisible << scTargetConfigurationFile << scRepositorySettingsPageVisible << scTargetConfigurationFile
<< scRemoteRepositories << scPages; << scRemoteRepositories << scPages;
QStringList blackList; QStringList blackList;
blackList << scRemoteRepositories << scSigningCertificate << scPages; blackList << scRemoteRepositories << scPages;
Settings s; Settings s;
s.d->m_data.insert(scPrefix, prefix); 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)); reader.raiseError(QString::fromLatin1("Unexpected attribute for element '%1'.").arg(name));
if (blackList.contains(name)) { if (blackList.contains(name)) {
if (name == scSigningCertificate)
s.d->m_data.insertMulti(name, s.d->makeAbsolutePath(reader.readElementText()));
if (name == scRemoteRepositories) if (name == scRemoteRepositories)
s.addDefaultRepositories(readRepositories(reader, true)); s.addDefaultRepositories(readRepositories(reader, true));
@ -394,11 +390,6 @@ bool Settings::allowSpaceInPath() const
return d->m_data.value(scAllowSpaceInPath, false).toBool(); return d->m_data.value(scAllowSpaceInPath, false).toBool();
} }
QStringList Settings::certificateFiles() const
{
return d->m_data.value(scSigningCertificate).toStringList();
}
bool Settings::allowNonAsciiCharacters() const bool Settings::allowNonAsciiCharacters() const
{ {
return d->m_data.value(scAllowNonAsciiCharacters, false).toBool(); return d->m_data.value(scAllowNonAsciiCharacters, false).toBool();

1
src/libs/installer/settings.h
View File

@ -124,7 +124,6 @@ public:
void addUserRepositories(const QSet<Repository> &repositories); void addUserRepositories(const QSet<Repository> &repositories);
bool allowSpaceInPath() const; bool allowSpaceInPath() const;
QStringList certificateFiles() const;
bool allowNonAsciiCharacters() const; bool allowNonAsciiCharacters() const;
bool containsValue(const QString &key) const; bool containsValue(const QString &key) const;

3
tests/auto/installer/settings/data/full_config.xml
View File

@ -29,9 +29,6 @@ File should contain all elements we allow in a config.xml
<RunProgram>myapp</RunProgram> <RunProgram>myapp</RunProgram>
<RunProgramDescription>Launch MyApp</RunProgramDescription> <RunProgramDescription>Launch MyApp</RunProgramDescription>
<SigningCertificate>certificate1</SigningCertificate>
<SigningCertificate>certificate2</SigningCertificate>
<DependsOnLocalInstallerBinary>true</DependsOnLocalInstallerBinary> <DependsOnLocalInstallerBinary>true</DependsOnLocalInstallerBinary>
<AllowSpaceInPath>true</AllowSpaceInPath> <AllowSpaceInPath>true</AllowSpaceInPath>
<AllowNonAsciiCharacters>true</AllowNonAsciiCharacters> <AllowNonAsciiCharacters>true</AllowNonAsciiCharacters>

1
tests/auto/installer/settings/tst_settings.cpp
View File

@ -51,7 +51,6 @@ void tst_Settings::loadTutorialConfig()
QCOMPARE(settings.repositorySettingsPageVisible(), true); QCOMPARE(settings.repositorySettingsPageVisible(), true);
QCOMPARE(settings.hasReplacementRepos(), false); QCOMPARE(settings.hasReplacementRepos(), false);
QCOMPARE(settings.allowSpaceInPath(), false); QCOMPARE(settings.allowSpaceInPath(), false);
QCOMPARE(settings.certificateFiles(), QStringList());
QCOMPARE(settings.allowNonAsciiCharacters(), false); QCOMPARE(settings.allowNonAsciiCharacters(), false);
QCOMPARE(settings.hasReplacementRepos(), false); QCOMPARE(settings.hasReplacementRepos(), false);