diff options
| author | kh1 <qt-info@nokia.com> | 2011-04-12 09:50:34 +0200 |
|---|---|---|
| committer | kh1 <qt-info@nokia.com> | 2011-04-12 09:50:34 +0200 |
| commit | d3d6c508946c89fb5a97cf433b1476513cb09749 (patch) | |
| tree | 053d16596bb2e52e2612d0c96f0adce71b3f5f4d /examples | |
| parent | 61276f19772aa87bef2e262da19dc3256e2be4a5 (diff) | |
| parent | 79eb0a133fccccffeacef9a3d282f26a830aa977 (diff) | |
Merge branch 'master' into refactor
Conflicts:
installerbuilder/libinstaller/qinstallercomponent.cpp
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/testapp/config/config.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/testapp/config/config.xml b/examples/testapp/config/config.xml index e66c57a84..33264d385 100644 --- a/examples/testapp/config/config.xml +++ b/examples/testapp/config/config.xml @@ -27,5 +27,5 @@ </PublicKey> <!-- @homeDir@ and @rootDir@ are some of the supported vars --> - <TargetDir>@homeDir@/testinstall</TargetDir> + <TargetDir>@rootDir@/testinstall</TargetDir> </Installer> |