summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--dist/config/config.xml2
-rw-r--r--dist/packages/org.qtproject.ifw/meta/installscript.qs6
-rw-r--r--doc/examples/config.xml6
-rw-r--r--examples/openreadme/config/config.xml2
-rw-r--r--tests/auto/installer/settings/data/full_config.xml4
-rw-r--r--tests/auto/installer/settings/data/malformed_config.xml2
-rw-r--r--tests/auto/installer/settings/data/tutorial_config.xml2
-rw-r--r--tests/auto/installer/settings/tst_settings.cpp2
8 files changed, 13 insertions, 13 deletions
diff --git a/dist/config/config.xml b/dist/config/config.xml
index db4d40771..d9dc83695 100644
--- a/dist/config/config.xml
+++ b/dist/config/config.xml
@@ -9,5 +9,5 @@
<UninstallerName>Uninstaller</UninstallerName>
<!-- Tweaked for windows in installscript.qs -->
- <TargetDir>@homeDir@/Qt/QtIFW-1.6.81</TargetDir>
+ <TargetDir>@HomeDir@/Qt/QtIFW-1.6.81</TargetDir>
</Installer>
diff --git a/dist/packages/org.qtproject.ifw/meta/installscript.qs b/dist/packages/org.qtproject.ifw/meta/installscript.qs
index 8a12a6804..c742aeea5 100644
--- a/dist/packages/org.qtproject.ifw/meta/installscript.qs
+++ b/dist/packages/org.qtproject.ifw/meta/installscript.qs
@@ -1,9 +1,9 @@
function Component()
{
- // Install to @rootDir@ instead of @homeDir@ on Windows
+ // Install to @RootDir@ instead of @HomeDir@ on Windows
if (installer.value("os") === "win") {
- var homeDir = installer.value("homeDir");
- var targetDir = installer.value("TargetDir").replace(homeDir, "@rootDir@");
+ var homeDir = installer.value("HomeDir");
+ var targetDir = installer.value("TargetDir").replace(homeDir, "@RootDir@");
installer.setValue("TargetDir", targetDir);
}
diff --git a/doc/examples/config.xml b/doc/examples/config.xml
index 9ebd9bf38..c3b79486a 100644
--- a/doc/examples/config.xml
+++ b/doc/examples/config.xml
@@ -17,9 +17,9 @@
<AllowNonAsciiCharacters>true</AllowNonAsciiCharacters>
<Background>background.png</Background>
- <!-- @homeDir@ and @rootDir@ are some of the supported vars -->
- <TargetDir>@homeDir@/testinstall</TargetDir>
- <AdminTargetDir>@rootDir@/testinstall</AdminTargetDir>
+ <!-- @HomeDir@ and @RootDir@ are some of the supported vars -->
+ <TargetDir>@HomeDir@/testinstall</TargetDir>
+ <AdminTargetDir>@RootDir@/testinstall</AdminTargetDir>
<RemoteRepositories>
<Repository>
<Url>http://www.your-repo-location/packages/</Url>
diff --git a/examples/openreadme/config/config.xml b/examples/openreadme/config/config.xml
index c2ee07b65..b1ec192e6 100644
--- a/examples/openreadme/config/config.xml
+++ b/examples/openreadme/config/config.xml
@@ -5,5 +5,5 @@
<Title>Qt Installer Framework - Open Readme Example</Title>
<Publisher>Qt-Project</Publisher>
<StartMenuDir>Qt Installer Framework - 'Open ReadMe' Example</StartMenuDir>
- <TargetDir>@homeDir@/IFWOpenReadMeExample</TargetDir>
+ <TargetDir>@HomeDir@/IFWOpenReadMeExample</TargetDir>
</Installer>
diff --git a/tests/auto/installer/settings/data/full_config.xml b/tests/auto/installer/settings/data/full_config.xml
index 41e598760..3d7e86a6e 100644
--- a/tests/auto/installer/settings/data/full_config.xml
+++ b/tests/auto/installer/settings/data/full_config.xml
@@ -11,8 +11,8 @@ File should contain all elements we allow in a config.xml
<Publisher>Your vendor</Publisher>
<ProductUrl>Your vendor</ProductUrl>
- <TargetDir>@homeDir@InstallationDirectory</TargetDir>
- <AdminTargetDir>@rootDir@InstallationDirectory</AdminTargetDir>
+ <TargetDir>@HomeDir@InstallationDirectory</TargetDir>
+ <AdminTargetDir>@RootDir@InstallationDirectory</AdminTargetDir>
<Icon>icon</Icon>
<InstallerApplicationIcon>icon</InstallerApplicationIcon>
diff --git a/tests/auto/installer/settings/data/malformed_config.xml b/tests/auto/installer/settings/data/malformed_config.xml
index ebac3027c..8725caaf9 100644
--- a/tests/auto/installer/settings/data/malformed_config.xml
+++ b/tests/auto/installer/settings/data/malformed_config.xml
@@ -5,4 +5,4 @@
<Title>Your application Installer</Title>
<Publisher>Your vendor</Publisher>
<StartMenuDir>Super App</StartMenuDir>
- <TargetDir>@rootDir@InstallationDirectory</TargetDir>
+ <TargetDir>@RootDir@InstallationDirectory</TargetDir>
diff --git a/tests/auto/installer/settings/data/tutorial_config.xml b/tests/auto/installer/settings/data/tutorial_config.xml
index 235434776..6ffb2e3e8 100644
--- a/tests/auto/installer/settings/data/tutorial_config.xml
+++ b/tests/auto/installer/settings/data/tutorial_config.xml
@@ -5,5 +5,5 @@
<Title>Your application Installer</Title>
<Publisher>Your vendor</Publisher>
<StartMenuDir>Super App</StartMenuDir>
- <TargetDir>@rootDir@InstallationDirectory</TargetDir>
+ <TargetDir>@RootDir@InstallationDirectory</TargetDir>
</Installer>
diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp
index 7f75c74b2..438816bdc 100644
--- a/tests/auto/installer/settings/tst_settings.cpp
+++ b/tests/auto/installer/settings/tst_settings.cpp
@@ -32,7 +32,7 @@ void tst_Settings::loadTutorialConfig()
QCOMPARE(settings.title(), QLatin1String("Your application Installer"));
QCOMPARE(settings.publisher(), QLatin1String("Your vendor"));
QCOMPARE(settings.startMenuDir(), QLatin1String("Super App"));
- QCOMPARE(settings.targetDir(), QLatin1String("@rootDir@InstallationDirectory"));
+ QCOMPARE(settings.targetDir(), QLatin1String("@RootDir@InstallationDirectory"));
// default values
QCOMPARE(settings.logo(), QString());