diff options
| author | kh1 <karsten.heimrich@digia.com> | 2012-11-08 16:49:59 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2012-11-09 10:52:56 +0100 |
| commit | 274c93b4a05967563f0b201ff0b6faf9b6292701 (patch) | |
| tree | c03a696a5377326411f2369ec78a5f003c498b30 /src/libs | |
| parent | 4917152126998bcd448c3b001b962eb8f8bede62 (diff) | |
Add some more ambiguous chars and option to allow space.
Task-number: QTIFW-148
Task-number: QTIFW-161
Change-Id: I20a0a1be872807305398d81b8672f3df77220212
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/installer/constants.h | 1 | ||||
| -rw-r--r-- | src/libs/installer/settings.cpp | 7 | ||||
| -rw-r--r-- | src/libs/installer/settings.h | 1 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/libs/installer/constants.h b/src/libs/installer/constants.h index be11f5156..573db4380 100644 --- a/src/libs/installer/constants.h +++ b/src/libs/installer/constants.h @@ -77,6 +77,7 @@ static const QLatin1String scRunProgramDescription("RunProgramDescription"); static const QLatin1String scTargetConfigurationFile("TargetConfigurationFile"); static const QLatin1String scAllowNonAsciiCharacters("AllowNonAsciiCharacters"); static const QLatin1String scRepositorySettingsPageVisible("RepositorySettingsPageVisible"); +static const QLatin1String scAllowSpaceInPath("AllowSpaceInPath"); } #endif // CONSTANTS_H diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index cb84d5438..e222c06f0 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -342,6 +342,11 @@ QString Settings::configurationFileName() const return d->m_data.value(scTargetConfigurationFile).toString(); } +bool Settings::allowSpaceInPath() const +{ + return d->m_data.value(scAllowSpaceInPath, false).toBool(); +} + QStringList Settings::certificateFiles() const { return d->m_data.value(scSigningCertificate).toStringList(); @@ -349,7 +354,7 @@ QStringList Settings::certificateFiles() const bool Settings::allowNonAsciiCharacters() const { - return d->m_data.value(scAllowNonAsciiCharacters).toBool(); + return d->m_data.value(scAllowNonAsciiCharacters, false).toBool(); } bool Settings::dependsOnLocalInstallerBinary() const diff --git a/src/libs/installer/settings.h b/src/libs/installer/settings.h index 52453e970..f5a614fed 100644 --- a/src/libs/installer/settings.h +++ b/src/libs/installer/settings.h @@ -112,6 +112,7 @@ public: void setUserRepositories(const QSet<Repository> &repositories); void addUserRepositories(const QSet<Repository> &repositories); + bool allowSpaceInPath() const; QStringList certificateFiles() const; bool allowNonAsciiCharacters() const; |