summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@theqtcompany.com>2014-12-04 12:55:47 +0100
committerKai Koehne <kai.koehne@theqtcompany.com>2014-12-08 13:49:52 +0100
commitb843bff42705044eb88bc87298873ed6f7a93c55 (patch)
tree447d8e3185db0a4d96521c08157299a5d5fe3302
parent094ec05349bdf6f9981e6144ee773c13f03a438e (diff)
Allow spaces in path by default
Change-Id: Iff1e5056a2465977fd6930f94a649ce51dd0fcd0 Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
-rw-r--r--Changelog1
-rw-r--r--src/libs/installer/settings.cpp2
-rw-r--r--tests/auto/installer/settings/tst_settings.cpp2
3 files changed, 3 insertions, 2 deletions
diff --git a/Changelog b/Changelog
index a09ae47b2..e8d39591d 100644
--- a/Changelog
+++ b/Changelog
@@ -40,6 +40,7 @@
- Removed SetQtCreatorArrayValue, AddQtCreatorArrayValue operations.
- Removed ApplyProductKey, ReplaceInstallNames, QtPatch operations.
- Added systemInfo to the scripting API (QTIFW-592).
+- Changed default of 'AllowSpaceInPath' from false to true.
Thanks go to Christoph VogtlÃĪnder, Sze Howe Koh, Ray Donnelly, Tasuku Suzuki and Sascha Cunz for contributions.
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index d38a39eb6..4ff66a7da 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -452,7 +452,7 @@ QString Settings::configurationFileName() const
bool Settings::allowSpaceInPath() const
{
- return d->m_data.value(scAllowSpaceInPath, true).toBool();
+ return d->m_data.value(scAllowSpaceInPath, false).toBool();
}
bool Settings::allowNonAsciiCharacters() const
diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp
index 54d6dc66e..5f806763a 100644
--- a/tests/auto/installer/settings/tst_settings.cpp
+++ b/tests/auto/installer/settings/tst_settings.cpp
@@ -68,7 +68,7 @@ void tst_Settings::loadTutorialConfig()
QCOMPARE(settings.configurationFileName(), QLatin1String("components.xml"));
QCOMPARE(settings.dependsOnLocalInstallerBinary(), false);
QCOMPARE(settings.repositorySettingsPageVisible(), true);
- QCOMPARE(settings.allowSpaceInPath(), true);
+ QCOMPARE(settings.allowSpaceInPath(), false);
QCOMPARE(settings.allowNonAsciiCharacters(), false);
QCOMPARE(settings.hasReplacementRepos(), false);