summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>2015-02-26 13:47:14 +0100
committerJarek Kobus <jaroslaw.kobus@theqtcompany.com>2015-02-26 14:09:53 +0000
commit4503aa1ee136df122e1e1ea25e672f0f3b4aa13c (patch)
treebcbbea59beb3a508c9a19f1d1d0e12f44ac0935a
parentf0951246d8192c8fbd3ea7f6366f476736ae1a2d (diff)
Fix the default installation location for all examples
Now they are all located in distinct subfolders of one common IfwExamples folder located in home. Change-Id: Ife92e8d7f7fc33bc1f941f49c75333d0e4fc72d1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
-rw-r--r--doc/includes/installerfw-examples-configuring.qdocinc2
-rw-r--r--examples/changeuserinterface/config/config.xml2
-rw-r--r--examples/componenterror/config/config.xml2
-rw-r--r--examples/dependencies/config/config.xml2
-rw-r--r--examples/dynamicpage/config/config.xml2
-rw-r--r--examples/licenseagreement/config/config.xml2
-rw-r--r--examples/modifyextract/config/config.xml2
-rw-r--r--examples/online/config/config.xml2
-rw-r--r--examples/openreadme/config/config.xml2
-rw-r--r--examples/quit_installer/config/config.xml2
-rw-r--r--examples/registerfileextension/config/config.xml2
-rw-r--r--examples/startmenu/config/config.xml2
-rw-r--r--examples/systeminfo/config/config.xml2
-rw-r--r--examples/translations/config/config.xml2
14 files changed, 14 insertions, 14 deletions
diff --git a/doc/includes/installerfw-examples-configuring.qdocinc b/doc/includes/installerfw-examples-configuring.qdocinc
index 3a29af3dc..d89ace6a5 100644
--- a/doc/includes/installerfw-examples-configuring.qdocinc
+++ b/doc/includes/installerfw-examples-configuring.qdocinc
@@ -14,7 +14,7 @@
\li The \c <StartMenuDir> element specifies the name of the default
program group for the product in the Windows \gui Start menu.
\li The \c <TargetDir> element specifies that the default target
- directory displayed to users is \c IfwExample in the home directory
+ directory is located in the \c IfwExamples directory in the home directory
of the current user (because the predefined variable\c @HomeDir@ is
used as a part of the value). For more information, see
\l{Predefined Variables}.
diff --git a/examples/changeuserinterface/config/config.xml b/examples/changeuserinterface/config/config.xml
index bdd7e9c2a..6fec718a4 100644
--- a/examples/changeuserinterface/config/config.xml
+++ b/examples/changeuserinterface/config/config.xml
@@ -5,5 +5,5 @@
<Title>Change Installer UI Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt IFW Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/changeuserinterface</TargetDir>
</Installer>
diff --git a/examples/componenterror/config/config.xml b/examples/componenterror/config/config.xml
index da707f228..0836e1648 100644
--- a/examples/componenterror/config/config.xml
+++ b/examples/componenterror/config/config.xml
@@ -5,5 +5,5 @@
<Title>Component Error Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt IFW Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/componenterror</TargetDir>
</Installer>
diff --git a/examples/dependencies/config/config.xml b/examples/dependencies/config/config.xml
index 4a1b42501..72a127f19 100644
--- a/examples/dependencies/config/config.xml
+++ b/examples/dependencies/config/config.xml
@@ -5,6 +5,6 @@
<Title>Dependency Solving Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt IFW Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwDependencySolvingExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/dependencies</TargetDir>
<CreateLocalRepository>true</CreateLocalRepository>
</Installer>
diff --git a/examples/dynamicpage/config/config.xml b/examples/dynamicpage/config/config.xml
index b91922546..d6944bfae 100644
--- a/examples/dynamicpage/config/config.xml
+++ b/examples/dynamicpage/config/config.xml
@@ -5,5 +5,5 @@
<Title>Dynamic Page Installer Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt IFW Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/dynamicpage</TargetDir>
</Installer>
diff --git a/examples/licenseagreement/config/config.xml b/examples/licenseagreement/config/config.xml
index a17cedd70..a8e3de7ff 100644
--- a/examples/licenseagreement/config/config.xml
+++ b/examples/licenseagreement/config/config.xml
@@ -5,5 +5,5 @@
<Title>License Agreement Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt Installer Framework Example</StartMenuDir>
- <TargetDir>@HomeDir@/IFWLicenseAgreementExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/licenseagreement</TargetDir>
</Installer>
diff --git a/examples/modifyextract/config/config.xml b/examples/modifyextract/config/config.xml
index 1ff8ead0c..aa1632012 100644
--- a/examples/modifyextract/config/config.xml
+++ b/examples/modifyextract/config/config.xml
@@ -5,5 +5,5 @@
<Title>Modify Extract Installer Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt IFW Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/modifyextract</TargetDir>
</Installer>
diff --git a/examples/online/config/config.xml b/examples/online/config/config.xml
index 9aeedd00d..193f8f8a5 100644
--- a/examples/online/config/config.xml
+++ b/examples/online/config/config.xml
@@ -6,7 +6,7 @@
<Publisher>The Qt Company</Publisher>
<!-- Directory name is used in component.xml -->
<StartMenuDir>Qt IFW Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/online</TargetDir>
<RemoteRepositories>
<Repository>
<Url>http://localhost/repository</Url>
diff --git a/examples/openreadme/config/config.xml b/examples/openreadme/config/config.xml
index bd6092a8a..58c0703d9 100644
--- a/examples/openreadme/config/config.xml
+++ b/examples/openreadme/config/config.xml
@@ -5,5 +5,5 @@
<Title>Open Readme Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt IFW Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/openreadme</TargetDir>
</Installer>
diff --git a/examples/quit_installer/config/config.xml b/examples/quit_installer/config/config.xml
index 896c9f91b..910757b58 100644
--- a/examples/quit_installer/config/config.xml
+++ b/examples/quit_installer/config/config.xml
@@ -5,5 +5,5 @@
<Title>Quit Installer Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt IFW Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/quitinstaller</TargetDir>
</Installer>
diff --git a/examples/registerfileextension/config/config.xml b/examples/registerfileextension/config/config.xml
index f7bff22f7..de952699e 100644
--- a/examples/registerfileextension/config/config.xml
+++ b/examples/registerfileextension/config/config.xml
@@ -5,5 +5,5 @@
<Title>Register File Extension Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt IFW Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/registerfileextension</TargetDir>
</Installer>
diff --git a/examples/startmenu/config/config.xml b/examples/startmenu/config/config.xml
index 8da61b26e..4b89bb914 100644
--- a/examples/startmenu/config/config.xml
+++ b/examples/startmenu/config/config.xml
@@ -6,5 +6,5 @@
<Publisher>Qt-Project</Publisher>
<!-- Directory name is used in component.xml -->
<StartMenuDir>Qt Installer Framework Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/startmenu</TargetDir>
</Installer>
diff --git a/examples/systeminfo/config/config.xml b/examples/systeminfo/config/config.xml
index ffbfd9d7f..27b8b61fe 100644
--- a/examples/systeminfo/config/config.xml
+++ b/examples/systeminfo/config/config.xml
@@ -6,5 +6,5 @@
<Publisher>The Qt Company</Publisher>
<!-- Directory name is used in component.xml -->
<StartMenuDir>Qt Installer Framework Example</StartMenuDir>
- <TargetDir>@HomeDir@/IFWSystemInfoExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/systeminfo</TargetDir>
</Installer>
diff --git a/examples/translations/config/config.xml b/examples/translations/config/config.xml
index bacf61cce..ec8f6a710 100644
--- a/examples/translations/config/config.xml
+++ b/examples/translations/config/config.xml
@@ -5,5 +5,5 @@
<Title>Package Translations Example</Title>
<Publisher>Qt Project</Publisher>
<StartMenuDir>Qt Installer Framework Examples</StartMenuDir>
- <TargetDir>@HomeDir@/IfwExample</TargetDir>
+ <TargetDir>@HomeDir@/IfwExamples/translations</TargetDir>
</Installer>