From b4cdc6c9e3ecdc4acbe1882ddd4a3888bb8f2d7c Mon Sep 17 00:00:00 2001
From: jkobus <jaroslaw.kobus@digia.com>
Date: Thu, 5 Jun 2014 09:23:03 +0200
Subject: Fix tutorial example

- remove translations part
- replace installation dir (root) with home
  in order to properly finish the installer wizard
  with default values
- AllowSpaceInPath is now true by default (ChangeLog updated)

Change-Id: I84e372ac4da05964d90851bf592fc87ee9409e3b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 Changelog                                                     |  3 +++
 doc/installerfw.qdoc                                          |  2 +-
 doc/tutorial.qdoc                                             |  4 ----
 examples/tutorial/config/config.xml                           |  2 +-
 examples/tutorial/packages/com.vendor.product/meta/de_de.ts   | 11 -----------
 .../packages/com.vendor.product/meta/license_de_de.txt        |  1 -
 .../tutorial/packages/com.vendor.product/meta/package.xml     |  3 ---
 src/libs/installer/settings.cpp                               |  2 +-
 8 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 examples/tutorial/packages/com.vendor.product/meta/de_de.ts
 delete mode 100644 examples/tutorial/packages/com.vendor.product/meta/license_de_de.txt

diff --git a/Changelog b/Changelog
index 1a39ec93f..8f535d8b0 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,6 @@
+2.0
+- Change the default value of AllowSpaceInPath in config.xml to true
+
 1.5.1
 - The checkupdates option handles no-network situations better. (QTIFW-431)
 - Fixed random crash while accessing arguments.
diff --git a/doc/installerfw.qdoc b/doc/installerfw.qdoc
index 57b575ee4..6ee773d9d 100644
--- a/doc/installerfw.qdoc
+++ b/doc/installerfw.qdoc
@@ -258,7 +258,7 @@
             \o  Set to \c false to hide the repository settings page inside the settings dialog.
         \row
             \o  AllowSpaceInPath
-            \o  Set to \c true if the installation path can contain space characters.
+            \o  Set to \c false if the installation path cannot contain space characters.
         \row
             \o  DependsOnLocalInstallerBinary
             \o  Set to \c true if you want to prohibit installation from an external resource, such
diff --git a/doc/tutorial.qdoc b/doc/tutorial.qdoc
index 026bcc4ce..85b600645 100644
--- a/doc/tutorial.qdoc
+++ b/doc/tutorial.qdoc
@@ -188,10 +188,6 @@
 
     \endlist
 
-    \note You have to either call \c lrelease on the included .ts file before building
-    the installer or add \c --ignore-translations as a parameter to the binarycreator
-    call.
-
     The installer is created in the current directory and you can deliver it to
     end users.
 
diff --git a/examples/tutorial/config/config.xml b/examples/tutorial/config/config.xml
index 6ffb2e3e8..17b2b0dfa 100644
--- a/examples/tutorial/config/config.xml
+++ b/examples/tutorial/config/config.xml
@@ -5,5 +5,5 @@
     <Title>Your application Installer</Title>
     <Publisher>Your vendor</Publisher>
     <StartMenuDir>Super App</StartMenuDir>
-    <TargetDir>@RootDir@InstallationDirectory</TargetDir>
+    <TargetDir>@HomeDir@/InstallationDirectory</TargetDir>
 </Installer>
diff --git a/examples/tutorial/packages/com.vendor.product/meta/de_de.ts b/examples/tutorial/packages/com.vendor.product/meta/de_de.ts
deleted file mode 100644
index 7396ac964..000000000
--- a/examples/tutorial/packages/com.vendor.product/meta/de_de.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.0" language="de_DE">
-<context>
-    <name>Dummy</name>
-    <message>
-        <source>Dummy message.</source>
-        <translation>Dummy Nachricht.</translation>
-    </message>
-</context>
-</TS>
diff --git a/examples/tutorial/packages/com.vendor.product/meta/license_de_de.txt b/examples/tutorial/packages/com.vendor.product/meta/license_de_de.txt
deleted file mode 100644
index a082ff098..000000000
--- a/examples/tutorial/packages/com.vendor.product/meta/license_de_de.txt
+++ /dev/null
@@ -1 +0,0 @@
-Die fantastische Lizenz, noch nie vom Bier Public License Agreement gehört?
diff --git a/examples/tutorial/packages/com.vendor.product/meta/package.xml b/examples/tutorial/packages/com.vendor.product/meta/package.xml
index 71d48c248..ce122f334 100644
--- a/examples/tutorial/packages/com.vendor.product/meta/package.xml
+++ b/examples/tutorial/packages/com.vendor.product/meta/package.xml
@@ -8,9 +8,6 @@
     <Licenses>
         <License name="Beer Public License Agreement" file="license.txt" />
     </Licenses>
-    <Translations>
-        <Translation>de_de.qm</Translation>
-    </Translations>
     <Default>script</Default>
     <Script>installscript.qs</Script>
     <UserInterfaces>
diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp
index 56041916e..81972f2c2 100644
--- a/src/libs/installer/settings.cpp
+++ b/src/libs/installer/settings.cpp
@@ -432,7 +432,7 @@ QString Settings::configurationFileName() const
 
 bool Settings::allowSpaceInPath() const
 {
-    return d->m_data.value(scAllowSpaceInPath, false).toBool();
+    return d->m_data.value(scAllowSpaceInPath, true).toBool();
 }
 
 bool Settings::allowNonAsciiCharacters() const
-- 
cgit v1.2.3