diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-08 14:20:04 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-04-08 14:20:04 +0200 |
| commit | 2630ce66613cdcdad505d7b010f90582dc09f0ac (patch) | |
| tree | f0475699ffd7ccee8c5d6afc1ab447ff83a28937 /tools | |
| parent | c3f5744d2e0a2cd907c0601240d188b583ae79cb (diff) | |
| parent | 25ec0755355ea00764182583b636dbf52353ea44 (diff) | |
Merge remote-tracking branch 'origin/2.0'
Conflicts:
dist/config/config.xml
dist/packages/org.qtproject.ifw.binaries/meta/package.xml
dist/packages/org.qtproject.ifw/meta/package.xml
installerfw.pri
Change-Id: I60673fac543f1153dad3ef01e589c1f9c6d64599
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build_installer.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/build_installer.py b/tools/build_installer.py index e97d5df70..e34c34032 100755 --- a/tools/build_installer.py +++ b/tools/build_installer.py @@ -44,7 +44,7 @@ def init(): basename = os.path.basename(src_dir) build_dir = os.path.join(root_dir, basename + '_build') package_dir = os.path.join(root_dir, basename + '_pkg') - target_path = os.path.join(args.target_dir, 'ifw') + target_path = os.path.join(args.target_dir, 'Qt Installer Framework') print 'source dir: ' + src_dir print 'build dir: ' + build_dir |